[PATCH] x86: make 16-bit ENQCMD test actually test ENQCMD

[Jan Beulich]

gas/
2021-02-15  Jan Beulich  <jbeulich@suse.com>

	* testsuite/gas/i386/enqcmd-16bit.s: Include enqcmd.s, not
	movdir.s.
	* testsuite/gas/i386/enqcmd-16bit.d: Adjust expectations.

--- a/gas/testsuite/gas/i386/enqcmd-16bit.d
+++ b/gas/testsuite/gas/i386/enqcmd-16bit.d
@@ -7,15 +7,20 @@
 Disassembly of section .text:
 
 0+ <_start>:
- +[a-f0-9]+:	67 0f 38 f9 01       	movdiri %eax,\(%ecx\)
- +[a-f0-9]+:	67 66 0f 38 f8 01    	movdir64b \(%ecx\),%eax
- +[a-f0-9]+:	66 0f 38 f8 04       	movdir64b \(%si\),%ax
- +[a-f0-9]+:	66 0f 38 f8 0e 00 00 	movdir64b 0x0,%cx
- +[a-f0-9]+:	66 0f 38 f8 0e 34 12 	movdir64b 0x1234,%cx
- +[a-f0-9]+:	67 0f 38 f9 01       	movdiri %eax,\(%ecx\)
- +[a-f0-9]+:	67 0f 38 f9 01       	movdiri %eax,\(%ecx\)
- +[a-f0-9]+:	67 66 0f 38 f8 01    	movdir64b \(%ecx\),%eax
- +[a-f0-9]+:	66 0f 38 f8 04       	movdir64b \(%si\),%ax
- +[a-f0-9]+:	66 0f 38 f8 0e 00 00 	movdir64b 0x0,%cx
- +[a-f0-9]+:	66 0f 38 f8 0e 34 12 	movdir64b 0x1234,%cx
+ +[a-f0-9]+:	67 f2 0f 38 f8 01    	enqcmd \(%ecx\),%eax
+ +[a-f0-9]+:	f2 0f 38 f8 04       	enqcmd \(%si\),%ax
+ +[a-f0-9]+:	67 f3 0f 38 f8 01    	enqcmds \(%ecx\),%eax
+ +[a-f0-9]+:	f3 0f 38 f8 04       	enqcmds \(%si\),%ax
+ +[a-f0-9]+:	f2 0f 38 f8 0e 00 00 	enqcmd 0x0,%cx
+ +[a-f0-9]+:	f2 0f 38 f8 0e 34 12 	enqcmd 0x1234,%cx
+ +[a-f0-9]+:	f3 0f 38 f8 0e 00 00 	enqcmds 0x0,%cx
+ +[a-f0-9]+:	f3 0f 38 f8 0e 34 12 	enqcmds 0x1234,%cx
+ +[a-f0-9]+:	67 f2 0f 38 f8 01    	enqcmd \(%ecx\),%eax
+ +[a-f0-9]+:	f2 0f 38 f8 04       	enqcmd \(%si\),%ax
+ +[a-f0-9]+:	67 f3 0f 38 f8 01    	enqcmds \(%ecx\),%eax
+ +[a-f0-9]+:	f3 0f 38 f8 04       	enqcmds \(%si\),%ax
+ +[a-f0-9]+:	f2 0f 38 f8 0e 00 00 	enqcmd 0x0,%cx
+ +[a-f0-9]+:	f2 0f 38 f8 0e 34 12 	enqcmd 0x1234,%cx
+ +[a-f0-9]+:	f3 0f 38 f8 0e 00 00 	enqcmds 0x0,%cx
+ +[a-f0-9]+:	f3 0f 38 f8 0e 34 12 	enqcmds 0x1234,%cx
 #pass
--- a/gas/testsuite/gas/i386/enqcmd-16bit.s
+++ b/gas/testsuite/gas/i386/enqcmd-16bit.s
@@ -1,4 +1,4 @@
 # Check ENQCMD[S] 16-bit instructions
 
 	.code16
-.include "movdir.s"
+.include "enqcmd.s"