x86: add more VexWIG

Commits 6865c0435a ("x86: Support VEX/EVEX WIG encoding") and 6fa52824c3
("x86: Replace VexW=3 with VexWIG") omitted quite a few templates, oddly
enough in some cases despite testcases getting added (which then were
recorded with wrong expected output).

Also adjust VPMAXUB's attributes in the AVX512BW case to match ordering
of that of neighboring templates.

For the moment SSE2AVX templates are left alone, as it isn't clear
whether they were intentionally left untouched by the original commits
(the descriptions don't say either way).

In this context I question the decision in commit 0375113302 ("x86: Add
-mvexwig=[0|1] option to assembler") to move the logic to determine the
value of the W bit ahead of the decision whether to use 2-byte VEX:
While I can see this as one possible interpretation of -mvexwig=, the
other alternative (setting the value of the bit only if it actually
exists in the encoding) looks as reasonable to me, and perhaps even more
in line with us generally trying to pick the shortest encoding.

9 files changed, 70 insertions, 18 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index c821e49..07d2b93 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,15 @@
+2018-11-06  Jan Beulich  <jbeulich@suse.com>
+
+	* testsuite/gas/i386/avx-wig.s,
+	testsuite/gas/i386/x86-64-avx-wig.s: Add vandp*, vandnp*, vorp*,
+	vcmpeq*, and vcvtss2sd cases.
+	* testsuite/gas/i386/avx2-wig.s,
+	testsuite/gas/i386/x86-64-avx2-wig.s: Drop redundant vmovntdqa
+	case.
+	* testsuite/gas/i386/avx-wig.d, testsuite/gas/i386/avx2-wig.d,
+	testsuite/gas/i386/x86-64-avx-wig.d,
+	testsuite/gas/i386/x86-64-avx2-wig.d: Adjust expectations.
+
 2018-11-05  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR gas/23854
diff --git a/gas/testsuite/gas/i386/avx-wig.d b/gas/testsuite/gas/i386/avx-wig.d
index 00a2195..c36dc65 100644
--- a/gas/testsuite/gas/i386/avx-wig.d
+++ b/gas/testsuite/gas/i386/avx-wig.d
@@ -20,8 +20,16 @@ Disassembly of section .text:
  +[a-f0-9]+:	c4 e2 c9 dd d4       	vaesenclast %xmm4,%xmm6,%xmm2
  +[a-f0-9]+:	c4 e2 f9 db f4       	vaesimc %xmm4,%xmm6
  +[a-f0-9]+:	c4 e3 f9 df f4 07    	vaeskeygenassist \$0x7,%xmm4,%xmm6
+ +[a-f0-9]+:	c4 e1 cd 55 d4       	vandnpd %ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e1 cc 55 d4       	vandnps %ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e1 cd 54 d4       	vandpd %ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e1 cc 54 d4       	vandps %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e3 cd 0d d4 07    	vblendpd \$0x7,%ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e3 cd 0c d4 07    	vblendps \$0x7,%ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e1 cd c2 d4 00    	vcmpeqpd %ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e1 cc c2 d4 00    	vcmpeqps %ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e1 cb c2 d4 00    	vcmpeqsd %xmm4,%xmm6,%xmm2
+ +[a-f0-9]+:	c4 e1 ca c2 d4 00    	vcmpeqss %xmm4,%xmm6,%xmm2
  +[a-f0-9]+:	c4 e1 cd c2 d4 07    	vcmpordpd %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e1 cc c2 d4 07    	vcmpordps %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e1 cb c2 d4 07    	vcmpordsd %xmm4,%xmm6,%xmm2
@@ -39,6 +47,7 @@ Disassembly of section .text:
  +[a-f0-9]+:	c4 e1 fd 5b f4       	vcvtps2dq %ymm4,%ymm6
  +[a-f0-9]+:	c4 e1 fc 5a e4       	vcvtps2pd %xmm4,%ymm4
  +[a-f0-9]+:	c4 e1 cb 5a d4       	vcvtsd2ss %xmm4,%xmm6,%xmm2
+ +[a-f0-9]+:	c4 e1 ca 5a d4       	vcvtss2sd %xmm4,%xmm6,%xmm2
  +[a-f0-9]+:	c4 e1 fd e6 e4       	vcvttpd2dq %ymm4,%xmm4
  +[a-f0-9]+:	c4 e1 f9 e6 f4       	vcvttpd2dq %xmm4,%xmm6
  +[a-f0-9]+:	c4 e1 fd e6 e4       	vcvttpd2dq %ymm4,%xmm4
@@ -108,6 +117,8 @@ Disassembly of section .text:
  +[a-f0-9]+:	c4 e1 cc 59 d4       	vmulps %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e1 cb 59 d4       	vmulsd %xmm4,%xmm6,%xmm2
  +[a-f0-9]+:	c4 e1 ca 59 d4       	vmulss %xmm4,%xmm6,%xmm2
+ +[a-f0-9]+:	c4 e1 cd 56 d4       	vorpd  %ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e1 cc 56 d4       	vorps  %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e2 f9 1c f4       	vpabsb %xmm4,%xmm6
  +[a-f0-9]+:	c4 e2 f9 1e f4       	vpabsd %xmm4,%xmm6
  +[a-f0-9]+:	c4 e2 f9 1d f4       	vpabsw %xmm4,%xmm6
@@ -156,7 +167,7 @@ Disassembly of section .text:
  +[a-f0-9]+:	c4 e2 c9 3c d4       	vpmaxsb %xmm4,%xmm6,%xmm2
  +[a-f0-9]+:	c4 e2 c9 3d d4       	vpmaxsd %xmm4,%xmm6,%xmm2
  +[a-f0-9]+:	c4 e1 c9 ee d4       	vpmaxsw %xmm4,%xmm6,%xmm2
- +[a-f0-9]+:	c5 c9 de d4          	vpmaxub %xmm4,%xmm6,%xmm2
+ +[a-f0-9]+:	c4 e1 c9 de d4       	vpmaxub %xmm4,%xmm6,%xmm2
  +[a-f0-9]+:	c4 e2 c9 3f d4       	vpmaxud %xmm4,%xmm6,%xmm2
  +[a-f0-9]+:	c4 e2 c9 3e d4       	vpmaxuw %xmm4,%xmm6,%xmm2
  +[a-f0-9]+:	c4 e2 c9 38 d4       	vpminsb %xmm4,%xmm6,%xmm2
diff --git a/gas/testsuite/gas/i386/avx-wig.s b/gas/testsuite/gas/i386/avx-wig.s
index fa98236..9af865b 100644
--- a/gas/testsuite/gas/i386/avx-wig.s
+++ b/gas/testsuite/gas/i386/avx-wig.s
@@ -15,8 +15,16 @@ _start:
 	vaesenclast %xmm4,%xmm6,%xmm2
 	vaesimc %xmm4,%xmm6
 	vaeskeygenassist $7,%xmm4,%xmm6
+	vandnpd %ymm4,%ymm6,%ymm2
+	vandnps %ymm4,%ymm6,%ymm2
+	vandpd %ymm4,%ymm6,%ymm2
+	vandps %ymm4,%ymm6,%ymm2
 	vblendpd $7,%ymm4,%ymm6,%ymm2
 	vblendps $7,%ymm4,%ymm6,%ymm2
+	vcmpeqpd %ymm4,%ymm6,%ymm2
+	vcmpeqps %ymm4,%ymm6,%ymm2
+	vcmpeqsd %xmm4,%xmm6,%xmm2
+	vcmpeqss %xmm4,%xmm6,%xmm2
 	vcmppd $7,%ymm4,%ymm6,%ymm2
 	vcmpps $7,%ymm4,%ymm6,%ymm2
 	vcmpsd $7,%xmm4,%xmm6,%xmm2
@@ -34,6 +42,7 @@ _start:
 	vcvtps2dq %ymm4,%ymm6
 	vcvtps2pd %xmm4,%ymm4
 	vcvtsd2ss %xmm4,%xmm6,%xmm2
+	vcvtss2sd %xmm4,%xmm6,%xmm2
 	vcvttpd2dqy %ymm4,%xmm4
 	vcvttpd2dqx %xmm4,%xmm6
 	vcvttpd2dqy %ymm4,%xmm4
@@ -103,6 +112,8 @@ _start:
 	vmulps %ymm4,%ymm6,%ymm2
 	vmulsd %xmm4,%xmm6,%xmm2
 	vmulss %xmm4,%xmm6,%xmm2
+	vorpd %ymm4,%ymm6,%ymm2
+	vorps %ymm4,%ymm6,%ymm2
 	vpabsb %xmm4,%xmm6
 	vpabsd %xmm4,%xmm6
 	vpabsw %xmm4,%xmm6
diff --git a/gas/testsuite/gas/i386/avx2-wig.d b/gas/testsuite/gas/i386/avx2-wig.d
index 03ef21f..00696f8 100644
--- a/gas/testsuite/gas/i386/avx2-wig.d
+++ b/gas/testsuite/gas/i386/avx2-wig.d
@@ -8,9 +8,8 @@
 Disassembly of section .text:
 
 0+ <_start>:
- +[a-f0-9]+:	c4 e2 7d 2a 21       	vmovntdqa \(%ecx\),%ymm4
- +[a-f0-9]+:	c4 e2 7d 2a 21       	vmovntdqa \(%ecx\),%ymm4
- +[a-f0-9]+:	c4 e3 4d 42 d4 07    	vmpsadbw \$0x7,%ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e2 fd 2a 21       	vmovntdqa \(%ecx\),%ymm4
+ +[a-f0-9]+:	c4 e3 cd 42 d4 07    	vmpsadbw \$0x7,%ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e2 fd 1c f4       	vpabsb %ymm4,%ymm6
  +[a-f0-9]+:	c4 e2 fd 1e f4       	vpabsd %ymm4,%ymm6
  +[a-f0-9]+:	c4 e2 fd 1d f4       	vpabsw %ymm4,%ymm6
@@ -43,15 +42,15 @@ Disassembly of section .text:
  +[a-f0-9]+:	c4 e2 cd 02 d4       	vphaddd %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e2 cd 03 d4       	vphaddsw %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e2 cd 01 d4       	vphaddw %ymm4,%ymm6,%ymm2
- +[a-f0-9]+:	c4 e2 4d 06 d4       	vphsubd %ymm4,%ymm6,%ymm2
- +[a-f0-9]+:	c4 e2 4d 07 d4       	vphsubsw %ymm4,%ymm6,%ymm2
- +[a-f0-9]+:	c4 e2 4d 05 d4       	vphsubw %ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e2 cd 06 d4       	vphsubd %ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e2 cd 07 d4       	vphsubsw %ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e2 cd 05 d4       	vphsubw %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e2 cd 04 d4       	vpmaddubsw %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e1 cd f5 d4       	vpmaddwd %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e2 cd 3c d4       	vpmaxsb %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e2 cd 3d d4       	vpmaxsd %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e1 cd ee d4       	vpmaxsw %ymm4,%ymm6,%ymm2
- +[a-f0-9]+:	c5 cd de d4          	vpmaxub %ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e1 cd de d4       	vpmaxub %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e2 cd 3f d4       	vpmaxud %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e2 cd 3e d4       	vpmaxuw %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e2 cd 38 d4       	vpminsb %ymm4,%ymm6,%ymm2
diff --git a/gas/testsuite/gas/i386/avx2-wig.s b/gas/testsuite/gas/i386/avx2-wig.s
index 6ebc5e7..7ed63c2 100644
--- a/gas/testsuite/gas/i386/avx2-wig.s
+++ b/gas/testsuite/gas/i386/avx2-wig.s
@@ -4,7 +4,6 @@
 	.text
 _start:
 	vmovntdqa (%ecx),%ymm4
-	vmovntdqa (%ecx),%ymm4
 	vmpsadbw $7,%ymm4,%ymm6,%ymm2
 	vpabsb %ymm4,%ymm6
 	vpabsd %ymm4,%ymm6
diff --git a/gas/testsuite/gas/i386/x86-64-avx-wig.d b/gas/testsuite/gas/i386/x86-64-avx-wig.d
index 90d61be..a0cae16 100644
--- a/gas/testsuite/gas/i386/x86-64-avx-wig.d
+++ b/gas/testsuite/gas/i386/x86-64-avx-wig.d
@@ -20,8 +20,16 @@ Disassembly of section .text:
  +[a-f0-9]+:	c4 e2 c9 dd d4       	vaesenclast %xmm4,%xmm6,%xmm2
  +[a-f0-9]+:	c4 e2 f9 db f4       	vaesimc %xmm4,%xmm6
  +[a-f0-9]+:	c4 e3 f9 df f4 07    	vaeskeygenassist \$0x7,%xmm4,%xmm6
+ +[a-f0-9]+:	c4 e1 cd 55 d4       	vandnpd %ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e1 cc 55 d4       	vandnps %ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e1 cd 54 d4       	vandpd %ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e1 cc 54 d4       	vandps %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e3 cd 0d d4 07    	vblendpd \$0x7,%ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e3 cd 0c d4 07    	vblendps \$0x7,%ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e1 cd c2 d4 00    	vcmpeqpd %ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e1 cc c2 d4 00    	vcmpeqps %ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e1 cb c2 d4 00    	vcmpeqsd %xmm4,%xmm6,%xmm2
+ +[a-f0-9]+:	c4 e1 ca c2 d4 00    	vcmpeqss %xmm4,%xmm6,%xmm2
  +[a-f0-9]+:	c4 e1 cd c2 d4 07    	vcmpordpd %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e1 cc c2 d4 07    	vcmpordps %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e1 cb c2 d4 07    	vcmpordsd %xmm4,%xmm6,%xmm2
@@ -39,6 +47,7 @@ Disassembly of section .text:
  +[a-f0-9]+:	c4 e1 fd 5b f4       	vcvtps2dq %ymm4,%ymm6
  +[a-f0-9]+:	c4 e1 fc 5a e4       	vcvtps2pd %xmm4,%ymm4
  +[a-f0-9]+:	c4 e1 cb 5a d4       	vcvtsd2ss %xmm4,%xmm6,%xmm2
+ +[a-f0-9]+:	c4 e1 ca 5a d4       	vcvtss2sd %xmm4,%xmm6,%xmm2
  +[a-f0-9]+:	c4 e1 fd e6 e4       	vcvttpd2dq %ymm4,%xmm4
  +[a-f0-9]+:	c4 e1 f9 e6 f4       	vcvttpd2dq %xmm4,%xmm6
  +[a-f0-9]+:	c4 e1 fd e6 e4       	vcvttpd2dq %ymm4,%xmm4
@@ -110,6 +119,8 @@ Disassembly of section .text:
  +[a-f0-9]+:	c4 e1 cc 59 d4       	vmulps %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e1 cb 59 d4       	vmulsd %xmm4,%xmm6,%xmm2
  +[a-f0-9]+:	c4 e1 ca 59 d4       	vmulss %xmm4,%xmm6,%xmm2
+ +[a-f0-9]+:	c4 e1 cd 56 d4       	vorpd  %ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e1 cc 56 d4       	vorps  %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e2 f9 1c f4       	vpabsb %xmm4,%xmm6
  +[a-f0-9]+:	c4 e2 f9 1e f4       	vpabsd %xmm4,%xmm6
  +[a-f0-9]+:	c4 e2 f9 1d f4       	vpabsw %xmm4,%xmm6
@@ -158,7 +169,7 @@ Disassembly of section .text:
  +[a-f0-9]+:	c4 e2 c9 3c d4       	vpmaxsb %xmm4,%xmm6,%xmm2
  +[a-f0-9]+:	c4 e2 c9 3d d4       	vpmaxsd %xmm4,%xmm6,%xmm2
  +[a-f0-9]+:	c4 e1 c9 ee d4       	vpmaxsw %xmm4,%xmm6,%xmm2
- +[a-f0-9]+:	c5 c9 de d4          	vpmaxub %xmm4,%xmm6,%xmm2
+ +[a-f0-9]+:	c4 e1 c9 de d4       	vpmaxub %xmm4,%xmm6,%xmm2
  +[a-f0-9]+:	c4 e2 c9 3f d4       	vpmaxud %xmm4,%xmm6,%xmm2
  +[a-f0-9]+:	c4 e2 c9 3e d4       	vpmaxuw %xmm4,%xmm6,%xmm2
  +[a-f0-9]+:	c4 e2 c9 38 d4       	vpminsb %xmm4,%xmm6,%xmm2
diff --git a/gas/testsuite/gas/i386/x86-64-avx-wig.s b/gas/testsuite/gas/i386/x86-64-avx-wig.s
index 74ef152..bf10ad1 100644
--- a/gas/testsuite/gas/i386/x86-64-avx-wig.s
+++ b/gas/testsuite/gas/i386/x86-64-avx-wig.s
@@ -15,8 +15,16 @@ _start:
 	vaesenclast %xmm4,%xmm6,%xmm2
 	vaesimc %xmm4,%xmm6
 	vaeskeygenassist $7,%xmm4,%xmm6
+	vandnpd %ymm4,%ymm6,%ymm2
+	vandnps %ymm4,%ymm6,%ymm2
+	vandpd %ymm4,%ymm6,%ymm2
+	vandps %ymm4,%ymm6,%ymm2
 	vblendpd $7,%ymm4,%ymm6,%ymm2
 	vblendps $7,%ymm4,%ymm6,%ymm2
+	vcmpeqpd %ymm4,%ymm6,%ymm2
+	vcmpeqps %ymm4,%ymm6,%ymm2
+	vcmpeqsd %xmm4,%xmm6,%xmm2
+	vcmpeqss %xmm4,%xmm6,%xmm2
 	vcmppd $7,%ymm4,%ymm6,%ymm2
 	vcmpps $7,%ymm4,%ymm6,%ymm2
 	vcmpsd $7,%xmm4,%xmm6,%xmm2
@@ -34,6 +42,7 @@ _start:
 	vcvtps2dq %ymm4,%ymm6
 	vcvtps2pd %xmm4,%ymm4
 	vcvtsd2ss %xmm4,%xmm6,%xmm2
+	vcvtss2sd %xmm4,%xmm6,%xmm2
 	vcvttpd2dqy %ymm4,%xmm4
 	vcvttpd2dqx %xmm4,%xmm6
 	vcvttpd2dqy %ymm4,%xmm4
@@ -105,6 +114,8 @@ _start:
 	vmulps %ymm4,%ymm6,%ymm2
 	vmulsd %xmm4,%xmm6,%xmm2
 	vmulss %xmm4,%xmm6,%xmm2
+	vorpd %ymm4,%ymm6,%ymm2
+	vorps %ymm4,%ymm6,%ymm2
 	vpabsb %xmm4,%xmm6
 	vpabsd %xmm4,%xmm6
 	vpabsw %xmm4,%xmm6
diff --git a/gas/testsuite/gas/i386/x86-64-avx2-wig.d b/gas/testsuite/gas/i386/x86-64-avx2-wig.d
index 55f85d6..8295c33 100644
--- a/gas/testsuite/gas/i386/x86-64-avx2-wig.d
+++ b/gas/testsuite/gas/i386/x86-64-avx2-wig.d
@@ -8,9 +8,8 @@
 Disassembly of section .text:
 
 0+ <_start>:
- +[a-f0-9]+:	c4 e2 7d 2a 21       	vmovntdqa \(%rcx\),%ymm4
- +[a-f0-9]+:	c4 e2 7d 2a 21       	vmovntdqa \(%rcx\),%ymm4
- +[a-f0-9]+:	c4 e3 4d 42 d4 07    	vmpsadbw \$0x7,%ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e2 fd 2a 21       	vmovntdqa \(%rcx\),%ymm4
+ +[a-f0-9]+:	c4 e3 cd 42 d4 07    	vmpsadbw \$0x7,%ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e2 fd 1c f4       	vpabsb %ymm4,%ymm6
  +[a-f0-9]+:	c4 e2 fd 1e f4       	vpabsd %ymm4,%ymm6
  +[a-f0-9]+:	c4 e2 fd 1d f4       	vpabsw %ymm4,%ymm6
@@ -43,15 +42,15 @@ Disassembly of section .text:
  +[a-f0-9]+:	c4 e2 cd 02 d4       	vphaddd %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e2 cd 03 d4       	vphaddsw %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e2 cd 01 d4       	vphaddw %ymm4,%ymm6,%ymm2
- +[a-f0-9]+:	c4 e2 4d 06 d4       	vphsubd %ymm4,%ymm6,%ymm2
- +[a-f0-9]+:	c4 e2 4d 07 d4       	vphsubsw %ymm4,%ymm6,%ymm2
- +[a-f0-9]+:	c4 e2 4d 05 d4       	vphsubw %ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e2 cd 06 d4       	vphsubd %ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e2 cd 07 d4       	vphsubsw %ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e2 cd 05 d4       	vphsubw %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e2 cd 04 d4       	vpmaddubsw %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e1 cd f5 d4       	vpmaddwd %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e2 cd 3c d4       	vpmaxsb %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e2 cd 3d d4       	vpmaxsd %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e1 cd ee d4       	vpmaxsw %ymm4,%ymm6,%ymm2
- +[a-f0-9]+:	c5 cd de d4          	vpmaxub %ymm4,%ymm6,%ymm2
+ +[a-f0-9]+:	c4 e1 cd de d4       	vpmaxub %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e2 cd 3f d4       	vpmaxud %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e2 cd 3e d4       	vpmaxuw %ymm4,%ymm6,%ymm2
  +[a-f0-9]+:	c4 e2 cd 38 d4       	vpminsb %ymm4,%ymm6,%ymm2
diff --git a/gas/testsuite/gas/i386/x86-64-avx2-wig.s b/gas/testsuite/gas/i386/x86-64-avx2-wig.s
index 162a9f8..a42cb84 100644
--- a/gas/testsuite/gas/i386/x86-64-avx2-wig.s
+++ b/gas/testsuite/gas/i386/x86-64-avx2-wig.s
@@ -4,7 +4,6 @@
 	.text
 _start:
 	vmovntdqa (%rcx),%ymm4
-	vmovntdqa (%rcx),%ymm4
 	vmpsadbw $7,%ymm4,%ymm6,%ymm2
 	vpabsb %ymm4,%ymm6
 	vpabsd %ymm4,%ymm6