Skip to content

Commit d54678e

Browse files
jbeulichjbeulich
committed
x86: rename CpuPCLMUL
The name we use internally isn't in line with the SDM, and also isn't in line with CpuVPCLMULQDQ. Add the missing suffix, but of course leave alone user facing names.
1 parent e30e957 commit d54678e

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed

‎gas/config/tc-i386.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,8 +1053,8 @@ static const arch_entry cpu_arch[] =
10531053
SUBARCH (xsavec, XSAVEC, ANY_XSAVEC, false),
10541054
SUBARCH (xsaves, XSAVES, ANY_XSAVES, false),
10551055
SUBARCH (aes, AES, ANY_AES, false),
1056-
SUBARCH (pclmul, PCLMUL, ANY_PCLMUL, false),
1057-
SUBARCH (clmul, PCLMUL, ANY_PCLMUL, true),
1056+
SUBARCH (pclmul, PCLMULQDQ, ANY_PCLMULQDQ, false),
1057+
SUBARCH (clmul, PCLMULQDQ, ANY_PCLMULQDQ, true),
10581058
SUBARCH (fsgsbase, FSGSBASE, FSGSBASE, false),
10591059
SUBARCH (rdrnd, RDRND, RDRND, false),
10601060
SUBARCH (f16c, F16C, ANY_F16C, false),
@@ -1911,7 +1911,7 @@ cpu_flags_match (const insn_template *t)
19111911
|| (sse2avx && !i.prefix[DATA_PREFIX]))
19121912
&& (!x.bitfield.cpuaes || cpu.bitfield.cpuaes)
19131913
&& (!x.bitfield.cpugfni || cpu.bitfield.cpugfni)
1914-
&& (!x.bitfield.cpupclmul || cpu.bitfield.cpupclmul))
1914+
&& (!x.bitfield.cpupclmulqdq || cpu.bitfield.cpupclmulqdq))
19151915
match |= CPU_FLAGS_ARCH_MATCH;
19161916
}
19171917
else if (x.bitfield.cpuavx512f)

‎opcodes/i386-gen.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ static const dependency isa_dependencies[] =
7979
{ "AMDFAM10",
8080
"K8|FISTTP|SSE4A|ABM|MONITOR" },
8181
{ "BDVER1",
82-
"GENERIC64|FISTTP|Rdtscp|MONITOR|CX16|LAHF_SAHF|XOP|ABM|LWP|SVME|AES|PCLMUL|PRFCHW" },
82+
"GENERIC64|FISTTP|Rdtscp|MONITOR|CX16|LAHF_SAHF|XOP|ABM|LWP|SVME|AES|PCLMULQDQ|PRFCHW" },
8383
{ "BDVER2",
8484
"BDVER1|FMA|BMI|TBM|F16C" },
8585
{ "BDVER3",
8686
"BDVER2|Xsaveopt|FSGSBase" },
8787
{ "BDVER4",
8888
"BDVER3|AVX2|Movbe|BMI2|RdRnd|MWAITX" },
8989
{ "ZNVER1",
90-
"GENERIC64|FISTTP|Rdtscp|MONITOR|CX16|LAHF_SAHF|AVX2|SSE4A|ABM|SVME|AES|PCLMUL|PRFCHW|FMA|BMI|F16C|Xsaveopt|FSGSBase|Movbe|BMI2|RdRnd|ADX|RdSeed|SMAP|SHA|XSAVEC|XSAVES|ClflushOpt|CLZERO|MWAITX" },
90+
"GENERIC64|FISTTP|Rdtscp|MONITOR|CX16|LAHF_SAHF|AVX2|SSE4A|ABM|SVME|AES|PCLMULQDQ|PRFCHW|FMA|BMI|F16C|Xsaveopt|FSGSBase|Movbe|BMI2|RdRnd|ADX|RdSeed|SMAP|SHA|XSAVEC|XSAVES|ClflushOpt|CLZERO|MWAITX" },
9191
{ "ZNVER2",
9292
"ZNVER1|CLWB|RDPID|RDPRU|MCOMMIT|WBNOINVD" },
9393
{ "ZNVER3",
@@ -97,7 +97,7 @@ static const dependency isa_dependencies[] =
9797
{ "BTVER1",
9898
"GENERIC64|FISTTP|MONITOR|CX16|LAHF_SAHF|Rdtscp|SSSE3|SSE4A|ABM|PRFCHW|Clflush|FISTTP|SVME" },
9999
{ "BTVER2",
100-
"BTVER1|AVX|BMI|F16C|AES|PCLMUL|Movbe|Xsaveopt|PRFCHW" },
100+
"BTVER1|AVX|BMI|F16C|AES|PCLMULQDQ|Movbe|Xsaveopt|PRFCHW" },
101101
{ "286",
102102
"186" },
103103
{ "386",
@@ -132,7 +132,7 @@ static const dependency isa_dependencies[] =
132132
"XSAVE" },
133133
{ "AES",
134134
"SSE2" },
135-
{ "PCLMUL",
135+
{ "PCLMULQDQ",
136136
"SSE2" },
137137
{ "FMA",
138138
"AVX" },
@@ -315,7 +315,7 @@ static bitfield cpu_flags[] =
315315
BITFIELD (Xsave),
316316
BITFIELD (Xsaveopt),
317317
BITFIELD (AES),
318-
BITFIELD (PCLMUL),
318+
BITFIELD (PCLMULQDQ),
319319
BITFIELD (FMA),
320320
BITFIELD (FMA4),
321321
BITFIELD (XOP),

‎opcodes/i386-init.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@
408408
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
409409
0, 0, 0, 0, 0 } }
410410

411-
#define CPU_PCLMUL_FLAGS \
411+
#define CPU_PCLMULQDQ_FLAGS \
412412
{ { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, \
413413
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, \
414414
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
@@ -1968,7 +1968,7 @@
19681968
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
19691969
0, 0, 0, 0, 0 } }
19701970

1971-
#define CPU_ANY_PCLMUL_FLAGS \
1971+
#define CPU_ANY_PCLMULQDQ_FLAGS \
19721972
{ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
19731973
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, \
19741974
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \

‎opcodes/i386-opc.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ enum i386_cpu
107107
CpuXsaveopt,
108108
/* AES support required */
109109
CpuAES,
110-
/* PCLMUL support required */
111-
CpuPCLMUL,
110+
/* PCLMULQDQ support required */
111+
CpuPCLMULQDQ,
112112
/* FMA support required */
113113
CpuFMA,
114114
/* FMA4 support required */
@@ -415,7 +415,7 @@ typedef union i386_cpu_flags
415415
unsigned int cpuxsave:1;
416416
unsigned int cpuxsaveopt:1;
417417
unsigned int cpuaes:1;
418-
unsigned int cpupclmul:1;
418+
unsigned int cpupclmulqdq:1;
419419
unsigned int cpufma:1;
420420
unsigned int cpufma4:1;
421421
unsigned int cpuxop:1;

‎opcodes/i386-opc.tbl‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1448,15 +1448,15 @@ vaesdeclast, 0x66df, VAES, Modrm|Vex256|Space0F38|VexVVVV|VexWIG|NoSuf, { RegYMM
14481448
vaesenc, 0x66dc, VAES, Modrm|Vex256|Space0F38|VexVVVV|VexWIG|NoSuf, { RegYMM|Unspecified|BaseIndex, RegYMM, RegYMM }
14491449
vaesenclast, 0x66dd, VAES, Modrm|Vex256|Space0F38|VexVVVV|VexWIG|NoSuf, { RegYMM|Unspecified|BaseIndex, RegYMM, RegYMM }
14501450

1451-
// PCLMUL
1451+
// PCLMULQDQ
14521452

14531453
<pclmul:cpu:attr, $avx:AVX|:Vex128|VexW0|SSE2AVX|VexVVVV, $sse::>
14541454

1455-
pclmulqdq<pclmul>, 0x660f3a44, <pclmul:cpu>PCLMUL, Modrm|<pclmul:attr>|NoSuf, { Imm8|Imm8S, RegXMM|Unspecified|BaseIndex, RegXMM }
1456-
pclmullqlqdq<pclmul>, 0x660f3a44/0x00, <pclmul:cpu>PCLMUL, Modrm|<pclmul:attr>|NoSuf|ImmExt, { RegXMM|Unspecified|BaseIndex, RegXMM }
1457-
pclmulhqlqdq<pclmul>, 0x660f3a44/0x01, <pclmul:cpu>PCLMUL, Modrm|<pclmul:attr>|NoSuf|ImmExt, { RegXMM|Unspecified|BaseIndex, RegXMM }
1458-
pclmullqhqdq<pclmul>, 0x660f3a44/0x10, <pclmul:cpu>PCLMUL, Modrm|<pclmul:attr>|NoSuf|ImmExt, { RegXMM|Unspecified|BaseIndex, RegXMM }
1459-
pclmulhqhqdq<pclmul>, 0x660f3a44/0x11, <pclmul:cpu>PCLMUL, Modrm|<pclmul:attr>|NoSuf|ImmExt, { RegXMM|Unspecified|BaseIndex, RegXMM }
1455+
pclmulqdq<pclmul>, 0x660f3a44, <pclmul:cpu>PCLMULQDQ, Modrm|<pclmul:attr>|NoSuf, { Imm8|Imm8S, RegXMM|Unspecified|BaseIndex, RegXMM }
1456+
pclmullqlqdq<pclmul>, 0x660f3a44/0x00, <pclmul:cpu>PCLMULQDQ, Modrm|<pclmul:attr>|NoSuf|ImmExt, { RegXMM|Unspecified|BaseIndex, RegXMM }
1457+
pclmulhqlqdq<pclmul>, 0x660f3a44/0x01, <pclmul:cpu>PCLMULQDQ, Modrm|<pclmul:attr>|NoSuf|ImmExt, { RegXMM|Unspecified|BaseIndex, RegXMM }
1458+
pclmullqhqdq<pclmul>, 0x660f3a44/0x10, <pclmul:cpu>PCLMULQDQ, Modrm|<pclmul:attr>|NoSuf|ImmExt, { RegXMM|Unspecified|BaseIndex, RegXMM }
1459+
pclmulhqhqdq<pclmul>, 0x660f3a44/0x11, <pclmul:cpu>PCLMULQDQ, Modrm|<pclmul:attr>|NoSuf|ImmExt, { RegXMM|Unspecified|BaseIndex, RegXMM }
14601460

14611461
// GFNI
14621462

@@ -1771,13 +1771,13 @@ vaesenclast, 0x66dd, AVX|AES, Modrm|Vex|Space0F38|VexVVVV|VexWIG|NoSuf, { Unspec
17711771
vaesimc, 0x66db, AVX|AES, Modrm|Vex|Space0F38|VexWIG|NoSuf, { Unspecified|BaseIndex|RegXMM, RegXMM }
17721772
vaeskeygenassist, 0x66df, AVX|AES, Modrm|Vex|Space0F3A|VexWIG|NoSuf, { Imm8, Unspecified|BaseIndex|RegXMM, RegXMM }
17731773

1774-
// PCLMUL + AVX
1774+
// PCLMULQDQ + AVX
17751775

1776-
vpclmulqdq, 0x6644, AVX|PCLMUL, Modrm|Vex|Space0F3A|VexVVVV|VexWIG|NoSuf, { Imm8|Imm8S, Unspecified|BaseIndex|RegXMM, RegXMM, RegXMM }
1777-
vpclmullqlqdq, 0x6644/0x00, AVX|PCLMUL, Modrm|Vex|Space0F3A|VexVVVV|VexWIG|NoSuf|ImmExt, { Unspecified|BaseIndex|RegXMM, RegXMM, RegXMM }
1778-
vpclmulhqlqdq, 0x6644/0x01, AVX|PCLMUL, Modrm|Vex|Space0F3A|VexVVVV|VexWIG|NoSuf|ImmExt, { Unspecified|BaseIndex|RegXMM, RegXMM, RegXMM }
1779-
vpclmullqhqdq, 0x6644/0x10, AVX|PCLMUL, Modrm|Vex|Space0F3A|VexVVVV|VexWIG|NoSuf|ImmExt, { Unspecified|BaseIndex|RegXMM, RegXMM, RegXMM }
1780-
vpclmulhqhqdq, 0x6644/0x11, AVX|PCLMUL, Modrm|Vex|Space0F3A|VexVVVV|VexWIG|NoSuf|ImmExt, { Unspecified|BaseIndex|RegXMM, RegXMM, RegXMM }
1776+
vpclmulqdq, 0x6644, AVX|PCLMULQDQ, Modrm|Vex|Space0F3A|VexVVVV|VexWIG|NoSuf, { Imm8|Imm8S, Unspecified|BaseIndex|RegXMM, RegXMM, RegXMM }
1777+
vpclmullqlqdq, 0x6644/0x00, AVX|PCLMULQDQ, Modrm|Vex|Space0F3A|VexVVVV|VexWIG|NoSuf|ImmExt, { Unspecified|BaseIndex|RegXMM, RegXMM, RegXMM }
1778+
vpclmulhqlqdq, 0x6644/0x01, AVX|PCLMULQDQ, Modrm|Vex|Space0F3A|VexVVVV|VexWIG|NoSuf|ImmExt, { Unspecified|BaseIndex|RegXMM, RegXMM, RegXMM }
1779+
vpclmullqhqdq, 0x6644/0x10, AVX|PCLMULQDQ, Modrm|Vex|Space0F3A|VexVVVV|VexWIG|NoSuf|ImmExt, { Unspecified|BaseIndex|RegXMM, RegXMM, RegXMM }
1780+
vpclmulhqhqdq, 0x6644/0x11, AVX|PCLMULQDQ, Modrm|Vex|Space0F3A|VexVVVV|VexWIG|NoSuf|ImmExt, { Unspecified|BaseIndex|RegXMM, RegXMM, RegXMM }
17811781

17821782
// GFNI + AVX
17831783

0 commit comments

Comments
 (0)