x86: exclude certain ISA extensions from v3/v4 ISA

Like TBM and LWP, XOP and FMA4 also shouldn't be included in v3.

Like AVX512-4VNNIW, AVX512-4FMAPS also shouldn't be included in v4.

7 files changed, 36 insertions, 0 deletions

diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index 1e10277da3..99a11ebde7 100644
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -755,7 +755,10 @@ if {[is_elf_format] || [istarget "*-*-vxworks*"]} then {
     run_dump_test "property-cvtpi2pd"
     run_dump_test "property-cvtpi2ps"
     run_dump_test "property-ldmxcsr"
+    run_dump_test "property-v4fmaddps"
+    run_dump_test "property-vfmaddps"
     run_dump_test "property-vldmxcsr"
+    run_dump_test "property-vpcmov"
     run_dump_test "property-vzeroall"
     run_dump_test "code16-2"
 
diff --git a/gas/testsuite/gas/i386/property-v4fmaddps.d b/gas/testsuite/gas/i386/property-v4fmaddps.d
new file mode 100644
index 0000000000..923ec0988a
--- /dev/null
+++ b/gas/testsuite/gas/i386/property-v4fmaddps.d
@@ -0,0 +1,9 @@
+#name: i386 property v4fmaddps
+#as: -mx86-used-note=yes --generate-missing-build-notes=no
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+[ 	]+Owner[ 	]+Data size[ 	]+Description
+  GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: x86-64-baseline
+	x86 feature used: x86, XMM, YMM, ZMM
diff --git a/gas/testsuite/gas/i386/property-v4fmaddps.s b/gas/testsuite/gas/i386/property-v4fmaddps.s
new file mode 100644
index 0000000000..43d3a3de86
--- /dev/null
+++ b/gas/testsuite/gas/i386/property-v4fmaddps.s
@@ -0,0 +1,2 @@
+	.text
+	v4fmaddps	(%eax), %zmm0, %zmm0
diff --git a/gas/testsuite/gas/i386/property-vfmaddps.d b/gas/testsuite/gas/i386/property-vfmaddps.d
new file mode 100644
index 0000000000..f6a92e9c40
--- /dev/null
+++ b/gas/testsuite/gas/i386/property-vfmaddps.d
@@ -0,0 +1,9 @@
+#name: i386 property vfmaddps
+#as: -mx86-used-note=yes --generate-missing-build-notes=no
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+[ 	]+Owner[ 	]+Data size[ 	]+Description
+  GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: x86-64-baseline
+	x86 feature used: x86, XMM, YMM
diff --git a/gas/testsuite/gas/i386/property-vfmaddps.s b/gas/testsuite/gas/i386/property-vfmaddps.s
new file mode 100644
index 0000000000..c72df471fc
--- /dev/null
+++ b/gas/testsuite/gas/i386/property-vfmaddps.s
@@ -0,0 +1,2 @@
+	.text
+	vfmaddps	%xmm0, %xmm0, %xmm0, %xmm0
diff --git a/gas/testsuite/gas/i386/property-vpcmov.d b/gas/testsuite/gas/i386/property-vpcmov.d
new file mode 100644
index 0000000000..f40fb8a325
--- /dev/null
+++ b/gas/testsuite/gas/i386/property-vpcmov.d
@@ -0,0 +1,9 @@
+#name: i386 property vpcmov
+#as: -mx86-used-note=yes --generate-missing-build-notes=no
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+[ 	]+Owner[ 	]+Data size[ 	]+Description
+  GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: x86-64-baseline
+	x86 feature used: x86, XMM, YMM
diff --git a/gas/testsuite/gas/i386/property-vpcmov.s b/gas/testsuite/gas/i386/property-vpcmov.s
new file mode 100644
index 0000000000..66270709e7
--- /dev/null
+++ b/gas/testsuite/gas/i386/property-vpcmov.s
@@ -0,0 +1,2 @@
+	.text
+	vpcmov	%xmm0, %xmm0, %xmm0, %xmm0