public inbox for binutils@sourceware.org
 help / color / mirror / Atom feed
* [PATCH] Remove VL variants for 4FMAPS and 4VNNIW insns.
@ 2018-01-10 17:35 Tsimbalist, Igor V
  2018-01-10 17:59 ` H.J. Lu
  0 siblings, 1 reply; 2+ messages in thread
From: Tsimbalist, Igor V @ 2018-01-10 17:35 UTC (permalink / raw)
  To: binutils; +Cc: H.J. Lu, Tsimbalist, Igor V

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

AVX512_4FMAPS and AVX512_4VNNIW insns are marked as having AVX512VL variants.
That is wrong as SDM doesn't define such instructions. The patch removes these VL
variants.

Ok for trunk?

Igor



[-- Attachment #2: 0001-Remove-VL-variants-for-4FMAPS-and-4VNNIW-insns.patch --]
[-- Type: application/octet-stream, Size: 93599 bytes --]

From 7cdb02196eeadb8715bc94a52de521d1de295018 Mon Sep 17 00:00:00 2001
From: Igor Tsimbalist <igor.v.tsimbalist@intel.com>
Date: Wed, 10 Jan 2018 19:40:39 +0300
Subject: [PATCH] Remove VL variants for 4FMAPS and 4VNNIW insns.

gas/
	* testsuite/gas/i386/avx512_4fmaps-warn.l: Change xmm to zmm.
	* testsuite/gas/i386/avx512_4fmaps-warn.s: Likewise.
	* testsuite/gas/i386/avx512_4fmaps_vl-intel.d: Delete.
	* testsuite/gas/i386/avx512_4fmaps_vl-warn.l: Likewise.
	* testsuite/gas/i386/avx512_4fmaps_vl-warn.s: Likewise.
	* testsuite/gas/i386/avx512_4fmaps_vl.d: Likewise.
	* testsuite/gas/i386/avx512_4fmaps_vl.s: Likewise.
	* testsuite/gas/i386/avx512_4vnniw_vl-intel.d: Likewise.
	* testsuite/gas/i386/avx512_4vnniw_vl.d: Likewise.
	* testsuite/gas/i386/avx512_4vnniw_vl.s: Likewise.
	* testsuite/gas/i386/i386.exp: Delete _vl tests for 4fmaps an
	4vnniw tests.
	* testsuite/gas/i386/x86-64-avx512_4fmaps_vl-intel.d: Delete.
	* testsuite/gas/i386/x86-64-avx512_4fmaps_vl-warn.l: Likewise.
	* testsuite/gas/i386/x86-64-avx512_4fmaps_vl-warn.s: Likewise.
	* testsuite/gas/i386/x86-64-avx512_4fmaps_vl.d: Likewise.
	* testsuite/gas/i386/x86-64-avx512_4fmaps_vl.s: Likewise.
	* testsuite/gas/i386/x86-64-avx512_4vnniw_vl-intel.d: Likewise.
	* testsuite/gas/i386/x86-64-avx512_4vnniw_vl.d: Likewise.
	* testsuite/gas/i386/x86-64-avx512_4vnniw_vl.s: Likewise.

opcodes/
	* i386-opc.tbl: Remove VL variants for 4FMAPS and 4VNNIW
	insns.
	* i386-tbl.h: Regenerate.
---
 gas/ChangeLog                                      |  20 +++
 gas/testsuite/gas/i386/avx512_4fmaps-warn.l        |  12 +-
 gas/testsuite/gas/i386/avx512_4fmaps-warn.s        |  20 +--
 gas/testsuite/gas/i386/avx512_4fmaps_vl-intel.d    |  78 ----------
 gas/testsuite/gas/i386/avx512_4fmaps_vl-warn.l     |  13 --
 gas/testsuite/gas/i386/avx512_4fmaps_vl-warn.s     |  23 ---
 gas/testsuite/gas/i386/avx512_4fmaps_vl.d          |  78 ----------
 gas/testsuite/gas/i386/avx512_4fmaps_vl.s          |  74 ----------
 gas/testsuite/gas/i386/avx512_4vnniw_vl-intel.d    |  79 ----------
 gas/testsuite/gas/i386/avx512_4vnniw_vl.d          |  79 ----------
 gas/testsuite/gas/i386/avx512_4vnniw_vl.s          |  75 ----------
 gas/testsuite/gas/i386/i386.exp                    |  10 --
 .../gas/i386/x86-64-avx512_4fmaps_vl-intel.d       |  79 ----------
 .../gas/i386/x86-64-avx512_4fmaps_vl-warn.l        |  13 --
 .../gas/i386/x86-64-avx512_4fmaps_vl-warn.s        |  23 ---
 gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl.d   |  79 ----------
 gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl.s   |  75 ----------
 .../gas/i386/x86-64-avx512_4vnniw_vl-intel.d       |  79 ----------
 gas/testsuite/gas/i386/x86-64-avx512_4vnniw_vl.d   |  79 ----------
 gas/testsuite/gas/i386/x86-64-avx512_4vnniw_vl.s   |  75 ----------
 opcodes/ChangeLog                                  |   5 +
 opcodes/i386-opc.tbl                               |   8 --
 opcodes/i386-tbl.h                                 | 160 ---------------------
 23 files changed, 41 insertions(+), 1195 deletions(-)
 delete mode 100644 gas/testsuite/gas/i386/avx512_4fmaps_vl-intel.d
 delete mode 100644 gas/testsuite/gas/i386/avx512_4fmaps_vl-warn.l
 delete mode 100644 gas/testsuite/gas/i386/avx512_4fmaps_vl-warn.s
 delete mode 100644 gas/testsuite/gas/i386/avx512_4fmaps_vl.d
 delete mode 100644 gas/testsuite/gas/i386/avx512_4fmaps_vl.s
 delete mode 100644 gas/testsuite/gas/i386/avx512_4vnniw_vl-intel.d
 delete mode 100644 gas/testsuite/gas/i386/avx512_4vnniw_vl.d
 delete mode 100644 gas/testsuite/gas/i386/avx512_4vnniw_vl.s
 delete mode 100644 gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl-intel.d
 delete mode 100644 gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl-warn.l
 delete mode 100644 gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl-warn.s
 delete mode 100644 gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl.d
 delete mode 100644 gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl.s
 delete mode 100644 gas/testsuite/gas/i386/x86-64-avx512_4vnniw_vl-intel.d
 delete mode 100644 gas/testsuite/gas/i386/x86-64-avx512_4vnniw_vl.d
 delete mode 100644 gas/testsuite/gas/i386/x86-64-avx512_4vnniw_vl.s

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6fe0983..cb0865b 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,23 @@
+2018-01-10  Igor Tsimbalist  <igor.v.tsimbalist@intel.com>
+
+	* testsuite/i386/avx512_4fmaps_vl-warn.l: Likewise.
+	* testsuite/i386/avx512_4fmaps_vl-warn.s: Likewise.
+	* testsuite/i386/avx512_4fmaps_vl.d: Likewise.
+	* testsuite/i386/avx512_4fmaps_vl.s: Likewise.
+	* testsuite/i386/avx512_4vnniw_vl-intel.d: Likewise.
+	* testsuite/i386/avx512_4vnniw_vl.d: Likewise.
+	* testsuite/i386/avx512_4vnniw_vl.s: Likewise.
+	* testsuite/i386/i386.exp: Removed _vl tests for 4fmaps an 4vnniw
+	tests.
+	* testsuite/i386/x86-64-avx512_4fmaps_vl-intel.d: Removed.
+	* testsuite/i386/x86-64-avx512_4fmaps_vl-warn.l: Likewise.
+	* testsuite/i386/x86-64-avx512_4fmaps_vl-warn.s: Likewise.
+	* testsuite/i386/x86-64-avx512_4fmaps_vl.d: Likewise.
+	* testsuite/i386/x86-64-avx512_4fmaps_vl.s: Likewise.
+	* testsuite/i386/x86-64-avx512_4vnniw_vl-intel.d: Likewise.
+	* testsuite/i386/x86-64-avx512_4vnniw_vl.d: Likewise.
+	* testsuite/i386/x86-64-avx512_4vnniw_vl.s: Likewise.
+
 2017-11-23  Igor Tsimbalist  <igor.v.tsimbalist@intel.com>
 
 	* testsuite/gas/i386/avx512f_vaes-intel.d: Regenerate.
diff --git a/gas/testsuite/gas/i386/avx512_4fmaps-warn.l b/gas/testsuite/gas/i386/avx512_4fmaps-warn.l
index d8a0b79..d05924a 100644
--- a/gas/testsuite/gas/i386/avx512_4fmaps-warn.l
+++ b/gas/testsuite/gas/i386/avx512_4fmaps-warn.l
@@ -1,10 +1,10 @@
 .*: Assembler messages:
-.*:5: Warning: the second source register `%xmm1' implicitly denotes `%xmm0' to `%xmm3' source group in `v4fmaddps'
-.*:6: Warning: the second source register `%xmm2' implicitly denotes `%xmm0' to `%xmm3' source group in `v4fmaddps'
-.*:7: Warning: the second source register `%xmm3' implicitly denotes `%xmm0' to `%xmm3' source group in `v4fmaddps'
-.*:10: Warning: the second source register `%xmm1' implicitly denotes `%xmm0' to `%xmm3' source group in `v4fnmaddps'
-.*:11: Warning: the second source register `%xmm2' implicitly denotes `%xmm0' to `%xmm3' source group in `v4fnmaddps'
-.*:12: Warning: the second source register `%xmm3' implicitly denotes `%xmm0' to `%xmm3' source group in `v4fnmaddps'
+.*:5: Warning: the second source register `%zmm1' implicitly denotes `%zmm0' to `%zmm3' source group in `v4fmaddps'
+.*:6: Warning: the second source register `%zmm2' implicitly denotes `%zmm0' to `%zmm3' source group in `v4fmaddps'
+.*:7: Warning: the second source register `%zmm3' implicitly denotes `%zmm0' to `%zmm3' source group in `v4fmaddps'
+.*:10: Warning: the second source register `%zmm1' implicitly denotes `%zmm0' to `%zmm3' source group in `v4fnmaddps'
+.*:11: Warning: the second source register `%zmm2' implicitly denotes `%zmm0' to `%zmm3' source group in `v4fnmaddps'
+.*:12: Warning: the second source register `%zmm3' implicitly denotes `%zmm0' to `%zmm3' source group in `v4fnmaddps'
 .*:15: Warning: the second source register `%xmm1' implicitly denotes `%xmm0' to `%xmm3' source group in `v4fmaddss'
 .*:16: Warning: the second source register `%xmm2' implicitly denotes `%xmm0' to `%xmm3' source group in `v4fmaddss'
 .*:17: Warning: the second source register `%xmm3' implicitly denotes `%xmm0' to `%xmm3' source group in `v4fmaddss'
diff --git a/gas/testsuite/gas/i386/avx512_4fmaps-warn.s b/gas/testsuite/gas/i386/avx512_4fmaps-warn.s
index 650358e..108e7ab 100644
--- a/gas/testsuite/gas/i386/avx512_4fmaps-warn.s
+++ b/gas/testsuite/gas/i386/avx512_4fmaps-warn.s
@@ -1,16 +1,16 @@
 # Check warnings for invalid usage of register group
 
 .text
-	v4fmaddps (%eax), %xmm0, %xmm6
-	v4fmaddps (%eax), %xmm1, %xmm6
-	v4fmaddps (%eax), %xmm2, %xmm6
-	v4fmaddps (%eax), %xmm3, %xmm6
-	v4fmaddps (%eax), %xmm4, %xmm6
-	v4fnmaddps (%eax), %xmm0, %xmm6
-	v4fnmaddps (%eax), %xmm1, %xmm6
-	v4fnmaddps (%eax), %xmm2, %xmm6
-	v4fnmaddps (%eax), %xmm3, %xmm6
-	v4fnmaddps (%eax), %xmm4, %xmm6
+	v4fmaddps (%eax), %zmm0, %zmm6
+	v4fmaddps (%eax), %zmm1, %zmm6
+	v4fmaddps (%eax), %zmm2, %zmm6
+	v4fmaddps (%eax), %zmm3, %zmm6
+	v4fmaddps (%eax), %zmm4, %zmm6
+	v4fnmaddps (%eax), %zmm0, %zmm6
+	v4fnmaddps (%eax), %zmm1, %zmm6
+	v4fnmaddps (%eax), %zmm2, %zmm6
+	v4fnmaddps (%eax), %zmm3, %zmm6
+	v4fnmaddps (%eax), %zmm4, %zmm6
 	v4fmaddss (%eax), %xmm0, %xmm6
 	v4fmaddss (%eax), %xmm1, %xmm6
 	v4fmaddss (%eax), %xmm2, %xmm6
diff --git a/gas/testsuite/gas/i386/avx512_4fmaps_vl-intel.d b/gas/testsuite/gas/i386/avx512_4fmaps_vl-intel.d
deleted file mode 100644
index a964a17..0000000
--- a/gas/testsuite/gas/i386/avx512_4fmaps_vl-intel.d
+++ /dev/null
@@ -1,78 +0,0 @@
-#objdump: -dw -Mintel
-#name: i386 AVX512/4FMAPS_VL insns (Intel disassembly)
-#source: avx512_4fmaps_vl.s
-
-.*: +file format .*
-
-
-Disassembly of section \.text:
-
-0+ <_start>:
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 09[ 	]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 0f 9a 09[ 	]*v4fmaddps xmm1\{k7\},xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 8f 9a 09[ 	]*v4fmaddps xmm1\{k7\}\{z\},xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 8c f4 c0 1d fe ff[ 	]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 8a e0 0f 00 00[ 	]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 8a 00 10 00 00[ 	]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 8a 00 f0 ff ff[ 	]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 8a e0 ef ff ff[ 	]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 09[ 	]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 2f 9a 09[ 	]*v4fmaddps ymm1\{k7\},ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f af 9a 09[ 	]*v4fmaddps ymm1\{k7\}\{z\},ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 8c f4 c0 1d fe ff[ 	]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 8a e0 0f 00 00[ 	]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 8a 00 10 00 00[ 	]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 8a 00 f0 ff ff[ 	]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 8a e0 ef ff ff[ 	]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 09[ 	]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 0f aa 09[ 	]*v4fnmaddps xmm1\{k7\},xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 8f aa 09[ 	]*v4fnmaddps xmm1\{k7\}\{z\},xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 8c f4 c0 1d fe ff[ 	]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 8a e0 0f 00 00[ 	]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 8a 00 10 00 00[ 	]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 8a 00 f0 ff ff[ 	]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 8a e0 ef ff ff[ 	]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 09[ 	]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 2f aa 09[ 	]*v4fnmaddps ymm1\{k7\},ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f af aa 09[ 	]*v4fnmaddps ymm1\{k7\}\{z\},ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 8c f4 c0 1d fe ff[ 	]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 8a e0 0f 00 00[ 	]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 8a 00 10 00 00[ 	]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 8a 00 f0 ff ff[ 	]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[edx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 09[ 	]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 09[ 	]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 0f 9a 09[ 	]*v4fmaddps xmm1\{k7\},xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 8f 9a 09[ 	]*v4fmaddps xmm1\{k7\}\{z\},xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 8c f4 c0 1d fe ff[ 	]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 8a e0 0f 00 00[ 	]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 8a 00 10 00 00[ 	]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 8a 00 f0 ff ff[ 	]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 8a e0 ef ff ff[ 	]*v4fmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 09[ 	]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 09[ 	]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 2f 9a 09[ 	]*v4fmaddps ymm1\{k7\},ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f af 9a 09[ 	]*v4fmaddps ymm1\{k7\}\{z\},ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 8c f4 c0 1d fe ff[ 	]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 8a e0 0f 00 00[ 	]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 8a 00 10 00 00[ 	]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 8a 00 f0 ff ff[ 	]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 8a e0 ef ff ff[ 	]*v4fmaddps ymm1,ymm4,XMMWORD PTR \[edx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 09[ 	]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 09[ 	]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 0f aa 09[ 	]*v4fnmaddps xmm1\{k7\},xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 8f aa 09[ 	]*v4fnmaddps xmm1\{k7\}\{z\},xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 8c f4 c0 1d fe ff[ 	]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 8a e0 0f 00 00[ 	]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 8a 00 10 00 00[ 	]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 8a 00 f0 ff ff[ 	]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 8a e0 ef ff ff[ 	]*v4fnmaddps xmm1,xmm4,XMMWORD PTR \[edx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 09[ 	]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 09[ 	]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 2f aa 09[ 	]*v4fnmaddps ymm1\{k7\},ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f af aa 09[ 	]*v4fnmaddps ymm1\{k7\}\{z\},ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 8c f4 c0 1d fe ff[ 	]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 8a e0 0f 00 00[ 	]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 8a 00 10 00 00[ 	]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[edx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 8a 00 f0 ff ff[ 	]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[edx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 8a e0 ef ff ff[ 	]*v4fnmaddps ymm1,ymm4,XMMWORD PTR \[edx-0x1020\]
-#pass
diff --git a/gas/testsuite/gas/i386/avx512_4fmaps_vl-warn.l b/gas/testsuite/gas/i386/avx512_4fmaps_vl-warn.l
deleted file mode 100644
index fc42237..0000000
--- a/gas/testsuite/gas/i386/avx512_4fmaps_vl-warn.l
+++ /dev/null
@@ -1,13 +0,0 @@
-.*: Assembler messages:
-.*:5: Warning: the second source register `%xmm1' implicitly denotes `%xmm0' to `%xmm3' source group in `v4fmaddps'
-.*:6: Warning: the second source register `%xmm2' implicitly denotes `%xmm0' to `%xmm3' source group in `v4fmaddps'
-.*:7: Warning: the second source register `%xmm3' implicitly denotes `%xmm0' to `%xmm3' source group in `v4fmaddps'
-.*:10: Warning: the second source register `%xmm1' implicitly denotes `%xmm0' to `%xmm3' source group in `v4fnmaddps'
-.*:11: Warning: the second source register `%xmm2' implicitly denotes `%xmm0' to `%xmm3' source group in `v4fnmaddps'
-.*:12: Warning: the second source register `%xmm3' implicitly denotes `%xmm0' to `%xmm3' source group in `v4fnmaddps'
-.*:15: Warning: the second source register `%ymm1' implicitly denotes `%ymm0' to `%ymm3' source group in `v4fmaddps'
-.*:16: Warning: the second source register `%ymm2' implicitly denotes `%ymm0' to `%ymm3' source group in `v4fmaddps'
-.*:17: Warning: the second source register `%ymm3' implicitly denotes `%ymm0' to `%ymm3' source group in `v4fmaddps'
-.*:20: Warning: the second source register `%ymm1' implicitly denotes `%ymm0' to `%ymm3' source group in `v4fnmaddps'
-.*:21: Warning: the second source register `%ymm2' implicitly denotes `%ymm0' to `%ymm3' source group in `v4fnmaddps'
-.*:22: Warning: the second source register `%ymm3' implicitly denotes `%ymm0' to `%ymm3' source group in `v4fnmaddps'
diff --git a/gas/testsuite/gas/i386/avx512_4fmaps_vl-warn.s b/gas/testsuite/gas/i386/avx512_4fmaps_vl-warn.s
deleted file mode 100644
index ec7b963..0000000
--- a/gas/testsuite/gas/i386/avx512_4fmaps_vl-warn.s
+++ /dev/null
@@ -1,23 +0,0 @@
-# Check warnings for invalid usage of register group
-
-.text
-	v4fmaddps (%eax), %xmm0, %xmm6
-	v4fmaddps (%eax), %xmm1, %xmm6
-	v4fmaddps (%eax), %xmm2, %xmm6
-	v4fmaddps (%eax), %xmm3, %xmm6
-	v4fmaddps (%eax), %xmm4, %xmm6
-	v4fnmaddps (%eax), %xmm0, %xmm6
-	v4fnmaddps (%eax), %xmm1, %xmm6
-	v4fnmaddps (%eax), %xmm2, %xmm6
-	v4fnmaddps (%eax), %xmm3, %xmm6
-	v4fnmaddps (%eax), %xmm4, %xmm6
-	v4fmaddps (%eax), %ymm0, %ymm6
-	v4fmaddps (%eax), %ymm1, %ymm6
-	v4fmaddps (%eax), %ymm2, %ymm6
-	v4fmaddps (%eax), %ymm3, %ymm6
-	v4fmaddps (%eax), %ymm4, %ymm6
-	v4fnmaddps (%eax), %ymm0, %ymm6
-	v4fnmaddps (%eax), %ymm1, %ymm6
-	v4fnmaddps (%eax), %ymm2, %ymm6
-	v4fnmaddps (%eax), %ymm3, %ymm6
-	v4fnmaddps (%eax), %ymm4, %ymm6
diff --git a/gas/testsuite/gas/i386/avx512_4fmaps_vl.d b/gas/testsuite/gas/i386/avx512_4fmaps_vl.d
deleted file mode 100644
index cb63bb0..0000000
--- a/gas/testsuite/gas/i386/avx512_4fmaps_vl.d
+++ /dev/null
@@ -1,78 +0,0 @@
-#objdump: -dw
-#name: i386 AVX512/4FMAPS_VL insns
-#source: avx512_4fmaps_vl.s
-
-.*: +file format .*
-
-
-Disassembly of section \.text:
-
-0+ <_start>:
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 09[ 	]*v4fmaddps \(%ecx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 0f 9a 09[ 	]*v4fmaddps \(%ecx\),%xmm4,%xmm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 8f 9a 09[ 	]*v4fmaddps \(%ecx\),%xmm4,%xmm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 8c f4 c0 1d fe ff[ 	]*v4fmaddps -0x1e240\(%esp,%esi,8\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 8a e0 0f 00 00[ 	]*v4fmaddps 0xfe0\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 8a 00 10 00 00[ 	]*v4fmaddps 0x1000\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 8a 00 f0 ff ff[ 	]*v4fmaddps -0x1000\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 8a e0 ef ff ff[ 	]*v4fmaddps -0x1020\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 09[ 	]*v4fmaddps \(%ecx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 2f 9a 09[ 	]*v4fmaddps \(%ecx\),%ymm4,%ymm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f af 9a 09[ 	]*v4fmaddps \(%ecx\),%ymm4,%ymm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 8c f4 c0 1d fe ff[ 	]*v4fmaddps -0x1e240\(%esp,%esi,8\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 8a e0 0f 00 00[ 	]*v4fmaddps 0xfe0\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 8a 00 10 00 00[ 	]*v4fmaddps 0x1000\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 8a 00 f0 ff ff[ 	]*v4fmaddps -0x1000\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 8a e0 ef ff ff[ 	]*v4fmaddps -0x1020\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 09[ 	]*v4fnmaddps \(%ecx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 0f aa 09[ 	]*v4fnmaddps \(%ecx\),%xmm4,%xmm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 8f aa 09[ 	]*v4fnmaddps \(%ecx\),%xmm4,%xmm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 8c f4 c0 1d fe ff[ 	]*v4fnmaddps -0x1e240\(%esp,%esi,8\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 8a e0 0f 00 00[ 	]*v4fnmaddps 0xfe0\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 8a 00 10 00 00[ 	]*v4fnmaddps 0x1000\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 8a 00 f0 ff ff[ 	]*v4fnmaddps -0x1000\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 8a e0 ef ff ff[ 	]*v4fnmaddps -0x1020\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 09[ 	]*v4fnmaddps \(%ecx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 2f aa 09[ 	]*v4fnmaddps \(%ecx\),%ymm4,%ymm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f af aa 09[ 	]*v4fnmaddps \(%ecx\),%ymm4,%ymm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 8c f4 c0 1d fe ff[ 	]*v4fnmaddps -0x1e240\(%esp,%esi,8\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 8a e0 0f 00 00[ 	]*v4fnmaddps 0xfe0\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 8a 00 10 00 00[ 	]*v4fnmaddps 0x1000\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 8a 00 f0 ff ff[ 	]*v4fnmaddps -0x1000\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 09[ 	]*v4fmaddps \(%ecx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 09[ 	]*v4fmaddps \(%ecx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 0f 9a 09[ 	]*v4fmaddps \(%ecx\),%xmm4,%xmm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 8f 9a 09[ 	]*v4fmaddps \(%ecx\),%xmm4,%xmm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 8c f4 c0 1d fe ff[ 	]*v4fmaddps -0x1e240\(%esp,%esi,8\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 8a e0 0f 00 00[ 	]*v4fmaddps 0xfe0\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 8a 00 10 00 00[ 	]*v4fmaddps 0x1000\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 8a 00 f0 ff ff[ 	]*v4fmaddps -0x1000\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 9a 8a e0 ef ff ff[ 	]*v4fmaddps -0x1020\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 09[ 	]*v4fmaddps \(%ecx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 09[ 	]*v4fmaddps \(%ecx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 2f 9a 09[ 	]*v4fmaddps \(%ecx\),%ymm4,%ymm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f af 9a 09[ 	]*v4fmaddps \(%ecx\),%ymm4,%ymm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 8c f4 c0 1d fe ff[ 	]*v4fmaddps -0x1e240\(%esp,%esi,8\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 8a e0 0f 00 00[ 	]*v4fmaddps 0xfe0\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 8a 00 10 00 00[ 	]*v4fmaddps 0x1000\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 8a 00 f0 ff ff[ 	]*v4fmaddps -0x1000\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 9a 8a e0 ef ff ff[ 	]*v4fmaddps -0x1020\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 09[ 	]*v4fnmaddps \(%ecx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 09[ 	]*v4fnmaddps \(%ecx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 0f aa 09[ 	]*v4fnmaddps \(%ecx\),%xmm4,%xmm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 8f aa 09[ 	]*v4fnmaddps \(%ecx\),%xmm4,%xmm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 8c f4 c0 1d fe ff[ 	]*v4fnmaddps -0x1e240\(%esp,%esi,8\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 8a e0 0f 00 00[ 	]*v4fnmaddps 0xfe0\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 8a 00 10 00 00[ 	]*v4fnmaddps 0x1000\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 8a 00 f0 ff ff[ 	]*v4fnmaddps -0x1000\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 aa 8a e0 ef ff ff[ 	]*v4fnmaddps -0x1020\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 09[ 	]*v4fnmaddps \(%ecx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 09[ 	]*v4fnmaddps \(%ecx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 2f aa 09[ 	]*v4fnmaddps \(%ecx\),%ymm4,%ymm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f af aa 09[ 	]*v4fnmaddps \(%ecx\),%ymm4,%ymm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 8c f4 c0 1d fe ff[ 	]*v4fnmaddps -0x1e240\(%esp,%esi,8\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 8a e0 0f 00 00[ 	]*v4fnmaddps 0xfe0\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 8a 00 10 00 00[ 	]*v4fnmaddps 0x1000\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 8a 00 f0 ff ff[ 	]*v4fnmaddps -0x1000\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 aa 8a e0 ef ff ff[ 	]*v4fnmaddps -0x1020\(%edx\),%ymm4,%ymm1
-#pass
diff --git a/gas/testsuite/gas/i386/avx512_4fmaps_vl.s b/gas/testsuite/gas/i386/avx512_4fmaps_vl.s
deleted file mode 100644
index 56977b4..0000000
--- a/gas/testsuite/gas/i386/avx512_4fmaps_vl.s
+++ /dev/null
@@ -1,74 +0,0 @@
-# Check 32bit AVX512{_4FMAPS,VL} instructions
-
-	.allow_index_reg
-	.text
-_start:
-	v4fmaddps	(%ecx), %xmm4, %xmm1	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	(%ecx), %xmm4, %xmm1{%k7}	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	(%ecx), %xmm4, %xmm1{%k7}{z}	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	-123456(%esp,%esi,8), %xmm4, %xmm1	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	4064(%edx), %xmm4, %xmm1	 # AVX512{_4FMAPS,VL} Disp8
-	v4fmaddps	4096(%edx), %xmm4, %xmm1	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	-4096(%edx), %xmm4, %xmm1	 # AVX512{_4FMAPS,VL} Disp8
-	v4fmaddps	-4128(%edx), %xmm4, %xmm1	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	(%ecx), %ymm4, %ymm1	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	(%ecx), %ymm4, %ymm1{%k7}	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	(%ecx), %ymm4, %ymm1{%k7}{z}	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	-123456(%esp,%esi,8), %ymm4, %ymm1	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	4064(%edx), %ymm4, %ymm1	 # AVX512{_4FMAPS,VL} Disp8
-	v4fmaddps	4096(%edx), %ymm4, %ymm1	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	-4096(%edx), %ymm4, %ymm1	 # AVX512{_4FMAPS,VL} Disp8
-	v4fmaddps	-4128(%edx), %ymm4, %ymm1	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	(%ecx), %xmm4, %xmm1	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	(%ecx), %xmm4, %xmm1{%k7}	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	(%ecx), %xmm4, %xmm1{%k7}{z}	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	-123456(%esp,%esi,8), %xmm4, %xmm1	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	4064(%edx), %xmm4, %xmm1	 # AVX512{_4FMAPS,VL} Disp8
-	v4fnmaddps	4096(%edx), %xmm4, %xmm1	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	-4096(%edx), %xmm4, %xmm1	 # AVX512{_4FMAPS,VL} Disp8
-	v4fnmaddps	-4128(%edx), %xmm4, %xmm1	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	(%ecx), %ymm4, %ymm1	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	(%ecx), %ymm4, %ymm1{%k7}	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	(%ecx), %ymm4, %ymm1{%k7}{z}	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	-123456(%esp,%esi,8), %ymm4, %ymm1	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	4064(%edx), %ymm4, %ymm1	 # AVX512{_4FMAPS,VL} Disp8
-	v4fnmaddps	4096(%edx), %ymm4, %ymm1	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	-4096(%edx), %ymm4, %ymm1	 # AVX512{_4FMAPS,VL} Disp8
-
-	.intel_syntax noprefix
-	v4fmaddps	xmm1, xmm4, [ecx]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	xmm1, xmm4, XMMWORD PTR [ecx]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	xmm1{k7}, xmm4, XMMWORD PTR [ecx]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	xmm1{k7}{z}, xmm4, XMMWORD PTR [ecx]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	xmm1, xmm4, XMMWORD PTR [esp+esi*8-123456]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	xmm1, xmm4, XMMWORD PTR [edx+4064]	 # AVX512{_4FMAPS,VL} Disp8
-	v4fmaddps	xmm1, xmm4, XMMWORD PTR [edx+4096]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	xmm1, xmm4, XMMWORD PTR [edx-4096]	 # AVX512{_4FMAPS,VL} Disp8
-	v4fmaddps	xmm1, xmm4, XMMWORD PTR [edx-4128]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	ymm1, ymm4, [ecx]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	ymm1, ymm4, XMMWORD PTR [ecx]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	ymm1{k7}, ymm4, XMMWORD PTR [ecx]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	ymm1{k7}{z}, ymm4, XMMWORD PTR [ecx]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	ymm1, ymm4, XMMWORD PTR [esp+esi*8-123456]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	ymm1, ymm4, XMMWORD PTR [edx+4064]	 # AVX512{_4FMAPS,VL} Disp8
-	v4fmaddps	ymm1, ymm4, XMMWORD PTR [edx+4096]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	ymm1, ymm4, XMMWORD PTR [edx-4096]	 # AVX512{_4FMAPS,VL} Disp8
-	v4fmaddps	ymm1, ymm4, XMMWORD PTR [edx-4128]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	xmm1, xmm4, [ecx]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	xmm1, xmm4, XMMWORD PTR [ecx]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	xmm1{k7}, xmm4, XMMWORD PTR [ecx]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	xmm1{k7}{z}, xmm4, XMMWORD PTR [ecx]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	xmm1, xmm4, XMMWORD PTR [esp+esi*8-123456]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	xmm1, xmm4, XMMWORD PTR [edx+4064]	 # AVX512{_4FMAPS,VL} Disp8
-	v4fnmaddps	xmm1, xmm4, XMMWORD PTR [edx+4096]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	xmm1, xmm4, XMMWORD PTR [edx-4096]	 # AVX512{_4FMAPS,VL} Disp8
-	v4fnmaddps	xmm1, xmm4, XMMWORD PTR [edx-4128]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	ymm1, ymm4, [ecx]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	ymm1, ymm4, XMMWORD PTR [ecx]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	ymm1{k7}, ymm4, XMMWORD PTR [ecx]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	ymm1{k7}{z}, ymm4, XMMWORD PTR [ecx]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	ymm1, ymm4, XMMWORD PTR [esp+esi*8-123456]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	ymm1, ymm4, XMMWORD PTR [edx+4064]	 # AVX512{_4FMAPS,VL} Disp8
-	v4fnmaddps	ymm1, ymm4, XMMWORD PTR [edx+4096]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	ymm1, ymm4, XMMWORD PTR [edx-4096]	 # AVX512{_4FMAPS,VL} Disp8
-	v4fnmaddps	ymm1, ymm4, XMMWORD PTR [edx-4128]	 # AVX512{_4FMAPS,VL}
diff --git a/gas/testsuite/gas/i386/avx512_4vnniw_vl-intel.d b/gas/testsuite/gas/i386/avx512_4vnniw_vl-intel.d
deleted file mode 100644
index a7d3ed9..0000000
--- a/gas/testsuite/gas/i386/avx512_4vnniw_vl-intel.d
+++ /dev/null
@@ -1,79 +0,0 @@
-#objdump: -dw -Mintel
-#name: i386 AVX512/4VNNIW_VL insns (Intel disassembly)
-#source: avx512_4vnniw_vl.s
-
-.*: +file format .*
-
-
-Disassembly of section \.text:
-
-0+ <_start>:
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 09[ 	]*vp4dpwssd xmm1,xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 0f 52 09[ 	]*vp4dpwssd xmm1\{k7\},xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 8f 52 09[ 	]*vp4dpwssd xmm1\{k7\}\{z\},xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 8c f4 c0 1d fe ff[ 	]*vp4dpwssd xmm1,xmm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 8a e0 0f 00 00[ 	]*vp4dpwssd xmm1,xmm4,XMMWORD PTR \[edx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 8a 00 10 00 00[ 	]*vp4dpwssd xmm1,xmm4,XMMWORD PTR \[edx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 8a 00 f0 ff ff[ 	]*vp4dpwssd xmm1,xmm4,XMMWORD PTR \[edx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 8a e0 ef ff ff[ 	]*vp4dpwssd xmm1,xmm4,XMMWORD PTR \[edx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 09[ 	]*vp4dpwssd ymm1,ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 2f 52 09[ 	]*vp4dpwssd ymm1\{k7\},ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f af 52 09[ 	]*vp4dpwssd ymm1\{k7\}\{z\},ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 8c f4 c0 1d fe ff[ 	]*vp4dpwssd ymm1,ymm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 8a e0 0f 00 00[ 	]*vp4dpwssd ymm1,ymm4,XMMWORD PTR \[edx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 8a 00 10 00 00[ 	]*vp4dpwssd ymm1,ymm4,XMMWORD PTR \[edx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 8a 00 f0 ff ff[ 	]*vp4dpwssd ymm1,ymm4,XMMWORD PTR \[edx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 8a e0 ef ff ff[ 	]*vp4dpwssd ymm1,ymm4,XMMWORD PTR \[edx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 09[ 	]*vp4dpwssds xmm1,xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 0f 53 09[ 	]*vp4dpwssds xmm1\{k7\},xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 8f 53 09[ 	]*vp4dpwssds xmm1\{k7\}\{z\},xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 8c f4 c0 1d fe ff[ 	]*vp4dpwssds xmm1,xmm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 8a e0 0f 00 00[ 	]*vp4dpwssds xmm1,xmm4,XMMWORD PTR \[edx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 8a 00 10 00 00[ 	]*vp4dpwssds xmm1,xmm4,XMMWORD PTR \[edx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 8a 00 f0 ff ff[ 	]*vp4dpwssds xmm1,xmm4,XMMWORD PTR \[edx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 8a e0 ef ff ff[ 	]*vp4dpwssds xmm1,xmm4,XMMWORD PTR \[edx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 09[ 	]*vp4dpwssds ymm1,ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 2f 53 09[ 	]*vp4dpwssds ymm1\{k7\},ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f af 53 09[ 	]*vp4dpwssds ymm1\{k7\}\{z\},ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 8c f4 c0 1d fe ff[ 	]*vp4dpwssds ymm1,ymm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 8a e0 0f 00 00[ 	]*vp4dpwssds ymm1,ymm4,XMMWORD PTR \[edx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 8a 00 10 00 00[ 	]*vp4dpwssds ymm1,ymm4,XMMWORD PTR \[edx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 8a 00 f0 ff ff[ 	]*vp4dpwssds ymm1,ymm4,XMMWORD PTR \[edx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 8a e0 ef ff ff[ 	]*vp4dpwssds ymm1,ymm4,XMMWORD PTR \[edx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 09[ 	]*vp4dpwssd xmm1,xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 09[ 	]*vp4dpwssd xmm1,xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 0f 52 09[ 	]*vp4dpwssd xmm1\{k7\},xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 8f 52 09[ 	]*vp4dpwssd xmm1\{k7\}\{z\},xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 8c f4 c0 1d fe ff[ 	]*vp4dpwssd xmm1,xmm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 8a e0 0f 00 00[ 	]*vp4dpwssd xmm1,xmm4,XMMWORD PTR \[edx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 8a 00 10 00 00[ 	]*vp4dpwssd xmm1,xmm4,XMMWORD PTR \[edx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 8a 00 f0 ff ff[ 	]*vp4dpwssd xmm1,xmm4,XMMWORD PTR \[edx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 8a e0 ef ff ff[ 	]*vp4dpwssd xmm1,xmm4,XMMWORD PTR \[edx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 09[ 	]*vp4dpwssd ymm1,ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 09[ 	]*vp4dpwssd ymm1,ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 2f 52 09[ 	]*vp4dpwssd ymm1\{k7\},ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f af 52 09[ 	]*vp4dpwssd ymm1\{k7\}\{z\},ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 8c f4 c0 1d fe ff[ 	]*vp4dpwssd ymm1,ymm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 8a e0 0f 00 00[ 	]*vp4dpwssd ymm1,ymm4,XMMWORD PTR \[edx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 8a 00 10 00 00[ 	]*vp4dpwssd ymm1,ymm4,XMMWORD PTR \[edx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 8a 00 f0 ff ff[ 	]*vp4dpwssd ymm1,ymm4,XMMWORD PTR \[edx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 8a e0 ef ff ff[ 	]*vp4dpwssd ymm1,ymm4,XMMWORD PTR \[edx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 09[ 	]*vp4dpwssds xmm1,xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 09[ 	]*vp4dpwssds xmm1,xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 0f 53 09[ 	]*vp4dpwssds xmm1\{k7\},xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 8f 53 09[ 	]*vp4dpwssds xmm1\{k7\}\{z\},xmm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 8c f4 c0 1d fe ff[ 	]*vp4dpwssds xmm1,xmm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 8a e0 0f 00 00[ 	]*vp4dpwssds xmm1,xmm4,XMMWORD PTR \[edx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 8a 00 10 00 00[ 	]*vp4dpwssds xmm1,xmm4,XMMWORD PTR \[edx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 8a 00 f0 ff ff[ 	]*vp4dpwssds xmm1,xmm4,XMMWORD PTR \[edx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 8a e0 ef ff ff[ 	]*vp4dpwssds xmm1,xmm4,XMMWORD PTR \[edx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 09[ 	]*vp4dpwssds ymm1,ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 09[ 	]*vp4dpwssds ymm1,ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 2f 53 09[ 	]*vp4dpwssds ymm1\{k7\},ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f af 53 09[ 	]*vp4dpwssds ymm1\{k7\}\{z\},ymm4,XMMWORD PTR \[ecx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 8c f4 c0 1d fe ff[ 	]*vp4dpwssds ymm1,ymm4,XMMWORD PTR \[esp\+esi\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 8a e0 0f 00 00[ 	]*vp4dpwssds ymm1,ymm4,XMMWORD PTR \[edx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 8a 00 10 00 00[ 	]*vp4dpwssds ymm1,ymm4,XMMWORD PTR \[edx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 8a 00 f0 ff ff[ 	]*vp4dpwssds ymm1,ymm4,XMMWORD PTR \[edx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 8a e0 ef ff ff[ 	]*vp4dpwssds ymm1,ymm4,XMMWORD PTR \[edx-0x1020\]
-#pass
diff --git a/gas/testsuite/gas/i386/avx512_4vnniw_vl.d b/gas/testsuite/gas/i386/avx512_4vnniw_vl.d
deleted file mode 100644
index e796321..0000000
--- a/gas/testsuite/gas/i386/avx512_4vnniw_vl.d
+++ /dev/null
@@ -1,79 +0,0 @@
-#objdump: -dw
-#name: i386 AVX512/4VNNIW_VL insns
-#source: avx512_4vnniw_vl.s
-
-.*: +file format .*
-
-
-Disassembly of section \.text:
-
-0+ <_start>:
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 09[ 	]*vp4dpwssd \(%ecx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 0f 52 09[ 	]*vp4dpwssd \(%ecx\),%xmm4,%xmm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 8f 52 09[ 	]*vp4dpwssd \(%ecx\),%xmm4,%xmm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 8c f4 c0 1d fe ff[ 	]*vp4dpwssd -0x1e240\(%esp,%esi,8\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 8a e0 0f 00 00[ 	]*vp4dpwssd 0xfe0\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 8a 00 10 00 00[ 	]*vp4dpwssd 0x1000\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 8a 00 f0 ff ff[ 	]*vp4dpwssd -0x1000\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 8a e0 ef ff ff[ 	]*vp4dpwssd -0x1020\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 09[ 	]*vp4dpwssd \(%ecx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 2f 52 09[ 	]*vp4dpwssd \(%ecx\),%ymm4,%ymm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f af 52 09[ 	]*vp4dpwssd \(%ecx\),%ymm4,%ymm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 8c f4 c0 1d fe ff[ 	]*vp4dpwssd -0x1e240\(%esp,%esi,8\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 8a e0 0f 00 00[ 	]*vp4dpwssd 0xfe0\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 8a 00 10 00 00[ 	]*vp4dpwssd 0x1000\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 8a 00 f0 ff ff[ 	]*vp4dpwssd -0x1000\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 8a e0 ef ff ff[ 	]*vp4dpwssd -0x1020\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 09[ 	]*vp4dpwssds \(%ecx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 0f 53 09[ 	]*vp4dpwssds \(%ecx\),%xmm4,%xmm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 8f 53 09[ 	]*vp4dpwssds \(%ecx\),%xmm4,%xmm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 8c f4 c0 1d fe ff[ 	]*vp4dpwssds -0x1e240\(%esp,%esi,8\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 8a e0 0f 00 00[ 	]*vp4dpwssds 0xfe0\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 8a 00 10 00 00[ 	]*vp4dpwssds 0x1000\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 8a 00 f0 ff ff[ 	]*vp4dpwssds -0x1000\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 8a e0 ef ff ff[ 	]*vp4dpwssds -0x1020\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 09[ 	]*vp4dpwssds \(%ecx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 2f 53 09[ 	]*vp4dpwssds \(%ecx\),%ymm4,%ymm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f af 53 09[ 	]*vp4dpwssds \(%ecx\),%ymm4,%ymm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 8c f4 c0 1d fe ff[ 	]*vp4dpwssds -0x1e240\(%esp,%esi,8\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 8a e0 0f 00 00[ 	]*vp4dpwssds 0xfe0\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 8a 00 10 00 00[ 	]*vp4dpwssds 0x1000\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 8a 00 f0 ff ff[ 	]*vp4dpwssds -0x1000\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 8a e0 ef ff ff[ 	]*vp4dpwssds -0x1020\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 09[ 	]*vp4dpwssd \(%ecx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 09[ 	]*vp4dpwssd \(%ecx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 0f 52 09[ 	]*vp4dpwssd \(%ecx\),%xmm4,%xmm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 8f 52 09[ 	]*vp4dpwssd \(%ecx\),%xmm4,%xmm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 8c f4 c0 1d fe ff[ 	]*vp4dpwssd -0x1e240\(%esp,%esi,8\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 8a e0 0f 00 00[ 	]*vp4dpwssd 0xfe0\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 8a 00 10 00 00[ 	]*vp4dpwssd 0x1000\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 8a 00 f0 ff ff[ 	]*vp4dpwssd -0x1000\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 52 8a e0 ef ff ff[ 	]*vp4dpwssd -0x1020\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 09[ 	]*vp4dpwssd \(%ecx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 09[ 	]*vp4dpwssd \(%ecx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 2f 52 09[ 	]*vp4dpwssd \(%ecx\),%ymm4,%ymm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f af 52 09[ 	]*vp4dpwssd \(%ecx\),%ymm4,%ymm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 8c f4 c0 1d fe ff[ 	]*vp4dpwssd -0x1e240\(%esp,%esi,8\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 8a e0 0f 00 00[ 	]*vp4dpwssd 0xfe0\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 8a 00 10 00 00[ 	]*vp4dpwssd 0x1000\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 8a 00 f0 ff ff[ 	]*vp4dpwssd -0x1000\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 52 8a e0 ef ff ff[ 	]*vp4dpwssd -0x1020\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 09[ 	]*vp4dpwssds \(%ecx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 09[ 	]*vp4dpwssds \(%ecx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 0f 53 09[ 	]*vp4dpwssds \(%ecx\),%xmm4,%xmm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 8f 53 09[ 	]*vp4dpwssds \(%ecx\),%xmm4,%xmm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 8c f4 c0 1d fe ff[ 	]*vp4dpwssds -0x1e240\(%esp,%esi,8\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 8a e0 0f 00 00[ 	]*vp4dpwssds 0xfe0\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 8a 00 10 00 00[ 	]*vp4dpwssds 0x1000\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 8a 00 f0 ff ff[ 	]*vp4dpwssds -0x1000\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 08 53 8a e0 ef ff ff[ 	]*vp4dpwssds -0x1020\(%edx\),%xmm4,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 09[ 	]*vp4dpwssds \(%ecx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 09[ 	]*vp4dpwssds \(%ecx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 2f 53 09[ 	]*vp4dpwssds \(%ecx\),%ymm4,%ymm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f af 53 09[ 	]*vp4dpwssds \(%ecx\),%ymm4,%ymm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 8c f4 c0 1d fe ff[ 	]*vp4dpwssds -0x1e240\(%esp,%esi,8\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 8a e0 0f 00 00[ 	]*vp4dpwssds 0xfe0\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 8a 00 10 00 00[ 	]*vp4dpwssds 0x1000\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 8a 00 f0 ff ff[ 	]*vp4dpwssds -0x1000\(%edx\),%ymm4,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 5f 28 53 8a e0 ef ff ff[ 	]*vp4dpwssds -0x1020\(%edx\),%ymm4,%ymm1
-#pass
diff --git a/gas/testsuite/gas/i386/avx512_4vnniw_vl.s b/gas/testsuite/gas/i386/avx512_4vnniw_vl.s
deleted file mode 100644
index dfdd485..0000000
--- a/gas/testsuite/gas/i386/avx512_4vnniw_vl.s
+++ /dev/null
@@ -1,75 +0,0 @@
-# Check 32bit AVX512{_4VNNIW,VL} instructions
-
-	.allow_index_reg
-	.text
-_start:
-	vp4dpwssd	(%ecx), %xmm4, %xmm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	(%ecx), %xmm4, %xmm1{%k7}	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	(%ecx), %xmm4, %xmm1{%k7}{z}	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	-123456(%esp,%esi,8), %xmm4, %xmm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	4064(%edx), %xmm4, %xmm1	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssd	4096(%edx), %xmm4, %xmm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	-4096(%edx), %xmm4, %xmm1	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssd	-4128(%edx), %xmm4, %xmm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	(%ecx), %ymm4, %ymm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	(%ecx), %ymm4, %ymm1{%k7}	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	(%ecx), %ymm4, %ymm1{%k7}{z}	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	-123456(%esp,%esi,8), %ymm4, %ymm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	4064(%edx), %ymm4, %ymm1	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssd	4096(%edx), %ymm4, %ymm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	-4096(%edx), %ymm4, %ymm1	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssd	-4128(%edx), %ymm4, %ymm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	(%ecx), %xmm4, %xmm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	(%ecx), %xmm4, %xmm1{%k7}	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	(%ecx), %xmm4, %xmm1{%k7}{z}	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	-123456(%esp,%esi,8), %xmm4, %xmm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	4064(%edx), %xmm4, %xmm1	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssds	4096(%edx), %xmm4, %xmm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	-4096(%edx), %xmm4, %xmm1	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssds	-4128(%edx), %xmm4, %xmm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	(%ecx), %ymm4, %ymm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	(%ecx), %ymm4, %ymm1{%k7}	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	(%ecx), %ymm4, %ymm1{%k7}{z}	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	-123456(%esp,%esi,8), %ymm4, %ymm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	4064(%edx), %ymm4, %ymm1	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssds	4096(%edx), %ymm4, %ymm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	-4096(%edx), %ymm4, %ymm1	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssds	-4128(%edx), %ymm4, %ymm1	 # AVX512{_4VNNIW,VL}
-
-	.intel_syntax noprefix
-	vp4dpwssd	xmm1, xmm4, [ecx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	xmm1, xmm4, XMMWORD PTR [ecx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	xmm1{k7}, xmm4, XMMWORD PTR [ecx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	xmm1{k7}{z}, xmm4, XMMWORD PTR [ecx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	xmm1, xmm4, XMMWORD PTR [esp+esi*8-123456]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	xmm1, xmm4, XMMWORD PTR [edx+4064]	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssd	xmm1, xmm4, XMMWORD PTR [edx+4096]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	xmm1, xmm4, XMMWORD PTR [edx-4096]	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssd	xmm1, xmm4, XMMWORD PTR [edx-4128]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	ymm1, ymm4, [ecx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	ymm1, ymm4, XMMWORD PTR [ecx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	ymm1{k7}, ymm4, XMMWORD PTR [ecx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	ymm1{k7}{z}, ymm4, XMMWORD PTR [ecx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	ymm1, ymm4, XMMWORD PTR [esp+esi*8-123456]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	ymm1, ymm4, XMMWORD PTR [edx+4064]	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssd	ymm1, ymm4, XMMWORD PTR [edx+4096]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	ymm1, ymm4, XMMWORD PTR [edx-4096]	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssd	ymm1, ymm4, XMMWORD PTR [edx-4128]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	xmm1, xmm4, [ecx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	xmm1, xmm4, XMMWORD PTR [ecx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	xmm1{k7}, xmm4, XMMWORD PTR [ecx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	xmm1{k7}{z}, xmm4, XMMWORD PTR [ecx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	xmm1, xmm4, XMMWORD PTR [esp+esi*8-123456]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	xmm1, xmm4, XMMWORD PTR [edx+4064]	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssds	xmm1, xmm4, XMMWORD PTR [edx+4096]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	xmm1, xmm4, XMMWORD PTR [edx-4096]	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssds	xmm1, xmm4, XMMWORD PTR [edx-4128]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	ymm1, ymm4, [ecx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	ymm1, ymm4, XMMWORD PTR [ecx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	ymm1{k7}, ymm4, XMMWORD PTR [ecx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	ymm1{k7}{z}, ymm4, XMMWORD PTR [ecx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	ymm1, ymm4, XMMWORD PTR [esp+esi*8-123456]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	ymm1, ymm4, XMMWORD PTR [edx+4064]	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssds	ymm1, ymm4, XMMWORD PTR [edx+4096]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	ymm1, ymm4, XMMWORD PTR [edx-4096]	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssds	ymm1, ymm4, XMMWORD PTR [edx-4128]	 # AVX512{_4VNNIW,VL}
diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index 7e102b6..264e164 100644
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -361,14 +361,9 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
     run_dump_test "avx512vbmi_vl-intel"
     run_dump_test "avx512_4fmaps"
     run_dump_test "avx512_4fmaps-intel"
-    run_dump_test "avx512_4fmaps_vl"
-    run_dump_test "avx512_4fmaps_vl-intel"
     run_list_test "avx512_4fmaps-warn"
-    run_list_test "avx512_4fmaps_vl-warn"
     run_dump_test "avx512_4vnniw"
     run_dump_test "avx512_4vnniw-intel"
-    run_dump_test "avx512_4vnniw_vl"
-    run_dump_test "avx512_4vnniw_vl-intel"
     run_dump_test "avx512_vpopcntdq"
     run_dump_test "avx512_vpopcntdq-intel"
     run_dump_test "avx512vbmi2"
@@ -831,14 +826,9 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] t
     run_dump_test "x86-64-avx512vbmi_vl-intel"
     run_dump_test "x86-64-avx512_4fmaps"
     run_dump_test "x86-64-avx512_4fmaps-intel"
-    run_dump_test "x86-64-avx512_4fmaps_vl"
-    run_dump_test "x86-64-avx512_4fmaps_vl-intel"
     run_list_test "x86-64-avx512_4fmaps-warn"
-    run_list_test "x86-64-avx512_4fmaps_vl-warn"
     run_dump_test "x86-64-avx512_4vnniw"
     run_dump_test "x86-64-avx512_4vnniw-intel"
-    run_dump_test "x86-64-avx512_4vnniw_vl"
-    run_dump_test "x86-64-avx512_4vnniw_vl-intel"
     run_dump_test "x86-64-avx512_vpopcntdq"
     run_dump_test "x86-64-avx512_vpopcntdq-intel"
     run_dump_test "x86-64-avx512vbmi2"
diff --git a/gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl-intel.d b/gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl-intel.d
deleted file mode 100644
index e01a307..0000000
--- a/gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl-intel.d
+++ /dev/null
@@ -1,79 +0,0 @@
-#objdump: -dw -Mintel
-#name: x86_64 AVX512/4FMAPS_VL insns (Intel disassembly)
-#source: x86-64-avx512_4fmaps_vl.s
-
-.*: +file format .*
-
-
-Disassembly of section \.text:
-
-0+ <_start>:
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 9a 09[ 	]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 0f 9a 09[ 	]*v4fmaddps xmm1\{k7\},xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 8f 9a 09[ 	]*v4fmaddps xmm1\{k7\}\{z\},xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 08 9a 8c f0 c0 1d fe ff[ 	]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 9a 8a e0 0f 00 00[ 	]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 9a 8a 00 10 00 00[ 	]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 9a 8a 00 f0 ff ff[ 	]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 9a 8a e0 ef ff ff[ 	]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 9a 09[ 	]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 2f 9a 09[ 	]*v4fmaddps ymm1\{k7\},ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f af 9a 09[ 	]*v4fmaddps ymm1\{k7\}\{z\},ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 28 9a 8c f0 c0 1d fe ff[ 	]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 9a 8a e0 0f 00 00[ 	]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 9a 8a 00 10 00 00[ 	]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 9a 8a 00 f0 ff ff[ 	]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 9a 8a e0 ef ff ff[ 	]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 aa 09[ 	]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 0f aa 09[ 	]*v4fnmaddps xmm1\{k7\},xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 8f aa 09[ 	]*v4fnmaddps xmm1\{k7\}\{z\},xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 08 aa 8c f0 c0 1d fe ff[ 	]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 aa 8a e0 0f 00 00[ 	]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 aa 8a 00 10 00 00[ 	]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 aa 8a 00 f0 ff ff[ 	]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 aa 8a e0 ef ff ff[ 	]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 aa 09[ 	]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 2f aa 09[ 	]*v4fnmaddps ymm1\{k7\},ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f af aa 09[ 	]*v4fnmaddps ymm1\{k7\}\{z\},ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 28 aa 8c f0 c0 1d fe ff[ 	]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 aa 8a e0 0f 00 00[ 	]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 aa 8a 00 10 00 00[ 	]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 aa 8a 00 f0 ff ff[ 	]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 aa 8a e0 ef ff ff[ 	]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 9a 09[ 	]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 9a 09[ 	]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 0f 9a 09[ 	]*v4fmaddps xmm1\{k7\},xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 8f 9a 09[ 	]*v4fmaddps xmm1\{k7\}\{z\},xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 08 9a 8c f0 c0 1d fe ff[ 	]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 9a 8a e0 0f 00 00[ 	]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 9a 8a 00 10 00 00[ 	]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 9a 8a 00 f0 ff ff[ 	]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 9a 8a e0 ef ff ff[ 	]*v4fmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 9a 09[ 	]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 9a 09[ 	]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 2f 9a 09[ 	]*v4fmaddps ymm1\{k7\},ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f af 9a 09[ 	]*v4fmaddps ymm1\{k7\}\{z\},ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 28 9a 8c f0 c0 1d fe ff[ 	]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 9a 8a e0 0f 00 00[ 	]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 9a 8a 00 10 00 00[ 	]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 9a 8a 00 f0 ff ff[ 	]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 9a 8a e0 ef ff ff[ 	]*v4fmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 aa 09[ 	]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 aa 09[ 	]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 0f aa 09[ 	]*v4fnmaddps xmm1\{k7\},xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 8f aa 09[ 	]*v4fnmaddps xmm1\{k7\}\{z\},xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 08 aa 8c f0 c0 1d fe ff[ 	]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 aa 8a e0 0f 00 00[ 	]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 aa 8a 00 10 00 00[ 	]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 aa 8a 00 f0 ff ff[ 	]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 aa 8a e0 ef ff ff[ 	]*v4fnmaddps xmm1,xmm8,XMMWORD PTR \[rdx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 aa 09[ 	]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 aa 09[ 	]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 2f aa 09[ 	]*v4fnmaddps ymm1\{k7\},ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f af aa 09[ 	]*v4fnmaddps ymm1\{k7\}\{z\},ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 28 aa 8c f0 c0 1d fe ff[ 	]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 aa 8a e0 0f 00 00[ 	]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 aa 8a 00 10 00 00[ 	]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 aa 8a 00 f0 ff ff[ 	]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 aa 8a e0 ef ff ff[ 	]*v4fnmaddps ymm1,ymm8,XMMWORD PTR \[rdx-0x1020\]
-#pass
diff --git a/gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl-warn.l b/gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl-warn.l
deleted file mode 100644
index fc42237..0000000
--- a/gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl-warn.l
+++ /dev/null
@@ -1,13 +0,0 @@
-.*: Assembler messages:
-.*:5: Warning: the second source register `%xmm1' implicitly denotes `%xmm0' to `%xmm3' source group in `v4fmaddps'
-.*:6: Warning: the second source register `%xmm2' implicitly denotes `%xmm0' to `%xmm3' source group in `v4fmaddps'
-.*:7: Warning: the second source register `%xmm3' implicitly denotes `%xmm0' to `%xmm3' source group in `v4fmaddps'
-.*:10: Warning: the second source register `%xmm1' implicitly denotes `%xmm0' to `%xmm3' source group in `v4fnmaddps'
-.*:11: Warning: the second source register `%xmm2' implicitly denotes `%xmm0' to `%xmm3' source group in `v4fnmaddps'
-.*:12: Warning: the second source register `%xmm3' implicitly denotes `%xmm0' to `%xmm3' source group in `v4fnmaddps'
-.*:15: Warning: the second source register `%ymm1' implicitly denotes `%ymm0' to `%ymm3' source group in `v4fmaddps'
-.*:16: Warning: the second source register `%ymm2' implicitly denotes `%ymm0' to `%ymm3' source group in `v4fmaddps'
-.*:17: Warning: the second source register `%ymm3' implicitly denotes `%ymm0' to `%ymm3' source group in `v4fmaddps'
-.*:20: Warning: the second source register `%ymm1' implicitly denotes `%ymm0' to `%ymm3' source group in `v4fnmaddps'
-.*:21: Warning: the second source register `%ymm2' implicitly denotes `%ymm0' to `%ymm3' source group in `v4fnmaddps'
-.*:22: Warning: the second source register `%ymm3' implicitly denotes `%ymm0' to `%ymm3' source group in `v4fnmaddps'
diff --git a/gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl-warn.s b/gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl-warn.s
deleted file mode 100644
index 368b4b1..0000000
--- a/gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl-warn.s
+++ /dev/null
@@ -1,23 +0,0 @@
-# Check warnings for invalid usage of register group
-
-.text
-	v4fmaddps (%rax), %xmm0, %xmm10
-	v4fmaddps (%rax), %xmm1, %xmm10
-	v4fmaddps (%rax), %xmm2, %xmm10
-	v4fmaddps (%rax), %xmm3, %xmm10
-	v4fmaddps (%rax), %xmm4, %xmm10
-	v4fnmaddps (%rax), %xmm0, %xmm10
-	v4fnmaddps (%rax), %xmm1, %xmm10
-	v4fnmaddps (%rax), %xmm2, %xmm10
-	v4fnmaddps (%rax), %xmm3, %xmm10
-	v4fnmaddps (%rax), %xmm4, %xmm10
-	v4fmaddps (%rax), %ymm0, %ymm10
-	v4fmaddps (%rax), %ymm1, %ymm10
-	v4fmaddps (%rax), %ymm2, %ymm10
-	v4fmaddps (%rax), %ymm3, %ymm10
-	v4fmaddps (%rax), %ymm4, %ymm10
-	v4fnmaddps (%rax), %ymm0, %ymm10
-	v4fnmaddps (%rax), %ymm1, %ymm10
-	v4fnmaddps (%rax), %ymm2, %ymm10
-	v4fnmaddps (%rax), %ymm3, %ymm10
-	v4fnmaddps (%rax), %ymm4, %ymm10
diff --git a/gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl.d b/gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl.d
deleted file mode 100644
index da12ddc..0000000
--- a/gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl.d
+++ /dev/null
@@ -1,79 +0,0 @@
-#objdump: -dw
-#name: x86_64 AVX512/4FMAPS_VL insns
-#source: x86-64-avx512_4fmaps_vl.s
-
-.*: +file format .*
-
-
-Disassembly of section \.text:
-
-0+ <_start>:
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 9a 09[ 	]*v4fmaddps \(%rcx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 0f 9a 09[ 	]*v4fmaddps \(%rcx\),%xmm8,%xmm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 8f 9a 09[ 	]*v4fmaddps \(%rcx\),%xmm8,%xmm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 08 9a 8c f0 c0 1d fe ff[ 	]*v4fmaddps -0x1e240\(%rax,%r14,8\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 9a 8a e0 0f 00 00[ 	]*v4fmaddps 0xfe0\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 9a 8a 00 10 00 00[ 	]*v4fmaddps 0x1000\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 9a 8a 00 f0 ff ff[ 	]*v4fmaddps -0x1000\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 9a 8a e0 ef ff ff[ 	]*v4fmaddps -0x1020\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 9a 09[ 	]*v4fmaddps \(%rcx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 2f 9a 09[ 	]*v4fmaddps \(%rcx\),%ymm8,%ymm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f af 9a 09[ 	]*v4fmaddps \(%rcx\),%ymm8,%ymm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 28 9a 8c f0 c0 1d fe ff[ 	]*v4fmaddps -0x1e240\(%rax,%r14,8\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 9a 8a e0 0f 00 00[ 	]*v4fmaddps 0xfe0\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 9a 8a 00 10 00 00[ 	]*v4fmaddps 0x1000\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 9a 8a 00 f0 ff ff[ 	]*v4fmaddps -0x1000\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 9a 8a e0 ef ff ff[ 	]*v4fmaddps -0x1020\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 aa 09[ 	]*v4fnmaddps \(%rcx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 0f aa 09[ 	]*v4fnmaddps \(%rcx\),%xmm8,%xmm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 8f aa 09[ 	]*v4fnmaddps \(%rcx\),%xmm8,%xmm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 08 aa 8c f0 c0 1d fe ff[ 	]*v4fnmaddps -0x1e240\(%rax,%r14,8\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 aa 8a e0 0f 00 00[ 	]*v4fnmaddps 0xfe0\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 aa 8a 00 10 00 00[ 	]*v4fnmaddps 0x1000\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 aa 8a 00 f0 ff ff[ 	]*v4fnmaddps -0x1000\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 aa 8a e0 ef ff ff[ 	]*v4fnmaddps -0x1020\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 aa 09[ 	]*v4fnmaddps \(%rcx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 2f aa 09[ 	]*v4fnmaddps \(%rcx\),%ymm8,%ymm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f af aa 09[ 	]*v4fnmaddps \(%rcx\),%ymm8,%ymm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 28 aa 8c f0 c0 1d fe ff[ 	]*v4fnmaddps -0x1e240\(%rax,%r14,8\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 aa 8a e0 0f 00 00[ 	]*v4fnmaddps 0xfe0\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 aa 8a 00 10 00 00[ 	]*v4fnmaddps 0x1000\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 aa 8a 00 f0 ff ff[ 	]*v4fnmaddps -0x1000\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 aa 8a e0 ef ff ff[ 	]*v4fnmaddps -0x1020\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 9a 09[ 	]*v4fmaddps \(%rcx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 9a 09[ 	]*v4fmaddps \(%rcx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 0f 9a 09[ 	]*v4fmaddps \(%rcx\),%xmm8,%xmm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 8f 9a 09[ 	]*v4fmaddps \(%rcx\),%xmm8,%xmm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 08 9a 8c f0 c0 1d fe ff[ 	]*v4fmaddps -0x1e240\(%rax,%r14,8\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 9a 8a e0 0f 00 00[ 	]*v4fmaddps 0xfe0\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 9a 8a 00 10 00 00[ 	]*v4fmaddps 0x1000\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 9a 8a 00 f0 ff ff[ 	]*v4fmaddps -0x1000\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 9a 8a e0 ef ff ff[ 	]*v4fmaddps -0x1020\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 9a 09[ 	]*v4fmaddps \(%rcx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 9a 09[ 	]*v4fmaddps \(%rcx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 2f 9a 09[ 	]*v4fmaddps \(%rcx\),%ymm8,%ymm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f af 9a 09[ 	]*v4fmaddps \(%rcx\),%ymm8,%ymm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 28 9a 8c f0 c0 1d fe ff[ 	]*v4fmaddps -0x1e240\(%rax,%r14,8\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 9a 8a e0 0f 00 00[ 	]*v4fmaddps 0xfe0\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 9a 8a 00 10 00 00[ 	]*v4fmaddps 0x1000\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 9a 8a 00 f0 ff ff[ 	]*v4fmaddps -0x1000\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 9a 8a e0 ef ff ff[ 	]*v4fmaddps -0x1020\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 aa 09[ 	]*v4fnmaddps \(%rcx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 aa 09[ 	]*v4fnmaddps \(%rcx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 0f aa 09[ 	]*v4fnmaddps \(%rcx\),%xmm8,%xmm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 8f aa 09[ 	]*v4fnmaddps \(%rcx\),%xmm8,%xmm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 08 aa 8c f0 c0 1d fe ff[ 	]*v4fnmaddps -0x1e240\(%rax,%r14,8\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 aa 8a e0 0f 00 00[ 	]*v4fnmaddps 0xfe0\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 aa 8a 00 10 00 00[ 	]*v4fnmaddps 0x1000\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 aa 8a 00 f0 ff ff[ 	]*v4fnmaddps -0x1000\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 aa 8a e0 ef ff ff[ 	]*v4fnmaddps -0x1020\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 aa 09[ 	]*v4fnmaddps \(%rcx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 aa 09[ 	]*v4fnmaddps \(%rcx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 2f aa 09[ 	]*v4fnmaddps \(%rcx\),%ymm8,%ymm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f af aa 09[ 	]*v4fnmaddps \(%rcx\),%ymm8,%ymm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 28 aa 8c f0 c0 1d fe ff[ 	]*v4fnmaddps -0x1e240\(%rax,%r14,8\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 aa 8a e0 0f 00 00[ 	]*v4fnmaddps 0xfe0\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 aa 8a 00 10 00 00[ 	]*v4fnmaddps 0x1000\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 aa 8a 00 f0 ff ff[ 	]*v4fnmaddps -0x1000\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 aa 8a e0 ef ff ff[ 	]*v4fnmaddps -0x1020\(%rdx\),%ymm8,%ymm1
-#pass
diff --git a/gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl.s b/gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl.s
deleted file mode 100644
index 0b7cf37..0000000
--- a/gas/testsuite/gas/i386/x86-64-avx512_4fmaps_vl.s
+++ /dev/null
@@ -1,75 +0,0 @@
-# Check 64bit AVX512{_4FMAPS,VL} instructions
-
-	.allow_index_reg
-	.text
-_start:
-	v4fmaddps	(%rcx), %xmm8, %xmm1	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	(%rcx), %xmm8, %xmm1{%k7}	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	(%rcx), %xmm8, %xmm1{%k7}{z}	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	-123456(%rax,%r14,8), %xmm8, %xmm1	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	4064(%rdx), %xmm8, %xmm1	 # AVX512{_4FMAPS,VL} Disp8
-	v4fmaddps	4096(%rdx), %xmm8, %xmm1	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	-4096(%rdx), %xmm8, %xmm1	 # AVX512{_4FMAPS,VL} Disp8
-	v4fmaddps	-4128(%rdx), %xmm8, %xmm1	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	(%rcx), %ymm8, %ymm1	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	(%rcx), %ymm8, %ymm1{%k7}	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	(%rcx), %ymm8, %ymm1{%k7}{z}	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	-123456(%rax,%r14,8), %ymm8, %ymm1	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	4064(%rdx), %ymm8, %ymm1	 # AVX512{_4FMAPS,VL} Disp8
-	v4fmaddps	4096(%rdx), %ymm8, %ymm1	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	-4096(%rdx), %ymm8, %ymm1	 # AVX512{_4FMAPS,VL} Disp8
-	v4fmaddps	-4128(%rdx), %ymm8, %ymm1	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	(%rcx), %xmm8, %xmm1	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	(%rcx), %xmm8, %xmm1{%k7}	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	(%rcx), %xmm8, %xmm1{%k7}{z}	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	-123456(%rax,%r14,8), %xmm8, %xmm1	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	4064(%rdx), %xmm8, %xmm1	 # AVX512{_4FMAPS,VL} Disp8
-	v4fnmaddps	4096(%rdx), %xmm8, %xmm1	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	-4096(%rdx), %xmm8, %xmm1	 # AVX512{_4FMAPS,VL} Disp8
-	v4fnmaddps	-4128(%rdx), %xmm8, %xmm1	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	(%rcx), %ymm8, %ymm1	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	(%rcx), %ymm8, %ymm1{%k7}	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	(%rcx), %ymm8, %ymm1{%k7}{z}	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	-123456(%rax,%r14,8), %ymm8, %ymm1	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	4064(%rdx), %ymm8, %ymm1	 # AVX512{_4FMAPS,VL} Disp8
-	v4fnmaddps	4096(%rdx), %ymm8, %ymm1	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	-4096(%rdx), %ymm8, %ymm1	 # AVX512{_4FMAPS,VL} Disp8
-	v4fnmaddps	-4128(%rdx), %ymm8, %ymm1	 # AVX512{_4FMAPS,VL}
-
-	.intel_syntax noprefix
-	v4fmaddps	xmm1, xmm8, [rcx]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	xmm1, xmm8, XMMWORD PTR [rcx]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	xmm1{k7}, xmm8, XMMWORD PTR [rcx]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	xmm1{k7}{z}, xmm8, XMMWORD PTR [rcx]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	xmm1, xmm8, XMMWORD PTR [rax+r14*8-123456]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	xmm1, xmm8, XMMWORD PTR [rdx+4064]	 # AVX512{_4FMAPS,VL} Disp8
-	v4fmaddps	xmm1, xmm8, XMMWORD PTR [rdx+4096]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	xmm1, xmm8, XMMWORD PTR [rdx-4096]	 # AVX512{_4FMAPS,VL} Disp8
-	v4fmaddps	xmm1, xmm8, XMMWORD PTR [rdx-4128]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	ymm1, ymm8, [rcx]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	ymm1, ymm8, XMMWORD PTR [rcx]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	ymm1{k7}, ymm8, XMMWORD PTR [rcx]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	ymm1{k7}{z}, ymm8, XMMWORD PTR [rcx]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	ymm1, ymm8, XMMWORD PTR [rax+r14*8-123456]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	ymm1, ymm8, XMMWORD PTR [rdx+4064]	 # AVX512{_4FMAPS,VL} Disp8
-	v4fmaddps	ymm1, ymm8, XMMWORD PTR [rdx+4096]	 # AVX512{_4FMAPS,VL}
-	v4fmaddps	ymm1, ymm8, XMMWORD PTR [rdx-4096]	 # AVX512{_4FMAPS,VL} Disp8
-	v4fmaddps	ymm1, ymm8, XMMWORD PTR [rdx-4128]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	xmm1, xmm8, [rcx]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	xmm1, xmm8, XMMWORD PTR [rcx]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	xmm1{k7}, xmm8, XMMWORD PTR [rcx]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	xmm1{k7}{z}, xmm8, XMMWORD PTR [rcx]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	xmm1, xmm8, XMMWORD PTR [rax+r14*8-123456]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	xmm1, xmm8, XMMWORD PTR [rdx+4064]	 # AVX512{_4FMAPS,VL} Disp8
-	v4fnmaddps	xmm1, xmm8, XMMWORD PTR [rdx+4096]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	xmm1, xmm8, XMMWORD PTR [rdx-4096]	 # AVX512{_4FMAPS,VL} Disp8
-	v4fnmaddps	xmm1, xmm8, XMMWORD PTR [rdx-4128]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	ymm1, ymm8, [rcx]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	ymm1, ymm8, XMMWORD PTR [rcx]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	ymm1{k7}, ymm8, XMMWORD PTR [rcx]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	ymm1{k7}{z}, ymm8, XMMWORD PTR [rcx]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	ymm1, ymm8, XMMWORD PTR [rax+r14*8-123456]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	ymm1, ymm8, XMMWORD PTR [rdx+4064]	 # AVX512{_4FMAPS,VL} Disp8
-	v4fnmaddps	ymm1, ymm8, XMMWORD PTR [rdx+4096]	 # AVX512{_4FMAPS,VL}
-	v4fnmaddps	ymm1, ymm8, XMMWORD PTR [rdx-4096]	 # AVX512{_4FMAPS,VL} Disp8
-	v4fnmaddps	ymm1, ymm8, XMMWORD PTR [rdx-4128]	 # AVX512{_4FMAPS,VL}
diff --git a/gas/testsuite/gas/i386/x86-64-avx512_4vnniw_vl-intel.d b/gas/testsuite/gas/i386/x86-64-avx512_4vnniw_vl-intel.d
deleted file mode 100644
index d4a7a95..0000000
--- a/gas/testsuite/gas/i386/x86-64-avx512_4vnniw_vl-intel.d
+++ /dev/null
@@ -1,79 +0,0 @@
-#objdump: -dw -Mintel
-#name: x86_64 AVX512/4VNNIW_VL insns (Intel disassembly)
-#source: x86-64-avx512_4vnniw_vl.s
-
-.*: +file format .*
-
-
-Disassembly of section \.text:
-
-0+ <_start>:
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 52 09[ 	]*vp4dpwssd xmm1,xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 0f 52 09[ 	]*vp4dpwssd xmm1\{k7\},xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 8f 52 09[ 	]*vp4dpwssd xmm1\{k7\}\{z\},xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 08 52 8c f0 c0 1d fe ff[ 	]*vp4dpwssd xmm1,xmm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 52 8a e0 0f 00 00[ 	]*vp4dpwssd xmm1,xmm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 52 8a 00 10 00 00[ 	]*vp4dpwssd xmm1,xmm8,XMMWORD PTR \[rdx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 52 8a 00 f0 ff ff[ 	]*vp4dpwssd xmm1,xmm8,XMMWORD PTR \[rdx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 52 8a e0 ef ff ff[ 	]*vp4dpwssd xmm1,xmm8,XMMWORD PTR \[rdx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 52 09[ 	]*vp4dpwssd ymm1,ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 2f 52 09[ 	]*vp4dpwssd ymm1\{k7\},ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f af 52 09[ 	]*vp4dpwssd ymm1\{k7\}\{z\},ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 28 52 8c f0 c0 1d fe ff[ 	]*vp4dpwssd ymm1,ymm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 52 8a e0 0f 00 00[ 	]*vp4dpwssd ymm1,ymm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 52 8a 00 10 00 00[ 	]*vp4dpwssd ymm1,ymm8,XMMWORD PTR \[rdx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 52 8a 00 f0 ff ff[ 	]*vp4dpwssd ymm1,ymm8,XMMWORD PTR \[rdx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 52 8a e0 ef ff ff[ 	]*vp4dpwssd ymm1,ymm8,XMMWORD PTR \[rdx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 53 09[ 	]*vp4dpwssds xmm1,xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 0f 53 09[ 	]*vp4dpwssds xmm1\{k7\},xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 8f 53 09[ 	]*vp4dpwssds xmm1\{k7\}\{z\},xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 08 53 8c f0 c0 1d fe ff[ 	]*vp4dpwssds xmm1,xmm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 53 8a e0 0f 00 00[ 	]*vp4dpwssds xmm1,xmm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 53 8a 00 10 00 00[ 	]*vp4dpwssds xmm1,xmm8,XMMWORD PTR \[rdx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 53 8a 00 f0 ff ff[ 	]*vp4dpwssds xmm1,xmm8,XMMWORD PTR \[rdx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 53 8a e0 ef ff ff[ 	]*vp4dpwssds xmm1,xmm8,XMMWORD PTR \[rdx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 53 09[ 	]*vp4dpwssds ymm1,ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 2f 53 09[ 	]*vp4dpwssds ymm1\{k7\},ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f af 53 09[ 	]*vp4dpwssds ymm1\{k7\}\{z\},ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 28 53 8c f0 c0 1d fe ff[ 	]*vp4dpwssds ymm1,ymm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 53 8a e0 0f 00 00[ 	]*vp4dpwssds ymm1,ymm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 53 8a 00 10 00 00[ 	]*vp4dpwssds ymm1,ymm8,XMMWORD PTR \[rdx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 53 8a 00 f0 ff ff[ 	]*vp4dpwssds ymm1,ymm8,XMMWORD PTR \[rdx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 53 8a e0 ef ff ff[ 	]*vp4dpwssds ymm1,ymm8,XMMWORD PTR \[rdx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 52 09[ 	]*vp4dpwssd xmm1,xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 52 09[ 	]*vp4dpwssd xmm1,xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 0f 52 09[ 	]*vp4dpwssd xmm1\{k7\},xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 8f 52 09[ 	]*vp4dpwssd xmm1\{k7\}\{z\},xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 08 52 8c f0 c0 1d fe ff[ 	]*vp4dpwssd xmm1,xmm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 52 8a e0 0f 00 00[ 	]*vp4dpwssd xmm1,xmm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 52 8a 00 10 00 00[ 	]*vp4dpwssd xmm1,xmm8,XMMWORD PTR \[rdx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 52 8a 00 f0 ff ff[ 	]*vp4dpwssd xmm1,xmm8,XMMWORD PTR \[rdx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 52 8a e0 ef ff ff[ 	]*vp4dpwssd xmm1,xmm8,XMMWORD PTR \[rdx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 52 09[ 	]*vp4dpwssd ymm1,ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 52 09[ 	]*vp4dpwssd ymm1,ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 2f 52 09[ 	]*vp4dpwssd ymm1\{k7\},ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f af 52 09[ 	]*vp4dpwssd ymm1\{k7\}\{z\},ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 28 52 8c f0 c0 1d fe ff[ 	]*vp4dpwssd ymm1,ymm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 52 8a e0 0f 00 00[ 	]*vp4dpwssd ymm1,ymm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 52 8a 00 10 00 00[ 	]*vp4dpwssd ymm1,ymm8,XMMWORD PTR \[rdx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 52 8a 00 f0 ff ff[ 	]*vp4dpwssd ymm1,ymm8,XMMWORD PTR \[rdx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 52 8a e0 ef ff ff[ 	]*vp4dpwssd ymm1,ymm8,XMMWORD PTR \[rdx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 53 09[ 	]*vp4dpwssds xmm1,xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 53 09[ 	]*vp4dpwssds xmm1,xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 0f 53 09[ 	]*vp4dpwssds xmm1\{k7\},xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 8f 53 09[ 	]*vp4dpwssds xmm1\{k7\}\{z\},xmm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 08 53 8c f0 c0 1d fe ff[ 	]*vp4dpwssds xmm1,xmm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 53 8a e0 0f 00 00[ 	]*vp4dpwssds xmm1,xmm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 53 8a 00 10 00 00[ 	]*vp4dpwssds xmm1,xmm8,XMMWORD PTR \[rdx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 53 8a 00 f0 ff ff[ 	]*vp4dpwssds xmm1,xmm8,XMMWORD PTR \[rdx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 53 8a e0 ef ff ff[ 	]*vp4dpwssds xmm1,xmm8,XMMWORD PTR \[rdx-0x1020\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 53 09[ 	]*vp4dpwssds ymm1,ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 53 09[ 	]*vp4dpwssds ymm1,ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 2f 53 09[ 	]*vp4dpwssds ymm1\{k7\},ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f af 53 09[ 	]*vp4dpwssds ymm1\{k7\}\{z\},ymm8,XMMWORD PTR \[rcx\]
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 28 53 8c f0 c0 1d fe ff[ 	]*vp4dpwssds ymm1,ymm8,XMMWORD PTR \[rax\+r14\*8-0x1e240\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 53 8a e0 0f 00 00[ 	]*vp4dpwssds ymm1,ymm8,XMMWORD PTR \[rdx\+0xfe0\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 53 8a 00 10 00 00[ 	]*vp4dpwssds ymm1,ymm8,XMMWORD PTR \[rdx\+0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 53 8a 00 f0 ff ff[ 	]*vp4dpwssds ymm1,ymm8,XMMWORD PTR \[rdx-0x1000\]
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 53 8a e0 ef ff ff[ 	]*vp4dpwssds ymm1,ymm8,XMMWORD PTR \[rdx-0x1020\]
-#pass
diff --git a/gas/testsuite/gas/i386/x86-64-avx512_4vnniw_vl.d b/gas/testsuite/gas/i386/x86-64-avx512_4vnniw_vl.d
deleted file mode 100644
index df0f522..0000000
--- a/gas/testsuite/gas/i386/x86-64-avx512_4vnniw_vl.d
+++ /dev/null
@@ -1,79 +0,0 @@
-#objdump: -dw
-#name: x86_64 AVX512/4VNNIW_VL insns
-#source: x86-64-avx512_4vnniw_vl.s
-
-.*: +file format .*
-
-
-Disassembly of section \.text:
-
-0+ <_start>:
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 52 09[ 	]*vp4dpwssd \(%rcx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 0f 52 09[ 	]*vp4dpwssd \(%rcx\),%xmm8,%xmm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 8f 52 09[ 	]*vp4dpwssd \(%rcx\),%xmm8,%xmm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 08 52 8c f0 c0 1d fe ff[ 	]*vp4dpwssd -0x1e240\(%rax,%r14,8\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 52 8a e0 0f 00 00[ 	]*vp4dpwssd 0xfe0\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 52 8a 00 10 00 00[ 	]*vp4dpwssd 0x1000\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 52 8a 00 f0 ff ff[ 	]*vp4dpwssd -0x1000\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 52 8a e0 ef ff ff[ 	]*vp4dpwssd -0x1020\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 52 09[ 	]*vp4dpwssd \(%rcx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 2f 52 09[ 	]*vp4dpwssd \(%rcx\),%ymm8,%ymm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f af 52 09[ 	]*vp4dpwssd \(%rcx\),%ymm8,%ymm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 28 52 8c f0 c0 1d fe ff[ 	]*vp4dpwssd -0x1e240\(%rax,%r14,8\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 52 8a e0 0f 00 00[ 	]*vp4dpwssd 0xfe0\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 52 8a 00 10 00 00[ 	]*vp4dpwssd 0x1000\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 52 8a 00 f0 ff ff[ 	]*vp4dpwssd -0x1000\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 52 8a e0 ef ff ff[ 	]*vp4dpwssd -0x1020\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 53 09[ 	]*vp4dpwssds \(%rcx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 0f 53 09[ 	]*vp4dpwssds \(%rcx\),%xmm8,%xmm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 8f 53 09[ 	]*vp4dpwssds \(%rcx\),%xmm8,%xmm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 08 53 8c f0 c0 1d fe ff[ 	]*vp4dpwssds -0x1e240\(%rax,%r14,8\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 53 8a e0 0f 00 00[ 	]*vp4dpwssds 0xfe0\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 53 8a 00 10 00 00[ 	]*vp4dpwssds 0x1000\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 53 8a 00 f0 ff ff[ 	]*vp4dpwssds -0x1000\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 53 8a e0 ef ff ff[ 	]*vp4dpwssds -0x1020\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 53 09[ 	]*vp4dpwssds \(%rcx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 2f 53 09[ 	]*vp4dpwssds \(%rcx\),%ymm8,%ymm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f af 53 09[ 	]*vp4dpwssds \(%rcx\),%ymm8,%ymm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 28 53 8c f0 c0 1d fe ff[ 	]*vp4dpwssds -0x1e240\(%rax,%r14,8\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 53 8a e0 0f 00 00[ 	]*vp4dpwssds 0xfe0\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 53 8a 00 10 00 00[ 	]*vp4dpwssds 0x1000\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 53 8a 00 f0 ff ff[ 	]*vp4dpwssds -0x1000\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 53 8a e0 ef ff ff[ 	]*vp4dpwssds -0x1020\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 52 09[ 	]*vp4dpwssd \(%rcx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 52 09[ 	]*vp4dpwssd \(%rcx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 0f 52 09[ 	]*vp4dpwssd \(%rcx\),%xmm8,%xmm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 8f 52 09[ 	]*vp4dpwssd \(%rcx\),%xmm8,%xmm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 08 52 8c f0 c0 1d fe ff[ 	]*vp4dpwssd -0x1e240\(%rax,%r14,8\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 52 8a e0 0f 00 00[ 	]*vp4dpwssd 0xfe0\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 52 8a 00 10 00 00[ 	]*vp4dpwssd 0x1000\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 52 8a 00 f0 ff ff[ 	]*vp4dpwssd -0x1000\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 52 8a e0 ef ff ff[ 	]*vp4dpwssd -0x1020\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 52 09[ 	]*vp4dpwssd \(%rcx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 52 09[ 	]*vp4dpwssd \(%rcx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 2f 52 09[ 	]*vp4dpwssd \(%rcx\),%ymm8,%ymm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f af 52 09[ 	]*vp4dpwssd \(%rcx\),%ymm8,%ymm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 28 52 8c f0 c0 1d fe ff[ 	]*vp4dpwssd -0x1e240\(%rax,%r14,8\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 52 8a e0 0f 00 00[ 	]*vp4dpwssd 0xfe0\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 52 8a 00 10 00 00[ 	]*vp4dpwssd 0x1000\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 52 8a 00 f0 ff ff[ 	]*vp4dpwssd -0x1000\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 52 8a e0 ef ff ff[ 	]*vp4dpwssd -0x1020\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 53 09[ 	]*vp4dpwssds \(%rcx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 53 09[ 	]*vp4dpwssds \(%rcx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 0f 53 09[ 	]*vp4dpwssds \(%rcx\),%xmm8,%xmm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 8f 53 09[ 	]*vp4dpwssds \(%rcx\),%xmm8,%xmm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 08 53 8c f0 c0 1d fe ff[ 	]*vp4dpwssds -0x1e240\(%rax,%r14,8\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 53 8a e0 0f 00 00[ 	]*vp4dpwssds 0xfe0\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 53 8a 00 10 00 00[ 	]*vp4dpwssds 0x1000\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 53 8a 00 f0 ff ff[ 	]*vp4dpwssds -0x1000\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 08 53 8a e0 ef ff ff[ 	]*vp4dpwssds -0x1020\(%rdx\),%xmm8,%xmm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 53 09[ 	]*vp4dpwssds \(%rcx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 53 09[ 	]*vp4dpwssds \(%rcx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 2f 53 09[ 	]*vp4dpwssds \(%rcx\),%ymm8,%ymm1\{%k7\}
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f af 53 09[ 	]*vp4dpwssds \(%rcx\),%ymm8,%ymm1\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 b2 3f 28 53 8c f0 c0 1d fe ff[ 	]*vp4dpwssds -0x1e240\(%rax,%r14,8\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 53 8a e0 0f 00 00[ 	]*vp4dpwssds 0xfe0\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 53 8a 00 10 00 00[ 	]*vp4dpwssds 0x1000\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 53 8a 00 f0 ff ff[ 	]*vp4dpwssds -0x1000\(%rdx\),%ymm8,%ymm1
-[ 	]*[a-f0-9]+:[ 	]*62 f2 3f 28 53 8a e0 ef ff ff[ 	]*vp4dpwssds -0x1020\(%rdx\),%ymm8,%ymm1
-#pass
diff --git a/gas/testsuite/gas/i386/x86-64-avx512_4vnniw_vl.s b/gas/testsuite/gas/i386/x86-64-avx512_4vnniw_vl.s
deleted file mode 100644
index 5f1a046..0000000
--- a/gas/testsuite/gas/i386/x86-64-avx512_4vnniw_vl.s
+++ /dev/null
@@ -1,75 +0,0 @@
-# Check 64bit AVX512{_4VNNIW,VL} instructions
-
-	.allow_index_reg
-	.text
-_start:
-	vp4dpwssd	(%rcx), %xmm8, %xmm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	(%rcx), %xmm8, %xmm1{%k7}	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	(%rcx), %xmm8, %xmm1{%k7}{z}	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	-123456(%rax,%r14,8), %xmm8, %xmm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	4064(%rdx), %xmm8, %xmm1	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssd	4096(%rdx), %xmm8, %xmm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	-4096(%rdx), %xmm8, %xmm1	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssd	-4128(%rdx), %xmm8, %xmm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	(%rcx), %ymm8, %ymm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	(%rcx), %ymm8, %ymm1{%k7}	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	(%rcx), %ymm8, %ymm1{%k7}{z}	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	-123456(%rax,%r14,8), %ymm8, %ymm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	4064(%rdx), %ymm8, %ymm1	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssd	4096(%rdx), %ymm8, %ymm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	-4096(%rdx), %ymm8, %ymm1	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssd	-4128(%rdx), %ymm8, %ymm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	(%rcx), %xmm8, %xmm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	(%rcx), %xmm8, %xmm1{%k7}	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	(%rcx), %xmm8, %xmm1{%k7}{z}	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	-123456(%rax,%r14,8), %xmm8, %xmm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	4064(%rdx), %xmm8, %xmm1	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssds	4096(%rdx), %xmm8, %xmm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	-4096(%rdx), %xmm8, %xmm1	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssds	-4128(%rdx), %xmm8, %xmm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	(%rcx), %ymm8, %ymm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	(%rcx), %ymm8, %ymm1{%k7}	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	(%rcx), %ymm8, %ymm1{%k7}{z}	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	-123456(%rax,%r14,8), %ymm8, %ymm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	4064(%rdx), %ymm8, %ymm1	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssds	4096(%rdx), %ymm8, %ymm1	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	-4096(%rdx), %ymm8, %ymm1	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssds	-4128(%rdx), %ymm8, %ymm1	 # AVX512{_4VNNIW,VL}
-
-	.intel_syntax noprefix
-	vp4dpwssd	xmm1, xmm8, [rcx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	xmm1, xmm8, XMMWORD PTR [rcx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	xmm1{k7}, xmm8, XMMWORD PTR [rcx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	xmm1{k7}{z}, xmm8, XMMWORD PTR [rcx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	xmm1, xmm8, XMMWORD PTR [rax+r14*8-123456]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	xmm1, xmm8, XMMWORD PTR [rdx+4064]	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssd	xmm1, xmm8, XMMWORD PTR [rdx+4096]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	xmm1, xmm8, XMMWORD PTR [rdx-4096]	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssd	xmm1, xmm8, XMMWORD PTR [rdx-4128]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	ymm1, ymm8, [rcx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	ymm1, ymm8, XMMWORD PTR [rcx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	ymm1{k7}, ymm8, XMMWORD PTR [rcx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	ymm1{k7}{z}, ymm8, XMMWORD PTR [rcx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	ymm1, ymm8, XMMWORD PTR [rax+r14*8-123456]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	ymm1, ymm8, XMMWORD PTR [rdx+4064]	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssd	ymm1, ymm8, XMMWORD PTR [rdx+4096]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssd	ymm1, ymm8, XMMWORD PTR [rdx-4096]	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssd	ymm1, ymm8, XMMWORD PTR [rdx-4128]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	xmm1, xmm8, [rcx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	xmm1, xmm8, XMMWORD PTR [rcx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	xmm1{k7}, xmm8, XMMWORD PTR [rcx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	xmm1{k7}{z}, xmm8, XMMWORD PTR [rcx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	xmm1, xmm8, XMMWORD PTR [rax+r14*8-123456]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	xmm1, xmm8, XMMWORD PTR [rdx+4064]	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssds	xmm1, xmm8, XMMWORD PTR [rdx+4096]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	xmm1, xmm8, XMMWORD PTR [rdx-4096]	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssds	xmm1, xmm8, XMMWORD PTR [rdx-4128]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	ymm1, ymm8, [rcx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	ymm1, ymm8, XMMWORD PTR [rcx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	ymm1{k7}, ymm8, XMMWORD PTR [rcx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	ymm1{k7}{z}, ymm8, XMMWORD PTR [rcx]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	ymm1, ymm8, XMMWORD PTR [rax+r14*8-123456]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	ymm1, ymm8, XMMWORD PTR [rdx+4064]	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssds	ymm1, ymm8, XMMWORD PTR [rdx+4096]	 # AVX512{_4VNNIW,VL}
-	vp4dpwssds	ymm1, ymm8, XMMWORD PTR [rdx-4096]	 # AVX512{_4VNNIW,VL} Disp8
-	vp4dpwssds	ymm1, ymm8, XMMWORD PTR [rdx-4128]	 # AVX512{_4VNNIW,VL}
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index fdae24c..e2b435c 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-10  Igor Tsimbalist  <igor.v.tsimbalist@intel.com>
+
+	* i386-opc.tbl: Remove VL variants for 4FMAPS and 4VNNIW insns.
+	* i386-tbl.h: Regenerate.
+
 2017-11-23  Igor Tsimbalist  <igor.v.tsimbalist@intel.com>
 
 	* i386-opc.tbl: Add Disp8MemShift for AVX512 VAES instructions.
diff --git a/opcodes/i386-opc.tbl b/opcodes/i386-opc.tbl
index add5ac9..642b453 100644
--- a/opcodes/i386-opc.tbl
+++ b/opcodes/i386-opc.tbl
@@ -6041,12 +6041,8 @@ vpermt2b, 3, 0x667D, None, 1, CpuAVX512VBMI|CpuAVX512VL, Modrm|EVex=3|Masking=3|
 // AVX512_4FMAPS instructions
 
 v4fmaddps, 3, 0xf29a, None, 1, CpuAVX512_4FMAPS, Modrm|EVex=1|Masking=3|VexOpcode=1|VexVVVV=1|VexW=1|Disp8MemShift=4|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|ImplicitQuadGroup, { XMMword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S|Vec_Disp8, RegZMM, RegZMM }
-v4fmaddps, 3, 0xf29a, None, 1, CpuAVX512_4FMAPS|CpuAVX512VL, Modrm|EVex=2|Masking=3|VexOpcode=1|VexVVVV=1|VexW=1|Disp8MemShift=4|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|ImplicitQuadGroup, { XMMword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S|Vec_Disp8, RegXMM, RegXMM }
-v4fmaddps, 3, 0xf29a, None, 1, CpuAVX512_4FMAPS|CpuAVX512VL, Modrm|EVex=3|Masking=3|VexOpcode=1|VexVVVV=1|VexW=1|Disp8MemShift=4|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|ImplicitQuadGroup, { XMMword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S|Vec_Disp8, RegYMM, RegYMM }
 
 v4fnmaddps, 3, 0xf2aa, None, 1, CpuAVX512_4FMAPS, Modrm|EVex=1|Masking=3|VexOpcode=1|VexVVVV=1|VexW=1|Disp8MemShift=4|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|ImplicitQuadGroup, { XMMword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S|Vec_Disp8, RegZMM, RegZMM }
-v4fnmaddps, 3, 0xf2aa, None, 1, CpuAVX512_4FMAPS|CpuAVX512VL, Modrm|EVex=2|Masking=3|VexOpcode=1|VexVVVV=1|VexW=1|Disp8MemShift=4|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|ImplicitQuadGroup, { XMMword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S|Vec_Disp8, RegXMM, RegXMM }
-v4fnmaddps, 3, 0xf2aa, None, 1, CpuAVX512_4FMAPS|CpuAVX512VL, Modrm|EVex=3|Masking=3|VexOpcode=1|VexVVVV=1|VexW=1|Disp8MemShift=4|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|ImplicitQuadGroup, { XMMword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S|Vec_Disp8, RegYMM, RegYMM }
 
 v4fmaddss, 3, 0xf29b, None, 1, CpuAVX512_4FMAPS, Modrm|EVex=4|Masking=3|VexOpcode=1|VexVVVV=1|VexW=1|Disp8MemShift=2|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|ImplicitQuadGroup, { XMMword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S|Vec_Disp8, RegXMM, RegXMM }
 
@@ -6057,12 +6053,8 @@ v4fnmaddss, 3, 0xf2ab, None, 1, CpuAVX512_4FMAPS, Modrm|EVex=4|Masking=3|VexOpco
 // AVX512_4VNNIW instructions
 
 vp4dpwssd, 3, 0xf252, None, 1, CpuAVX512_4VNNIW, Modrm|EVex=1|Masking=3|VexOpcode=1|VexVVVV=1|VexW=1|Disp8MemShift=4|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|ImplicitQuadGroup, { XMMword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S|Vec_Disp8, RegZMM, RegZMM }
-vp4dpwssd, 3, 0xf252, None, 1, CpuAVX512_4VNNIW|CpuAVX512VL, Modrm|EVex=2|Masking=3|VexOpcode=1|VexVVVV=1|VexW=1|Disp8MemShift=4|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|ImplicitQuadGroup, { XMMword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S|Vec_Disp8, RegXMM, RegXMM }
-vp4dpwssd, 3, 0xf252, None, 1, CpuAVX512_4VNNIW|CpuAVX512VL, Modrm|EVex=3|Masking=3|VexOpcode=1|VexVVVV=1|VexW=1|Disp8MemShift=4|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|ImplicitQuadGroup, { XMMword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S|Vec_Disp8, RegYMM, RegYMM }
 
 vp4dpwssds, 3, 0xf253, None, 1, CpuAVX512_4VNNIW, Modrm|EVex=1|Masking=3|VexOpcode=1|VexVVVV=1|VexW=1|Disp8MemShift=4|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|ImplicitQuadGroup, { XMMword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S|Vec_Disp8, RegZMM, RegZMM }
-vp4dpwssds, 3, 0xf253, None, 1, CpuAVX512_4VNNIW|CpuAVX512VL, Modrm|EVex=2|Masking=3|VexOpcode=1|VexVVVV=1|VexW=1|Disp8MemShift=4|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|ImplicitQuadGroup, { XMMword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S|Vec_Disp8, RegXMM, RegXMM }
-vp4dpwssds, 3, 0xf253, None, 1, CpuAVX512_4VNNIW|CpuAVX512VL, Modrm|EVex=3|Masking=3|VexOpcode=1|VexVVVV=1|VexW=1|Disp8MemShift=4|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_ldSuf|ImplicitQuadGroup, { XMMword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S|Vec_Disp8, RegYMM, RegYMM }
 
 // AVX512_4VNNIW instructions end
 
-- 
1.8.3.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] Remove VL variants for 4FMAPS and 4VNNIW insns.
  2018-01-10 17:35 [PATCH] Remove VL variants for 4FMAPS and 4VNNIW insns Tsimbalist, Igor V
@ 2018-01-10 17:59 ` H.J. Lu
  0 siblings, 0 replies; 2+ messages in thread
From: H.J. Lu @ 2018-01-10 17:59 UTC (permalink / raw)
  To: Tsimbalist, Igor V; +Cc: binutils

On Wed, Jan 10, 2018 at 9:35 AM, Tsimbalist, Igor V
<igor.v.tsimbalist@intel.com> wrote:
> AVX512_4FMAPS and AVX512_4VNNIW insns are marked as having AVX512VL variants.
> That is wrong as SDM doesn't define such instructions. The patch removes these VL
> variants.
>
> Ok for trunk?
>

OK with

AVX512_4FMAPS and AVX512_4VNNIW insns are marked as having AVX512VL variants.
That is wrong as SDM doesn't define such instructions. The patch
removes these VL
variants.

in the commit message.

Thanks.

-- 
H.J.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-01-10 17:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-10 17:35 [PATCH] Remove VL variants for 4FMAPS and 4VNNIW insns Tsimbalist, Igor V
2018-01-10 17:59 ` H.J. Lu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).