Skip to content

Commit df8cfef

Browse files
authored
[X86] Standardize (V)AESKEYGENASSIST instruction naming (#158046)
Remove unnecessary 128 postfix Add missing immediate to the signature (e.g. AESKEYGENASSISTrr -> AESKEYGENASSISTrri). Makes it easier for downstream scripts to determine the instruction name from the assembly without overrides
1 parent 5e6564b commit df8cfef

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

llvm/lib/Target/X86/X86InstrSSE.td

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6898,26 +6898,26 @@ def AESIMCrm : AES8I<0xDB, MRMSrcMem, (outs VR128:$dst),
68986898

68996899
// AES Round Key Generation Assist
69006900
let Predicates = [HasAVX, HasAES] in {
6901-
def VAESKEYGENASSIST128rr : AESAI<0xDF, MRMSrcReg, (outs VR128:$dst),
6901+
def VAESKEYGENASSISTrri : AESAI<0xDF, MRMSrcReg, (outs VR128:$dst),
69026902
(ins VR128:$src1, u8imm:$src2),
69036903
"vaeskeygenassist\t{$src2, $src1, $dst|$dst, $src1, $src2}",
69046904
[(set VR128:$dst,
69056905
(int_x86_aesni_aeskeygenassist VR128:$src1, timm:$src2))]>,
69066906
Sched<[WriteAESKeyGen]>, VEX, WIG;
6907-
def VAESKEYGENASSIST128rm : AESAI<0xDF, MRMSrcMem, (outs VR128:$dst),
6907+
def VAESKEYGENASSISTrmi : AESAI<0xDF, MRMSrcMem, (outs VR128:$dst),
69086908
(ins i128mem:$src1, u8imm:$src2),
69096909
"vaeskeygenassist\t{$src2, $src1, $dst|$dst, $src1, $src2}",
69106910
[(set VR128:$dst,
69116911
(int_x86_aesni_aeskeygenassist (load addr:$src1), timm:$src2))]>,
69126912
Sched<[WriteAESKeyGen.Folded]>, VEX, WIG;
69136913
}
6914-
def AESKEYGENASSIST128rr : AESAI<0xDF, MRMSrcReg, (outs VR128:$dst),
6914+
def AESKEYGENASSISTrri : AESAI<0xDF, MRMSrcReg, (outs VR128:$dst),
69156915
(ins VR128:$src1, u8imm:$src2),
69166916
"aeskeygenassist\t{$src2, $src1, $dst|$dst, $src1, $src2}",
69176917
[(set VR128:$dst,
69186918
(int_x86_aesni_aeskeygenassist VR128:$src1, timm:$src2))]>,
69196919
Sched<[WriteAESKeyGen]>;
6920-
def AESKEYGENASSIST128rm : AESAI<0xDF, MRMSrcMem, (outs VR128:$dst),
6920+
def AESKEYGENASSISTrmi : AESAI<0xDF, MRMSrcMem, (outs VR128:$dst),
69216921
(ins i128mem:$src1, u8imm:$src2),
69226922
"aeskeygenassist\t{$src2, $src1, $dst|$dst, $src1, $src2}",
69236923
[(set VR128:$dst,

llvm/test/TableGen/x86-fold-tables.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ static const X86FoldTableEntry Table1[] = {
621621
{X86::ADD8rr_ND, X86::ADD8mr_ND, 0},
622622
{X86::ADD8rr_NF_ND, X86::ADD8mr_NF_ND, 0},
623623
{X86::AESIMCrr, X86::AESIMCrm, TB_ALIGN_16},
624-
{X86::AESKEYGENASSIST128rr, X86::AESKEYGENASSIST128rm, TB_ALIGN_16},
624+
{X86::AESKEYGENASSISTrri, X86::AESKEYGENASSISTrmi, TB_ALIGN_16},
625625
{X86::AND16ri8_ND, X86::AND16mi8_ND, 0},
626626
{X86::AND16ri8_NF_ND, X86::AND16mi8_NF_ND, 0},
627627
{X86::AND16ri_ND, X86::AND16mi_ND, 0},
@@ -1146,7 +1146,7 @@ static const X86FoldTableEntry Table1[] = {
11461146
{X86::UCOMISSrr, X86::UCOMISSrm, 0},
11471147
{X86::UCOMISSrr_Int, X86::UCOMISSrm_Int, TB_NO_REVERSE},
11481148
{X86::VAESIMCrr, X86::VAESIMCrm, 0},
1149-
{X86::VAESKEYGENASSIST128rr, X86::VAESKEYGENASSIST128rm, 0},
1149+
{X86::VAESKEYGENASSISTrri, X86::VAESKEYGENASSISTrmi, 0},
11501150
{X86::VBROADCASTF32X2Z256rr, X86::VBROADCASTF32X2Z256rm, TB_NO_REVERSE},
11511151
{X86::VBROADCASTF32X2Zrr, X86::VBROADCASTF32X2Zrm, TB_NO_REVERSE},
11521152
{X86::VBROADCASTI32X2Z128rr, X86::VBROADCASTI32X2Z128rm, TB_NO_REVERSE},

llvm/test/TableGen/x86-instr-mapping.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2713,8 +2713,8 @@ static const X86TableEntry X86SSE2AVXTable[] = {
27132713
{ X86::AESENCrr, X86::VAESENCrr },
27142714
{ X86::AESIMCrm, X86::VAESIMCrm },
27152715
{ X86::AESIMCrr, X86::VAESIMCrr },
2716-
{ X86::AESKEYGENASSIST128rm, X86::VAESKEYGENASSIST128rm },
2717-
{ X86::AESKEYGENASSIST128rr, X86::VAESKEYGENASSIST128rr },
2716+
{ X86::AESKEYGENASSISTrmi, X86::VAESKEYGENASSISTrmi },
2717+
{ X86::AESKEYGENASSISTrri, X86::VAESKEYGENASSISTrri },
27182718
{ X86::ANDNPDrm, X86::VANDNPDrm },
27192719
{ X86::ANDNPDrr, X86::VANDNPDrr },
27202720
{ X86::ANDNPSrm, X86::VANDNPSrm },

0 commit comments

Comments
 (0)