Skip to content

[X86] Standardize (V)AESKEYGENASSIST instruction naming #158046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 11, 2025
Merged

[X86] Standardize (V)AESKEYGENASSIST instruction naming #158046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions llvm/lib/Target/X86/X86InstrSSE.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6898,26 +6898,26 @@ def AESIMCrm : AES8I<0xDB, MRMSrcMem, (outs VR128:$dst),

// AES Round Key Generation Assist
let Predicates = [HasAVX, HasAES] in {
def VAESKEYGENASSIST128rr : AESAI<0xDF, MRMSrcReg, (outs VR128:$dst),
def VAESKEYGENASSISTrri : AESAI<0xDF, MRMSrcReg, (outs VR128:$dst),
(ins VR128:$src1, u8imm:$src2),
"vaeskeygenassist\t{$src2, $src1, $dst|$dst, $src1, $src2}",
[(set VR128:$dst,
(int_x86_aesni_aeskeygenassist VR128:$src1, timm:$src2))]>,
Sched<[WriteAESKeyGen]>, VEX, WIG;
def VAESKEYGENASSIST128rm : AESAI<0xDF, MRMSrcMem, (outs VR128:$dst),
def VAESKEYGENASSISTrmi : AESAI<0xDF, MRMSrcMem, (outs VR128:$dst),
(ins i128mem:$src1, u8imm:$src2),
"vaeskeygenassist\t{$src2, $src1, $dst|$dst, $src1, $src2}",
[(set VR128:$dst,
(int_x86_aesni_aeskeygenassist (load addr:$src1), timm:$src2))]>,
Sched<[WriteAESKeyGen.Folded]>, VEX, WIG;
}
def AESKEYGENASSIST128rr : AESAI<0xDF, MRMSrcReg, (outs VR128:$dst),
def AESKEYGENASSISTrri : AESAI<0xDF, MRMSrcReg, (outs VR128:$dst),
(ins VR128:$src1, u8imm:$src2),
"aeskeygenassist\t{$src2, $src1, $dst|$dst, $src1, $src2}",
[(set VR128:$dst,
(int_x86_aesni_aeskeygenassist VR128:$src1, timm:$src2))]>,
Sched<[WriteAESKeyGen]>;
def AESKEYGENASSIST128rm : AESAI<0xDF, MRMSrcMem, (outs VR128:$dst),
def AESKEYGENASSISTrmi : AESAI<0xDF, MRMSrcMem, (outs VR128:$dst),
(ins i128mem:$src1, u8imm:$src2),
"aeskeygenassist\t{$src2, $src1, $dst|$dst, $src1, $src2}",
[(set VR128:$dst,
Expand Down
4 changes: 2 additions & 2 deletions llvm/test/TableGen/x86-fold-tables.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ static const X86FoldTableEntry Table1[] = {
{X86::ADD8rr_ND, X86::ADD8mr_ND, 0},
{X86::ADD8rr_NF_ND, X86::ADD8mr_NF_ND, 0},
{X86::AESIMCrr, X86::AESIMCrm, TB_ALIGN_16},
{X86::AESKEYGENASSIST128rr, X86::AESKEYGENASSIST128rm, TB_ALIGN_16},
{X86::AESKEYGENASSISTrri, X86::AESKEYGENASSISTrmi, TB_ALIGN_16},
{X86::AND16ri8_ND, X86::AND16mi8_ND, 0},
{X86::AND16ri8_NF_ND, X86::AND16mi8_NF_ND, 0},
{X86::AND16ri_ND, X86::AND16mi_ND, 0},
Expand Down Expand Up @@ -1146,7 +1146,7 @@ static const X86FoldTableEntry Table1[] = {
{X86::UCOMISSrr, X86::UCOMISSrm, 0},
{X86::UCOMISSrr_Int, X86::UCOMISSrm_Int, TB_NO_REVERSE},
{X86::VAESIMCrr, X86::VAESIMCrm, 0},
{X86::VAESKEYGENASSIST128rr, X86::VAESKEYGENASSIST128rm, 0},
{X86::VAESKEYGENASSISTrri, X86::VAESKEYGENASSISTrmi, 0},
{X86::VBROADCASTF32X2Z256rr, X86::VBROADCASTF32X2Z256rm, TB_NO_REVERSE},
{X86::VBROADCASTF32X2Zrr, X86::VBROADCASTF32X2Zrm, TB_NO_REVERSE},
{X86::VBROADCASTI32X2Z128rr, X86::VBROADCASTI32X2Z128rm, TB_NO_REVERSE},
Expand Down
4 changes: 2 additions & 2 deletions llvm/test/TableGen/x86-instr-mapping.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2713,8 +2713,8 @@ static const X86TableEntry X86SSE2AVXTable[] = {
{ X86::AESENCrr, X86::VAESENCrr },
{ X86::AESIMCrm, X86::VAESIMCrm },
{ X86::AESIMCrr, X86::VAESIMCrr },
{ X86::AESKEYGENASSIST128rm, X86::VAESKEYGENASSIST128rm },
{ X86::AESKEYGENASSIST128rr, X86::VAESKEYGENASSIST128rr },
{ X86::AESKEYGENASSISTrmi, X86::VAESKEYGENASSISTrmi },
{ X86::AESKEYGENASSISTrri, X86::VAESKEYGENASSISTrri },
{ X86::ANDNPDrm, X86::VANDNPDrm },
{ X86::ANDNPDrr, X86::VANDNPDrr },
{ X86::ANDNPSrm, X86::VANDNPSrm },
Expand Down