x86: KeyLocker insn interaction with -msse-check / .sse_check

Some of these have no explicit %xmm operand(s), yet they still act SSE-
like (in leaveing bits 128 and up untouched). Hence they want similarly
diagnosing, if that was asked for.

6 files changed, 49 insertions, 3 deletions

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 8790e1b..85dc79f 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -6761,7 +6761,8 @@ md_assemble (char *line)
       && !is_cpu (&i.tm, CpuSSE4a)
       && !is_any_vex_encoding (t))
     {
-      bool simd = false;
+      /* Some KL and all WideKL insns have only implicit %xmm operands.  */
+      bool simd = is_cpu (t, CpuKL) || is_cpu (t, CpuWideKL);
 
       for (j = 0; j < t->operands; ++j)
 	{
diff --git a/gas/testsuite/gas/i386/sse-check-error.l b/gas/testsuite/gas/i386/sse-check-error.l
index da22c3b..2b5fd1e 100644
--- a/gas/testsuite/gas/i386/sse-check-error.l
+++ b/gas/testsuite/gas/i386/sse-check-error.l
@@ -10,6 +10,9 @@
 .*:33: Error: .*
 .*:36: Error: .*
 .*:39: Error: .*
+.*:44: Error: .*
+.*:45: Error: .*
+.*:48: Error: .*
 GAS LISTING .*
 
 
@@ -78,4 +81,17 @@ GAS LISTING .*
 [ 	]*[0-9]+[ 	]+CFC0
 [ 	]*[0-9]+[ 	]+\?\?\?\? 62F27D48 		vgf2p8mulb %zmm0, %zmm0, %zmm0
 [ 	]*[0-9]+[ 	]+CFC0
-
+[ 	]*[0-9]+[ 	]+
+[ 	]*[0-9]+[ 	]+\# KeyLocker instructions
+[ 	]*[0-9]+[ 	]+\?\?\?\? F30F38DD 		aesdec128kl \(%eax\), %xmm0
+.*  Error: SSE instruction `aesdec128kl' is used
+[ 	]*[0-9]+[ 	]+00
+[ 	]*[0-9]+[ 	]+\?\?\?\? F30F38FA 		encodekey128 %eax, %edi
+.*  Error: SSE instruction `encodekey128' is used
+[ 	]*[0-9]+[ 	]+F8
+[ 	]*[0-9]+[ 	]+
+[ 	]*[0-9]+[ 	]+\# WideKL instructions
+[ 	]*[0-9]+[ 	]+\?\?\?\? F30F38D8 		aesencwide256kl \(%eax\)
+.*  Error: SSE instruction `aesencwide256kl' is used
+[ 	]*[0-9]+[ 	]+10
+#pass
diff --git a/gas/testsuite/gas/i386/sse-check-warn.e b/gas/testsuite/gas/i386/sse-check-warn.e
index af7f902..e98bdd1 100644
--- a/gas/testsuite/gas/i386/sse-check-warn.e
+++ b/gas/testsuite/gas/i386/sse-check-warn.e
@@ -10,3 +10,6 @@
 .*:33: Warning: SSE instruction `aesdec' is used
 .*:36: Warning: SSE instruction `sha1nexte' is used
 .*:39: Warning: SSE instruction `gf2p8mulb' is used
+.*:44: Warning: SSE instruction `aesdec128kl' is used
+.*:45: Warning: SSE instruction `encodekey128' is used
+.*:48: Warning: SSE instruction `aesencwide256kl' is used
diff --git a/gas/testsuite/gas/i386/sse-check.d b/gas/testsuite/gas/i386/sse-check.d
index adc0b1f..2e04cf2 100644
--- a/gas/testsuite/gas/i386/sse-check.d
+++ b/gas/testsuite/gas/i386/sse-check.d
@@ -22,4 +22,7 @@ Disassembly of section .text:
 [ 	]*[a-f0-9]+:	66 0f 38 cf d1       	gf2p8mulb %xmm1,%xmm2
 [ 	]*[a-f0-9]+:	62 f2 7d 09 cf c0    	vgf2p8mulb %xmm0,%xmm0,%xmm0\{%k1\}
 [ 	]*[a-f0-9]+:	62 f2 7d 48 cf c0    	vgf2p8mulb %zmm0,%zmm0,%zmm0
+[ 	]*[a-f0-9]+:	(67 )?f3 0f 38 dd 00 +	aesdec128kl \(%eax\),%xmm0
+[ 	]*[a-f0-9]+:	f3 0f 38 fa f8       	encodekey128 %eax,%edi
+[ 	]*[a-f0-9]+:	(67 )?f3 0f 38 d8 10 +	aesencwide256kl \(%eax\)
 #pass
diff --git a/gas/testsuite/gas/i386/sse-check.s b/gas/testsuite/gas/i386/sse-check.s
index 6536a86..001beeb 100644
--- a/gas/testsuite/gas/i386/sse-check.s
+++ b/gas/testsuite/gas/i386/sse-check.s
@@ -39,3 +39,10 @@ _start:
 	gf2p8mulb %xmm1,%xmm2
 	vgf2p8mulb %xmm0, %xmm0, %xmm0{%k1}
 	vgf2p8mulb %zmm0, %zmm0, %zmm0
+
+# KeyLocker instructions
+	aesdec128kl (%eax), %xmm0
+	encodekey128 %eax, %edi
+
+# WideKL instructions
+	aesencwide256kl (%eax)
diff --git a/gas/testsuite/gas/i386/x86-64-sse-check-error.l b/gas/testsuite/gas/i386/x86-64-sse-check-error.l
index 0b28537..efd32e3 100644
--- a/gas/testsuite/gas/i386/x86-64-sse-check-error.l
+++ b/gas/testsuite/gas/i386/x86-64-sse-check-error.l
@@ -10,6 +10,9 @@
 .*:33: Error: .*
 .*:36: Error: .*
 .*:39: Error: .*
+.*:44: Error: .*
+.*:45: Error: .*
+.*:48: Error: .*
 GAS LISTING .*
 
 
@@ -79,4 +82,17 @@ GAS LISTING .*
 [ 	]*[0-9]+[ 	]+CFC0
 [ 	]*[0-9]+[ 	]+\?\?\?\? 62F27D48 		vgf2p8mulb %zmm0, %zmm0, %zmm0
 [ 	]*[0-9]+[ 	]+CFC0
-
+[ 	]*[0-9]+[ 	]+
+[ 	]*[0-9]+[ 	]+\# KeyLocker instructions
+[ 	]*[0-9]+[ 	]+\?\?\?\? 67F30F38 		aesdec128kl \(%eax\), %xmm0
+.*  Error: SSE instruction `aesdec128kl' is used
+[ 	]*[0-9]+[ 	]+DD00
+[ 	]*[0-9]+[ 	]+\?\?\?\? F30F38FA 		encodekey128 %eax, %edi
+.*  Error: SSE instruction `encodekey128' is used
+[ 	]*[0-9]+[ 	]+F8
+[ 	]*[0-9]+[ 	]+
+[ 	]*[0-9]+[ 	]+\# WideKL instructions
+[ 	]*[0-9]+[ 	]+\?\?\?\? 67F30F38 		aesencwide256kl \(%eax\)
+.*  Error: SSE instruction `aesencwide256kl' is used
+[ 	]*[0-9]+[ 	]+D810
+#pass