X86: Remove the .s suffix from EVEX vpextrw

The .s suffix indicates that the instruction is encoded by swapping
2 register operands.  Since vpextrw takes an XMM register and an
integer register, the .s suffix should be ignored for EVEX vpextrw.

gas/

	PR binutils/20799
	* testsuite/gas/i386/opcode.s: Add a test for EVEX vpextrw.
	* testsuite/gas/i386/opcode-intel.d: Updated.
	* testsuite/gas/i386/opcode-suffix.d: Likewise.
	* testsuite/gas/i386/opcode.d: Likewise.
	* testsuite/gas/i386/x86-64-avx512bw-opts.s: Remove vpextrw
	tests.
	* testsuite/gas/i386/x86-64-avx512bw-opts-intel.d: Updated.
	* testsuite/gas/i386/x86-64-avx512bw-opts.d: Likewise.

opcodes/

	PR binutils/20799
	* i386-dis-evex.h (evex_table): Replace EdqwS with Edqw.
	* i386-dis.c (EdqwS): Removed.
	(dqw_swap_mode): Likewise.
	(intel_operand_size): Don't check dqw_swap_mode.
	(OP_E_register): Likewise.
	(OP_E_memory): Likewise.
	(OP_G): Likewise.
	(OP_EX): Likewise.
	* i386-opc.tbl: Remove "S" from EVEX vpextrw.
	* i386-tbl.h: Regerated.

8 files changed, 17 insertions, 72 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1685c86..2381ed7 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,17 @@
 2016-11-09  H.J. Lu  <hongjiu.lu@intel.com>
 
+	PR binutils/20799
+	* testsuite/gas/i386/opcode.s: Add a test for EVEX vpextrw.
+	* testsuite/gas/i386/opcode-intel.d: Updated.
+	* testsuite/gas/i386/opcode-suffix.d: Likewise.
+	* testsuite/gas/i386/opcode.d: Likewise.
+	* testsuite/gas/i386/x86-64-avx512bw-opts.s: Remove vpextrw
+	tests.
+	* testsuite/gas/i386/x86-64-avx512bw-opts-intel.d: Updated.
+	* testsuite/gas/i386/x86-64-avx512bw-opts.d: Likewise.
+
+2016-11-09  H.J. Lu  <hongjiu.lu@intel.com>
+
 	PR binutils/20754
 	* testsuite/gas/i386/opcode-suffix.d: Updated.
 
diff --git a/gas/testsuite/gas/i386/opcode-intel.d b/gas/testsuite/gas/i386/opcode-intel.d
index 6a6c86f..e924bf9 100644
--- a/gas/testsuite/gas/i386/opcode-intel.d
+++ b/gas/testsuite/gas/i386/opcode-intel.d
@@ -600,4 +600,5 @@ Disassembly of section .text:
  +[a-f0-9]+:	82 eb 01             	sub    bl,0x1
  +[a-f0-9]+:	82 f3 01             	xor    bl,0x1
  +[a-f0-9]+:	82 fb 01             	cmp    bl,0x1
+ +[a-f0-9]+:	62 f3 7d 08 15 e8 ab 	vpextrw eax,xmm5,0xab
 #pass
diff --git a/gas/testsuite/gas/i386/opcode-suffix.d b/gas/testsuite/gas/i386/opcode-suffix.d
index a5c76a3..1fdd58f 100644
--- a/gas/testsuite/gas/i386/opcode-suffix.d
+++ b/gas/testsuite/gas/i386/opcode-suffix.d
@@ -600,4 +600,5 @@ Disassembly of section .text:
  +[a-f0-9]+:	82 eb 01             	subb   \$0x1,%bl
  +[a-f0-9]+:	82 f3 01             	xorb   \$0x1,%bl
  +[a-f0-9]+:	82 fb 01             	cmpb   \$0x1,%bl
+ +[a-f0-9]+:	62 f3 7d 08 15 e8 ab 	vpextrw \$0xab,%xmm5,%eax
 #pass
diff --git a/gas/testsuite/gas/i386/opcode.d b/gas/testsuite/gas/i386/opcode.d
index 2294f64..dd89828 100644
--- a/gas/testsuite/gas/i386/opcode.d
+++ b/gas/testsuite/gas/i386/opcode.d
@@ -599,4 +599,5 @@ Disassembly of section .text:
  +[a-f0-9]+:	82 eb 01             	sub    \$0x1,%bl
  +[a-f0-9]+:	82 f3 01             	xor    \$0x1,%bl
  +[a-f0-9]+:	82 fb 01             	cmp    \$0x1,%bl
+ +[a-f0-9]+:	62 f3 7d 08 15 e8 ab 	vpextrw \$0xab,%xmm5,%eax
 #pass
diff --git a/gas/testsuite/gas/i386/opcode.s b/gas/testsuite/gas/i386/opcode.s
index 001a114..101085a 100644
--- a/gas/testsuite/gas/i386/opcode.s
+++ b/gas/testsuite/gas/i386/opcode.s
@@ -598,3 +598,5 @@ foo:
 	.byte 0x82, 0xeb, 0x01
 	.byte 0x82, 0xf3, 0x01
 	.byte 0x82, 0xfb, 0x01
+
+	.byte 0x62, 0xf3, 0x7d, 0x08, 0x15, 0xe8, 0xab
diff --git a/gas/testsuite/gas/i386/x86-64-avx512bw-opts-intel.d b/gas/testsuite/gas/i386/x86-64-avx512bw-opts-intel.d
index 9e16311..c4815af 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512bw-opts-intel.d
+++ b/gas/testsuite/gas/i386/x86-64-avx512bw-opts-intel.d
@@ -9,18 +9,6 @@
 Disassembly of section \.text:
 
 0+ <_start>:
-[ 	]*[a-f0-9]+:[ 	]*62 91 fd 08 c5 c5 ab[ 	]*vpextrw rax,xmm29,0xab
-[ 	]*[a-f0-9]+:[ 	]*62 63 fd 08 15 e8 ab[ 	]*vpextrw\.s rax,xmm29,0xab
-[ 	]*[a-f0-9]+:[ 	]*62 91 fd 08 c5 c5 7b[ 	]*vpextrw rax,xmm29,0x7b
-[ 	]*[a-f0-9]+:[ 	]*62 63 fd 08 15 e8 7b[ 	]*vpextrw\.s rax,xmm29,0x7b
-[ 	]*[a-f0-9]+:[ 	]*62 11 fd 08 c5 c5 7b[ 	]*vpextrw r8,xmm29,0x7b
-[ 	]*[a-f0-9]+:[ 	]*62 43 fd 08 15 e8 7b[ 	]*vpextrw\.s r8,xmm29,0x7b
-[ 	]*[a-f0-9]+:[ 	]*62 91 fd 08 c5 c5 ab[ 	]*vpextrw rax,xmm29,0xab
-[ 	]*[a-f0-9]+:[ 	]*62 63 fd 08 15 e8 ab[ 	]*vpextrw\.s rax,xmm29,0xab
-[ 	]*[a-f0-9]+:[ 	]*62 91 fd 08 c5 c5 7b[ 	]*vpextrw rax,xmm29,0x7b
-[ 	]*[a-f0-9]+:[ 	]*62 63 fd 08 15 e8 7b[ 	]*vpextrw\.s rax,xmm29,0x7b
-[ 	]*[a-f0-9]+:[ 	]*62 11 fd 08 c5 c5 7b[ 	]*vpextrw r8,xmm29,0x7b
-[ 	]*[a-f0-9]+:[ 	]*62 43 fd 08 15 e8 7b[ 	]*vpextrw\.s r8,xmm29,0x7b
 [ 	]*[a-f0-9]+:[ 	]*62 01 7f 48 6f f5[ 	]*vmovdqu8 zmm30,zmm29
 [ 	]*[a-f0-9]+:[ 	]*62 01 7f 48 7f ee[ 	]*vmovdqu8\.s zmm30,zmm29
 [ 	]*[a-f0-9]+:[ 	]*62 01 7f 4f 6f f5[ 	]*vmovdqu8 zmm30\{k7\},zmm29
@@ -45,18 +33,6 @@ Disassembly of section \.text:
 [ 	]*[a-f0-9]+:[ 	]*62 01 ff 4f 7f ee[ 	]*vmovdqu16\.s zmm30\{k7\},zmm29
 [ 	]*[a-f0-9]+:[ 	]*62 01 ff cf 6f f5[ 	]*vmovdqu16 zmm30\{k7\}\{z\},zmm29
 [ 	]*[a-f0-9]+:[ 	]*62 01 ff cf 7f ee[ 	]*vmovdqu16\.s zmm30\{k7\}\{z\},zmm29
-[ 	]*[a-f0-9]+:[ 	]*62 91 fd 08 c5 c5 ab[ 	]*vpextrw rax,xmm29,0xab
-[ 	]*[a-f0-9]+:[ 	]*62 63 fd 08 15 e8 ab[ 	]*vpextrw\.s rax,xmm29,0xab
-[ 	]*[a-f0-9]+:[ 	]*62 91 fd 08 c5 c5 7b[ 	]*vpextrw rax,xmm29,0x7b
-[ 	]*[a-f0-9]+:[ 	]*62 63 fd 08 15 e8 7b[ 	]*vpextrw\.s rax,xmm29,0x7b
-[ 	]*[a-f0-9]+:[ 	]*62 11 fd 08 c5 c5 7b[ 	]*vpextrw r8,xmm29,0x7b
-[ 	]*[a-f0-9]+:[ 	]*62 43 fd 08 15 e8 7b[ 	]*vpextrw\.s r8,xmm29,0x7b
-[ 	]*[a-f0-9]+:[ 	]*62 91 fd 08 c5 c5 ab[ 	]*vpextrw rax,xmm29,0xab
-[ 	]*[a-f0-9]+:[ 	]*62 63 fd 08 15 e8 ab[ 	]*vpextrw\.s rax,xmm29,0xab
-[ 	]*[a-f0-9]+:[ 	]*62 91 fd 08 c5 c5 7b[ 	]*vpextrw rax,xmm29,0x7b
-[ 	]*[a-f0-9]+:[ 	]*62 63 fd 08 15 e8 7b[ 	]*vpextrw\.s rax,xmm29,0x7b
-[ 	]*[a-f0-9]+:[ 	]*62 11 fd 08 c5 c5 7b[ 	]*vpextrw r8,xmm29,0x7b
-[ 	]*[a-f0-9]+:[ 	]*62 43 fd 08 15 e8 7b[ 	]*vpextrw\.s r8,xmm29,0x7b
 [ 	]*[a-f0-9]+:[ 	]*62 01 7f 48 6f f5[ 	]*vmovdqu8 zmm30,zmm29
 [ 	]*[a-f0-9]+:[ 	]*62 01 7f 48 7f ee[ 	]*vmovdqu8\.s zmm30,zmm29
 [ 	]*[a-f0-9]+:[ 	]*62 01 7f 4f 6f f5[ 	]*vmovdqu8 zmm30\{k7\},zmm29
diff --git a/gas/testsuite/gas/i386/x86-64-avx512bw-opts.d b/gas/testsuite/gas/i386/x86-64-avx512bw-opts.d
index 9146337..8ddb25e 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512bw-opts.d
+++ b/gas/testsuite/gas/i386/x86-64-avx512bw-opts.d
@@ -9,18 +9,6 @@
 Disassembly of section \.text:
 
 0+ <_start>:
-[ 	]*[a-f0-9]+:[ 	]*62 91 fd 08 c5 c5 ab[ 	]*vpextrw \$0xab,%xmm29,%rax
-[ 	]*[a-f0-9]+:[ 	]*62 63 fd 08 15 e8 ab[ 	]*vpextrw\.s \$0xab,%xmm29,%rax
-[ 	]*[a-f0-9]+:[ 	]*62 91 fd 08 c5 c5 7b[ 	]*vpextrw \$0x7b,%xmm29,%rax
-[ 	]*[a-f0-9]+:[ 	]*62 63 fd 08 15 e8 7b[ 	]*vpextrw\.s \$0x7b,%xmm29,%rax
-[ 	]*[a-f0-9]+:[ 	]*62 11 fd 08 c5 c5 7b[ 	]*vpextrw \$0x7b,%xmm29,%r8
-[ 	]*[a-f0-9]+:[ 	]*62 43 fd 08 15 e8 7b[ 	]*vpextrw\.s \$0x7b,%xmm29,%r8
-[ 	]*[a-f0-9]+:[ 	]*62 91 fd 08 c5 c5 ab[ 	]*vpextrw \$0xab,%xmm29,%rax
-[ 	]*[a-f0-9]+:[ 	]*62 63 fd 08 15 e8 ab[ 	]*vpextrw\.s \$0xab,%xmm29,%rax
-[ 	]*[a-f0-9]+:[ 	]*62 91 fd 08 c5 c5 7b[ 	]*vpextrw \$0x7b,%xmm29,%rax
-[ 	]*[a-f0-9]+:[ 	]*62 63 fd 08 15 e8 7b[ 	]*vpextrw\.s \$0x7b,%xmm29,%rax
-[ 	]*[a-f0-9]+:[ 	]*62 11 fd 08 c5 c5 7b[ 	]*vpextrw \$0x7b,%xmm29,%r8
-[ 	]*[a-f0-9]+:[ 	]*62 43 fd 08 15 e8 7b[ 	]*vpextrw\.s \$0x7b,%xmm29,%r8
 [ 	]*[a-f0-9]+:[ 	]*62 01 7f 48 6f f5[ 	]*vmovdqu8 %zmm29,%zmm30
 [ 	]*[a-f0-9]+:[ 	]*62 01 7f 48 7f ee[ 	]*vmovdqu8\.s %zmm29,%zmm30
 [ 	]*[a-f0-9]+:[ 	]*62 01 7f 4f 6f f5[ 	]*vmovdqu8 %zmm29,%zmm30\{%k7\}
@@ -45,18 +33,6 @@ Disassembly of section \.text:
 [ 	]*[a-f0-9]+:[ 	]*62 01 ff 4f 7f ee[ 	]*vmovdqu16\.s %zmm29,%zmm30\{%k7\}
 [ 	]*[a-f0-9]+:[ 	]*62 01 ff cf 6f f5[ 	]*vmovdqu16 %zmm29,%zmm30\{%k7\}\{z\}
 [ 	]*[a-f0-9]+:[ 	]*62 01 ff cf 7f ee[ 	]*vmovdqu16\.s %zmm29,%zmm30\{%k7\}\{z\}
-[ 	]*[a-f0-9]+:[ 	]*62 91 fd 08 c5 c5 ab[ 	]*vpextrw \$0xab,%xmm29,%rax
-[ 	]*[a-f0-9]+:[ 	]*62 63 fd 08 15 e8 ab[ 	]*vpextrw\.s \$0xab,%xmm29,%rax
-[ 	]*[a-f0-9]+:[ 	]*62 91 fd 08 c5 c5 7b[ 	]*vpextrw \$0x7b,%xmm29,%rax
-[ 	]*[a-f0-9]+:[ 	]*62 63 fd 08 15 e8 7b[ 	]*vpextrw\.s \$0x7b,%xmm29,%rax
-[ 	]*[a-f0-9]+:[ 	]*62 11 fd 08 c5 c5 7b[ 	]*vpextrw \$0x7b,%xmm29,%r8
-[ 	]*[a-f0-9]+:[ 	]*62 43 fd 08 15 e8 7b[ 	]*vpextrw\.s \$0x7b,%xmm29,%r8
-[ 	]*[a-f0-9]+:[ 	]*62 91 fd 08 c5 c5 ab[ 	]*vpextrw \$0xab,%xmm29,%rax
-[ 	]*[a-f0-9]+:[ 	]*62 63 fd 08 15 e8 ab[ 	]*vpextrw\.s \$0xab,%xmm29,%rax
-[ 	]*[a-f0-9]+:[ 	]*62 91 fd 08 c5 c5 7b[ 	]*vpextrw \$0x7b,%xmm29,%rax
-[ 	]*[a-f0-9]+:[ 	]*62 63 fd 08 15 e8 7b[ 	]*vpextrw\.s \$0x7b,%xmm29,%rax
-[ 	]*[a-f0-9]+:[ 	]*62 11 fd 08 c5 c5 7b[ 	]*vpextrw \$0x7b,%xmm29,%r8
-[ 	]*[a-f0-9]+:[ 	]*62 43 fd 08 15 e8 7b[ 	]*vpextrw\.s \$0x7b,%xmm29,%r8
 [ 	]*[a-f0-9]+:[ 	]*62 01 7f 48 6f f5[ 	]*vmovdqu8 %zmm29,%zmm30
 [ 	]*[a-f0-9]+:[ 	]*62 01 7f 48 7f ee[ 	]*vmovdqu8\.s %zmm29,%zmm30
 [ 	]*[a-f0-9]+:[ 	]*62 01 7f 4f 6f f5[ 	]*vmovdqu8 %zmm29,%zmm30\{%k7\}
diff --git a/gas/testsuite/gas/i386/x86-64-avx512bw-opts.s b/gas/testsuite/gas/i386/x86-64-avx512bw-opts.s
index 99ba786..c907c2c 100644
--- a/gas/testsuite/gas/i386/x86-64-avx512bw-opts.s
+++ b/gas/testsuite/gas/i386/x86-64-avx512bw-opts.s
@@ -3,18 +3,6 @@
 	.allow_index_reg
 	.text
 _start:
-	vpextrw	$0xab, %xmm29, %rax	 # AVX512BW
-	vpextrw.s	$0xab, %xmm29, %rax	 # AVX512BW
-	vpextrw	$123, %xmm29, %rax	 # AVX512BW
-	vpextrw.s	$123, %xmm29, %rax	 # AVX512BW
-	vpextrw	$123, %xmm29, %r8	 # AVX512BW
-	vpextrw.s	$123, %xmm29, %r8	 # AVX512BW
-	vpextrw	$0xab, %xmm29, %rax	 # AVX512BW
-	vpextrw.s	$0xab, %xmm29, %rax	 # AVX512BW
-	vpextrw	$123, %xmm29, %rax	 # AVX512BW
-	vpextrw.s	$123, %xmm29, %rax	 # AVX512BW
-	vpextrw	$123, %xmm29, %r8	 # AVX512BW
-	vpextrw.s	$123, %xmm29, %r8	 # AVX512BW
 	vmovdqu8	%zmm29, %zmm30	 # AVX512BW
 	vmovdqu8.s	%zmm29, %zmm30	 # AVX512BW
 	vmovdqu8	%zmm29, %zmm30{%k7}	 # AVX512BW
@@ -41,18 +29,6 @@ _start:
 	vmovdqu16.s	%zmm29, %zmm30{%k7}{z}	 # AVX512BW
 
 	.intel_syntax noprefix
-	vpextrw	rax, xmm29, 0xab	 # AVX512BW
-	vpextrw.s	rax, xmm29, 0xab	 # AVX512BW
-	vpextrw	rax, xmm29, 123	 # AVX512BW
-	vpextrw.s	rax, xmm29, 123	 # AVX512BW
-	vpextrw	r8, xmm29, 123	 # AVX512BW
-	vpextrw.s	r8, xmm29, 123	 # AVX512BW
-	vpextrw	rax, xmm29, 0xab	 # AVX512BW
-	vpextrw.s	rax, xmm29, 0xab	 # AVX512BW
-	vpextrw	rax, xmm29, 123	 # AVX512BW
-	vpextrw.s	rax, xmm29, 123	 # AVX512BW
-	vpextrw	r8, xmm29, 123	 # AVX512BW
-	vpextrw.s	r8, xmm29, 123	 # AVX512BW
 	vmovdqu8	zmm30, zmm29	 # AVX512BW
 	vmovdqu8.s	zmm30, zmm29	 # AVX512BW
 	vmovdqu8	zmm30{k7}, zmm29	 # AVX512BW