[2/3] x86: Rename VCOMSBF16 to VCOMISBF16

Message ID 20250113082614.1716559-3-haochen.jiang@intel.com
State New
Headers
Series Refine AVX10.2 mnemonics |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_binutils_build--master-arm success Build passed
linaro-tcwg-bot/tcwg_binutils_build--master-aarch64 success Build passed
linaro-tcwg-bot/tcwg_binutils_check--master-aarch64 success Test passed
linaro-tcwg-bot/tcwg_binutils_check--master-arm success Test passed

Commit Message

Haochen Jiang Jan. 13, 2025, 8:26 a.m. UTC
  The functionality for VCOMSBF16 is exactly the same as the VCOMISD/S/H.
The only difference is the bf16 type. Thus, it should be VCOMISBF16.
This patch would fix that.

gas/ChangeLog:

	* testsuite/gas/i386/avx10_2-256-bf16-intel.d: Refine testcase
	according to mnemonics change.
	* testsuite/gas/i386/avx10_2-256-bf16.d: Ditto.
	* testsuite/gas/i386/avx10_2-256-bf16.s: Ditto.
	* testsuite/gas/i386/x86-64-avx10_2-256-bf16-intel.d: Ditto.
	* testsuite/gas/i386/x86-64-avx10_2-256-bf16.d: Ditto.
	* testsuite/gas/i386/x86-64-avx10_2-256-bf16.s: Ditto.

opcodes/ChangeLog:

	* i386-dis-evex-prefix.h: Rename VCOMSBF16 to VCOMISBF16.
	* i386-opc.tbl: Ditto.
	* i386-mnem.h: Regenerated.
	* i386-tbl.h: Ditto.
---
 .../gas/i386/avx10_2-256-bf16-intel.d         |   10 +-
 gas/testsuite/gas/i386/avx10_2-256-bf16.d     |   10 +-
 gas/testsuite/gas/i386/avx10_2-256-bf16.s     |   20 +-
 .../gas/i386/x86-64-avx10_2-256-bf16-intel.d  |   10 +-
 .../gas/i386/x86-64-avx10_2-256-bf16.d        |   10 +-
 .../gas/i386/x86-64-avx10_2-256-bf16.s        |   20 +-
 opcodes/i386-dis-evex-prefix.h                |    2 +-
 opcodes/i386-mnem.h                           | 4196 ++++++++---------
 opcodes/i386-opc.tbl                          |    2 +-
 opcodes/i386-tbl.h                            |    4 +-
 10 files changed, 2142 insertions(+), 2142 deletions(-)
  

Patch

diff --git a/gas/testsuite/gas/i386/avx10_2-256-bf16-intel.d b/gas/testsuite/gas/i386/avx10_2-256-bf16-intel.d
index 1873c808a76..984c7fca46e 100644
--- a/gas/testsuite/gas/i386/avx10_2-256-bf16-intel.d
+++ b/gas/testsuite/gas/i386/avx10_2-256-bf16-intel.d
@@ -278,11 +278,11 @@  Disassembly of section \.text:
 \s*[a-f0-9]+:\s*62 f3 57 38 c2 29 7b\s+vcmpbf16 k5,ymm5,WORD BCST \[ecx\],0x7b
 \s*[a-f0-9]+:\s*62 f3 57 28 c2 69 7f 7b\s+vcmpbf16 k5,ymm5,YMMWORD PTR \[ecx\+0xfe0\],0x7b
 \s*[a-f0-9]+:\s*62 f3 57 3f c2 6a 80 7b\s+vcmpbf16 k5\{k7\},ymm5,WORD BCST \[edx-0x100\],0x7b
-\s*[a-f0-9]+:\s*62 f5 7d 08 2f f5\s+vcomsbf16 xmm6,xmm5
-\s*[a-f0-9]+:\s*62 f5 7d 08 2f b4 f4 00 00 00 10\s+vcomsbf16 xmm6,WORD PTR \[esp\+esi\*8\+0x10000000\]
-\s*[a-f0-9]+:\s*62 f5 7d 08 2f 31\s+vcomsbf16 xmm6,WORD PTR \[ecx\]
-\s*[a-f0-9]+:\s*62 f5 7d 08 2f 71 7f\s+vcomsbf16 xmm6,WORD PTR \[ecx\+0xfe\]
-\s*[a-f0-9]+:\s*62 f5 7d 08 2f 72 80\s+vcomsbf16 xmm6,WORD PTR \[edx-0x100\]
+\s*[a-f0-9]+:\s*62 f5 7d 08 2f f5\s+vcomisbf16 xmm6,xmm5
+\s*[a-f0-9]+:\s*62 f5 7d 08 2f b4 f4 00 00 00 10\s+vcomisbf16 xmm6,WORD PTR \[esp\+esi\*8\+0x10000000\]
+\s*[a-f0-9]+:\s*62 f5 7d 08 2f 31\s+vcomisbf16 xmm6,WORD PTR \[ecx\]
+\s*[a-f0-9]+:\s*62 f5 7d 08 2f 71 7f\s+vcomisbf16 xmm6,WORD PTR \[ecx\+0xfe\]
+\s*[a-f0-9]+:\s*62 f5 7d 08 2f 72 80\s+vcomisbf16 xmm6,WORD PTR \[edx-0x100\]
 \s*[a-f0-9]+:\s*62 f3 7f 28 66 ed 7b\s+vfpclassbf16 k5,ymm5,0x7b
 \s*[a-f0-9]+:\s*62 f3 7f 08 66 ed 7b\s+vfpclassbf16 k5,xmm5,0x7b
 \s*[a-f0-9]+:\s*62 f3 7f 0f 66 ac f4 00 00 00 10 7b\s+vfpclassbf16 k5\{k7\},XMMWORD PTR \[esp\+esi\*8\+0x10000000\],0x7b
diff --git a/gas/testsuite/gas/i386/avx10_2-256-bf16.d b/gas/testsuite/gas/i386/avx10_2-256-bf16.d
index ec00057ccbe..345ca717bed 100644
--- a/gas/testsuite/gas/i386/avx10_2-256-bf16.d
+++ b/gas/testsuite/gas/i386/avx10_2-256-bf16.d
@@ -277,11 +277,11 @@  Disassembly of section .text:
 \s*[a-f0-9]+:\s*62 f3 57 38 c2 29 7b\s+vcmpbf16 \$0x7b,\(%ecx\)\{1to16\},%ymm5,%k5
 \s*[a-f0-9]+:\s*62 f3 57 28 c2 69 7f 7b\s+vcmpbf16 \$0x7b,0xfe0\(%ecx\),%ymm5,%k5
 \s*[a-f0-9]+:\s*62 f3 57 3f c2 6a 80 7b\s+vcmpbf16 \$0x7b,-0x100\(%edx\)\{1to16\},%ymm5,%k5\{%k7\}
-\s*[a-f0-9]+:\s*62 f5 7d 08 2f f5\s+vcomsbf16 %xmm5,%xmm6
-\s*[a-f0-9]+:\s*62 f5 7d 08 2f b4 f4 00 00 00 10\s+vcomsbf16 0x10000000\(%esp,%esi,8\),%xmm6
-\s*[a-f0-9]+:\s*62 f5 7d 08 2f 31\s+vcomsbf16 \(%ecx\),%xmm6
-\s*[a-f0-9]+:\s*62 f5 7d 08 2f 71 7f\s+vcomsbf16 0xfe\(%ecx\),%xmm6
-\s*[a-f0-9]+:\s*62 f5 7d 08 2f 72 80\s+vcomsbf16 -0x100\(%edx\),%xmm6
+\s*[a-f0-9]+:\s*62 f5 7d 08 2f f5\s+vcomisbf16 %xmm5,%xmm6
+\s*[a-f0-9]+:\s*62 f5 7d 08 2f b4 f4 00 00 00 10\s+vcomisbf16 0x10000000\(%esp,%esi,8\),%xmm6
+\s*[a-f0-9]+:\s*62 f5 7d 08 2f 31\s+vcomisbf16 \(%ecx\),%xmm6
+\s*[a-f0-9]+:\s*62 f5 7d 08 2f 71 7f\s+vcomisbf16 0xfe\(%ecx\),%xmm6
+\s*[a-f0-9]+:\s*62 f5 7d 08 2f 72 80\s+vcomisbf16 -0x100\(%edx\),%xmm6
 \s*[a-f0-9]+:\s*62 f3 7f 28 66 ed 7b\s+vfpclassbf16 \$0x7b,%ymm5,%k5
 \s*[a-f0-9]+:\s*62 f3 7f 08 66 ed 7b\s+vfpclassbf16 \$0x7b,%xmm5,%k5
 \s*[a-f0-9]+:\s*62 f3 7f 0f 66 ac f4 00 00 00 10 7b\s+vfpclassbf16x \$0x7b,0x10000000\(%esp,%esi,8\),%k5\{%k7\}
diff --git a/gas/testsuite/gas/i386/avx10_2-256-bf16.s b/gas/testsuite/gas/i386/avx10_2-256-bf16.s
index 6af39fb4270..211036bc000 100644
--- a/gas/testsuite/gas/i386/avx10_2-256-bf16.s
+++ b/gas/testsuite/gas/i386/avx10_2-256-bf16.s
@@ -69,11 +69,11 @@  _start:
 	vcmpbf16	$123, 4064(%ecx), %ymm5, %k5
 	vcmpbf16	$123, -256(%edx){1to16}, %ymm5, %k5{%k7}
 
-	vcomsbf16	%xmm5, %xmm6
-	vcomsbf16	0x10000000(%esp, %esi, 8), %xmm6
-	vcomsbf16	(%ecx), %xmm6
-	vcomsbf16	254(%ecx), %xmm6
-	vcomsbf16	-256(%edx), %xmm6
+	vcomisbf16	%xmm5, %xmm6
+	vcomisbf16	0x10000000(%esp, %esi, 8), %xmm6
+	vcomisbf16	(%ecx), %xmm6
+	vcomisbf16	254(%ecx), %xmm6
+	vcomisbf16	-256(%edx), %xmm6
 
 	vfpclassbf16	$123, %ymm5, %k5
 	vfpclassbf16	$123, %xmm5, %k5
@@ -152,11 +152,11 @@  _intel:
 	vcmpbf16	k5, ymm5, [ecx+4064], 123
 	vcmpbf16	k5{k7}, ymm5, [edx-256]{1to16}, 123
 
-	vcomsbf16	xmm6, xmm5
-	vcomsbf16	xmm6, WORD PTR [esp+esi*8+0x10000000]
-	vcomsbf16	xmm6, WORD PTR [ecx]
-	vcomsbf16	xmm6, WORD PTR [ecx+254]
-	vcomsbf16	xmm6, WORD PTR [edx-256]
+	vcomisbf16	xmm6, xmm5
+	vcomisbf16	xmm6, WORD PTR [esp+esi*8+0x10000000]
+	vcomisbf16	xmm6, WORD PTR [ecx]
+	vcomisbf16	xmm6, WORD PTR [ecx+254]
+	vcomisbf16	xmm6, WORD PTR [edx-256]
 
 	vfpclassbf16	k5, ymm5, 123
 	vfpclassbf16	k5, xmm5, 123
diff --git a/gas/testsuite/gas/i386/x86-64-avx10_2-256-bf16-intel.d b/gas/testsuite/gas/i386/x86-64-avx10_2-256-bf16-intel.d
index 68eb3105887..1b17384fbb8 100644
--- a/gas/testsuite/gas/i386/x86-64-avx10_2-256-bf16-intel.d
+++ b/gas/testsuite/gas/i386/x86-64-avx10_2-256-bf16-intel.d
@@ -278,11 +278,11 @@  Disassembly of section \.text:
 \s*[a-f0-9]+:\s*62 d3 17 30 c2 29 7b\s+vcmpbf16 k5,ymm29,WORD BCST \[r9\],0x7b
 \s*[a-f0-9]+:\s*62 f3 17 20 c2 69 7f 7b\s+vcmpbf16 k5,ymm29,YMMWORD PTR \[rcx\+0xfe0\],0x7b
 \s*[a-f0-9]+:\s*62 f3 17 37 c2 6a 80 7b\s+vcmpbf16 k5\{k7\},ymm29,WORD BCST \[rdx-0x100\],0x7b
-\s*[a-f0-9]+:\s*62 05 7d 08 2f f5\s+vcomsbf16 xmm30,xmm29
-\s*[a-f0-9]+:\s*62 25 7d 08 2f b4 f5 00 00 00 10\s+vcomsbf16 xmm30,WORD PTR \[rbp\+r14\*8\+0x10000000\]
-\s*[a-f0-9]+:\s*62 45 7d 08 2f 31\s+vcomsbf16 xmm30,WORD PTR \[r9\]
-\s*[a-f0-9]+:\s*62 65 7d 08 2f 71 7f\s+vcomsbf16 xmm30,WORD PTR \[rcx\+0xfe\]
-\s*[a-f0-9]+:\s*62 65 7d 08 2f 72 80\s+vcomsbf16 xmm30,WORD PTR \[rdx-0x100\]
+\s*[a-f0-9]+:\s*62 05 7d 08 2f f5\s+vcomisbf16 xmm30,xmm29
+\s*[a-f0-9]+:\s*62 25 7d 08 2f b4 f5 00 00 00 10\s+vcomisbf16 xmm30,WORD PTR \[rbp\+r14\*8\+0x10000000\]
+\s*[a-f0-9]+:\s*62 45 7d 08 2f 31\s+vcomisbf16 xmm30,WORD PTR \[r9\]
+\s*[a-f0-9]+:\s*62 65 7d 08 2f 71 7f\s+vcomisbf16 xmm30,WORD PTR \[rcx\+0xfe\]
+\s*[a-f0-9]+:\s*62 65 7d 08 2f 72 80\s+vcomisbf16 xmm30,WORD PTR \[rdx-0x100\]
 \s*[a-f0-9]+:\s*62 93 7f 28 66 ed 7b\s+vfpclassbf16 k5,ymm29,0x7b
 \s*[a-f0-9]+:\s*62 93 7f 08 66 ed 7b\s+vfpclassbf16 k5,xmm29,0x7b
 \s*[a-f0-9]+:\s*62 b3 7f 0f 66 ac f5 00 00 00 10 7b\s+vfpclassbf16 k5\{k7\},XMMWORD PTR \[rbp\+r14\*8\+0x10000000\],0x7b
diff --git a/gas/testsuite/gas/i386/x86-64-avx10_2-256-bf16.d b/gas/testsuite/gas/i386/x86-64-avx10_2-256-bf16.d
index 1d57fc4890f..1f320eeb3dd 100644
--- a/gas/testsuite/gas/i386/x86-64-avx10_2-256-bf16.d
+++ b/gas/testsuite/gas/i386/x86-64-avx10_2-256-bf16.d
@@ -276,11 +276,11 @@  Disassembly of section \.text:
 \s*[a-f0-9]+:\s*62 d3 17 30 c2 29 7b\s+vcmpbf16 \$0x7b,\(%r9\)\{1to16\},%ymm29,%k5
 \s*[a-f0-9]+:\s*62 f3 17 20 c2 69 7f 7b\s+vcmpbf16 \$0x7b,0xfe0\(%rcx\),%ymm29,%k5
 \s*[a-f0-9]+:\s*62 f3 17 37 c2 6a 80 7b\s+vcmpbf16 \$0x7b,-0x100\(%rdx\)\{1to16\},%ymm29,%k5\{%k7\}
-\s*[a-f0-9]+:\s*62 05 7d 08 2f f5\s+vcomsbf16 %xmm29,%xmm30
-\s*[a-f0-9]+:\s*62 25 7d 08 2f b4 f5 00 00 00 10\s+vcomsbf16 0x10000000\(%rbp,%r14,8\),%xmm30
-\s*[a-f0-9]+:\s*62 45 7d 08 2f 31\s+vcomsbf16 \(%r9\),%xmm30
-\s*[a-f0-9]+:\s*62 65 7d 08 2f 71 7f\s+vcomsbf16 0xfe\(%rcx\),%xmm30
-\s*[a-f0-9]+:\s*62 65 7d 08 2f 72 80\s+vcomsbf16 -0x100\(%rdx\),%xmm30
+\s*[a-f0-9]+:\s*62 05 7d 08 2f f5\s+vcomisbf16 %xmm29,%xmm30
+\s*[a-f0-9]+:\s*62 25 7d 08 2f b4 f5 00 00 00 10\s+vcomisbf16 0x10000000\(%rbp,%r14,8\),%xmm30
+\s*[a-f0-9]+:\s*62 45 7d 08 2f 31\s+vcomisbf16 \(%r9\),%xmm30
+\s*[a-f0-9]+:\s*62 65 7d 08 2f 71 7f\s+vcomisbf16 0xfe\(%rcx\),%xmm30
+\s*[a-f0-9]+:\s*62 65 7d 08 2f 72 80\s+vcomisbf16 -0x100\(%rdx\),%xmm30
 \s*[a-f0-9]+:\s*62 93 7f 28 66 ed 7b\s+vfpclassbf16 \$0x7b,%ymm29,%k5
 \s*[a-f0-9]+:\s*62 93 7f 08 66 ed 7b\s+vfpclassbf16 \$0x7b,%xmm29,%k5
 \s*[a-f0-9]+:\s*62 b3 7f 0f 66 ac f5 00 00 00 10 7b\s+vfpclassbf16x \$0x7b,0x10000000\(%rbp,%r14,8\),%k5\{%k7\}
diff --git a/gas/testsuite/gas/i386/x86-64-avx10_2-256-bf16.s b/gas/testsuite/gas/i386/x86-64-avx10_2-256-bf16.s
index 297891ac6a5..67301dd29ab 100644
--- a/gas/testsuite/gas/i386/x86-64-avx10_2-256-bf16.s
+++ b/gas/testsuite/gas/i386/x86-64-avx10_2-256-bf16.s
@@ -69,11 +69,11 @@  _start:
 	vcmpbf16	$123, 4064(%rcx), %ymm29, %k5
 	vcmpbf16	$123, -256(%rdx){1to16}, %ymm29, %k5{%k7}
 
-	vcomsbf16	%xmm29, %xmm30
-	vcomsbf16	0x10000000(%rbp, %r14, 8), %xmm30
-	vcomsbf16	(%r9), %xmm30
-	vcomsbf16	254(%rcx), %xmm30
-	vcomsbf16	-256(%rdx), %xmm30
+	vcomisbf16	%xmm29, %xmm30
+	vcomisbf16	0x10000000(%rbp, %r14, 8), %xmm30
+	vcomisbf16	(%r9), %xmm30
+	vcomisbf16	254(%rcx), %xmm30
+	vcomisbf16	-256(%rdx), %xmm30
 
 	vfpclassbf16	$123, %ymm29, %k5
 	vfpclassbf16	$123, %xmm29, %k5
@@ -152,11 +152,11 @@  _intel:
 	vcmpbf16	k5, ymm29, YMMWORD PTR [rcx+4064], 123
 	vcmpbf16	k5{k7}, ymm29, WORD PTR [rdx-256]{1to16}, 123
 
-	vcomsbf16	xmm30, xmm29
-	vcomsbf16	xmm30, WORD PTR [rbp+r14*8+0x10000000]
-	vcomsbf16	xmm30, [r9]
-	vcomsbf16	xmm30, [rcx+254]
-	vcomsbf16	xmm30, WORD PTR [rdx-256]
+	vcomisbf16	xmm30, xmm29
+	vcomisbf16	xmm30, WORD PTR [rbp+r14*8+0x10000000]
+	vcomisbf16	xmm30, [r9]
+	vcomisbf16	xmm30, [rcx+254]
+	vcomisbf16	xmm30, WORD PTR [rdx-256]
 
 	vfpclassbf16	k5, ymm29, 123
 	vfpclassbf16	k5, xmm29, 123
diff --git a/opcodes/i386-dis-evex-prefix.h b/opcodes/i386-dis-evex-prefix.h
index 74a26a4fba2..dc706e0f7c9 100644
--- a/opcodes/i386-dis-evex-prefix.h
+++ b/opcodes/i386-dis-evex-prefix.h
@@ -502,7 +502,7 @@ 
   {
     { "vcomisY%XH",	{ XMScalar, EXw, EXxEVexS }, 0 },
     { "vcomxs%XH",	{ XMScalar, EXw, EXxEVexS }, 0 },
-    { "vcoms%XB",	{ XMScalar, EXw, EXxEVexS }, 0 },
+    { "vcomis%XB",	{ XMScalar, EXw, EXxEVexS }, 0 },
   },
   /* PREFIX_EVEX_MAP5_51 */
   {
diff --git a/opcodes/i386-opc.tbl b/opcodes/i386-opc.tbl
index 49546e163ec..98a786d1ff9 100644
--- a/opcodes/i386-opc.tbl
+++ b/opcodes/i386-opc.tbl
@@ -3535,7 +3535,7 @@  vrsqrtbf16, 0x4e, AVX10_2, Modrm|Map6|VexW0|Masking|Broadcast|Disp8ShiftVL|Check
 vscalefbf16, 0x2c, AVX10_2, Modrm|Map6|Src1VVVV|VexW0|Masking|Broadcast|Disp8ShiftVL|CheckOperandSize|NoSuf, { RegXMM|RegYMM|RegZMM|Word|Unspecified|BaseIndex, RegXMM|RegYMM|RegZMM, RegXMM|RegYMM|RegZMM }
 vsqrtbf16, 0x6651, AVX10_2, Modrm|Map5|VexW0|Masking|Broadcast|Disp8ShiftVL|CheckOperandSize|NoSuf, { RegXMM|RegYMM|RegZMM|Word|Unspecified|BaseIndex, RegXMM|RegYMM|RegZMM }
 
-vcomsbf16, 0x662f, AVX10_2, Modrm|Map5|EVexLIG|VexW0|Disp8MemShift=1|NoSuf, { RegXMM|Word|Unspecified|BaseIndex, RegXMM }
+vcomisbf16, 0x662f, AVX10_2, Modrm|Map5|EVexLIG|VexW0|Disp8MemShift=1|NoSuf, { RegXMM|Word|Unspecified|BaseIndex, RegXMM }
 
 <sign:opc, $s:0x0, u:0x2>