Skip to content

Commit 8e94f0a

Browse files
authored
[AMDGPU] Do not override PseudoInstr in FLAT Pseudo definitions. NFC. (#94369)
Simplify by setting PseudoInstr to the tablegen name of the Pseudo in the first place.
1 parent 68eb3b2 commit 8e94f0a

File tree

1 file changed

+4
-17
lines changed

1 file changed

+4
-17
lines changed

llvm/lib/Target/AMDGPU/FLATInstructions.td

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def ScratchSVAddr : ComplexPattern<iPTR, 3, "SelectScratchSVAddr", [], [SDNPWant
2121
class FLAT_Pseudo<string opName, dag outs, dag ins,
2222
string asmOps, list<dag> pattern=[]> :
2323
InstSI<outs, ins, "", pattern>,
24-
SIMCInstr<opName, SIEncodingFamily.NONE> {
24+
SIMCInstr<NAME, SIEncodingFamily.NONE> {
2525

2626
let isPseudo = 1;
2727
let isCodeGenOnly = 1;
@@ -218,7 +218,6 @@ class FLAT_Load_Pseudo <string opName, RegisterClass regClass,
218218
let mayLoad = 1;
219219
let has_saddr = HasSaddr;
220220
let enabled_saddr = EnableSaddr;
221-
let PseudoInstr = opName#!if(!and(HasSaddr, EnableSaddr), "_SADDR", "");
222221

223222
let Constraints = !if(HasTiedOutput, "$vdst = $vdst_in", "");
224223
let DisableEncoding = !if(HasTiedOutput, "$vdst_in", "");
@@ -239,7 +238,6 @@ class FLAT_Store_Pseudo <string opName, RegisterClass vdataClass,
239238
let has_vdst = 0;
240239
let has_saddr = HasSaddr;
241240
let enabled_saddr = EnableSaddr;
242-
let PseudoInstr = opName#!if(!and(HasSaddr, EnableSaddr), "_SADDR", "");
243241
}
244242

245243
multiclass FLAT_Global_Load_Pseudo<string opName, RegisterClass regClass, bit HasTiedInput = 0> {
@@ -265,7 +263,6 @@ class FLAT_Global_Load_AddTid_Pseudo <string opName, RegisterClass regClass,
265263
let has_vaddr = 0;
266264
let has_saddr = 1;
267265
let enabled_saddr = EnableSaddr;
268-
let PseudoInstr = opName#!if(EnableSaddr, "_SADDR", "");
269266

270267
let Constraints = !if(HasTiedOutput, "$vdst = $vdst_in", "");
271268
let DisableEncoding = !if(HasTiedOutput, "$vdst_in", "");
@@ -305,7 +302,6 @@ class FLAT_Global_Load_LDS_Pseudo <string opName, bit EnableSaddr = 0> : FLAT_Ps
305302
let has_saddr = 1;
306303
let enabled_saddr = EnableSaddr;
307304
let VALU = 1;
308-
let PseudoInstr = opName#!if(EnableSaddr, "_SADDR", "");
309305
let Uses = [M0, EXEC];
310306
let SchedRW = [WriteVMEM, WriteLDS];
311307
}
@@ -331,7 +327,6 @@ class FLAT_Global_Store_AddTid_Pseudo <string opName, RegisterClass vdataClass,
331327
let has_vaddr = 0;
332328
let has_saddr = 1;
333329
let enabled_saddr = EnableSaddr;
334-
let PseudoInstr = opName#!if(EnableSaddr, "_SADDR", "");
335330
}
336331

337332
multiclass FLAT_Global_Store_AddTid_Pseudo<string opName, RegisterClass regClass> {
@@ -401,7 +396,6 @@ class FLAT_Scratch_Load_Pseudo <string opName, RegisterClass regClass,
401396
let has_vaddr = EnableVaddr;
402397
let has_sve = EnableSVE;
403398
let sve = EnableVaddr;
404-
let PseudoInstr = opName#!if(EnableSVE, "_SVS", !if(EnableSaddr, "_SADDR", !if(EnableVaddr, "", "_ST")));
405399

406400
let Constraints = !if(HasTiedOutput, "$vdst = $vdst_in", "");
407401
let DisableEncoding = !if(HasTiedOutput, "$vdst_in", "");
@@ -430,7 +424,6 @@ class FLAT_Scratch_Store_Pseudo <string opName, RegisterClass vdataClass, bit En
430424
let has_vaddr = EnableVaddr;
431425
let has_sve = EnableSVE;
432426
let sve = EnableVaddr;
433-
let PseudoInstr = opName#!if(EnableSVE, "_SVS", !if(EnableSaddr, "_SADDR", !if(EnableVaddr, "", "_ST")));
434427
}
435428

436429
multiclass FLAT_Scratch_Load_Pseudo<string opName, RegisterClass regClass, bit HasTiedOutput = 0> {
@@ -490,7 +483,6 @@ class FLAT_Scratch_Load_LDS_Pseudo <string opName, bit EnableSaddr = 0,
490483
let has_sve = EnableSVE;
491484
let sve = EnableVaddr;
492485
let VALU = 1;
493-
let PseudoInstr = opName#!if(EnableSVE, "_SVS", !if(EnableSaddr, "_SADDR", !if(EnableVaddr, "", "_ST")));
494486
let Uses = [M0, EXEC];
495487
let SchedRW = [WriteVMEM, WriteLDS];
496488
}
@@ -528,7 +520,6 @@ class FLAT_AtomicRet_Pseudo<string opName, dag outs, dag ins,
528520
let sccbValue = 0;
529521
let IsAtomicNoRet = 0;
530522
let IsAtomicRet = 1;
531-
let PseudoInstr = NAME # "_RTN";
532523
}
533524

534525
multiclass FLAT_Atomic_Pseudo_NO_RTN<
@@ -543,7 +534,6 @@ multiclass FLAT_Atomic_Pseudo_NO_RTN<
543534
(ins VReg_64:$vaddr, data_op:$vdata, flat_offset:$offset, CPol_0:$cpol),
544535
" $vaddr, $vdata$offset$cpol">,
545536
GlobalSaddrTable<0, opName> {
546-
let PseudoInstr = NAME;
547537
let FPAtomic = data_vt.isFP;
548538
let AddedComplexity = -1; // Prefer global atomics if available
549539
}
@@ -592,7 +582,6 @@ multiclass FLAT_Global_Atomic_Pseudo_NO_RTN<
592582
" $vaddr, $vdata, off$offset$cpol">,
593583
GlobalSaddrTable<0, opName> {
594584
let has_saddr = 1;
595-
let PseudoInstr = NAME;
596585
let FPAtomic = data_vt.isFP;
597586
}
598587

@@ -603,7 +592,6 @@ multiclass FLAT_Global_Atomic_Pseudo_NO_RTN<
603592
GlobalSaddrTable<1, opName> {
604593
let has_saddr = 1;
605594
let enabled_saddr = 1;
606-
let PseudoInstr = NAME#"_SADDR";
607595
let FPAtomic = data_vt.isFP;
608596
}
609597
}
@@ -635,7 +623,6 @@ multiclass FLAT_Global_Atomic_Pseudo_RTN<
635623
GlobalSaddrTable<1, opName#"_rtn"> {
636624
let has_saddr = 1;
637625
let enabled_saddr = 1;
638-
let PseudoInstr = NAME#"_SADDR_RTN";
639626
let FPAtomic = data_vt.isFP;
640627
}
641628
}
@@ -1870,7 +1857,7 @@ multiclass FLAT_Real_AllAddr_SVE_vi<bits<7> op> {
18701857
}
18711858

18721859
multiclass FLAT_Real_AllAddr_LDS<bits<7> op, bits<7> pre_gfx940_op,
1873-
string pre_gfx940_name = !subst("_lds", "", !cast<FLAT_Pseudo>(NAME).PseudoInstr),
1860+
string pre_gfx940_name = !subst("_lds", "", !cast<FLAT_Pseudo>(NAME).Mnemonic),
18741861
bit has_sccb = !cast<FLAT_Pseudo>(NAME).has_sccb> {
18751862

18761863
let OtherPredicates = [isGFX8GFX9NotGFX940] in {
@@ -2165,7 +2152,7 @@ multiclass FLAT_Real_ScratchAllAddr_gfx10<bits<7> op> :
21652152
FLAT_Real_ST_gfx10<op>;
21662153

21672154
multiclass FLAT_Real_AllAddr_LDS_gfx10<bits<7> op,
2168-
string opname = !subst("_lds", "", !cast<FLAT_Pseudo>(NAME).PseudoInstr)> {
2155+
string opname = !subst("_lds", "", !cast<FLAT_Pseudo>(NAME).Mnemonic)> {
21692156
let AsmString = opname # !cast<FLAT_Pseudo>(NAME).AsmOperands # " lds" in
21702157
defm "" : FLAT_Real_Base_gfx10<op>;
21712158

@@ -2174,7 +2161,7 @@ multiclass FLAT_Real_AllAddr_LDS_gfx10<bits<7> op,
21742161
}
21752162

21762163
multiclass FLAT_Real_ScratchAllAddr_LDS_gfx10<bits<7> op,
2177-
string opname = !subst("_lds", "", !cast<FLAT_Pseudo>(NAME).PseudoInstr)> {
2164+
string opname = !subst("_lds", "", !cast<FLAT_Pseudo>(NAME).Mnemonic)> {
21782165
defm "" : FLAT_Real_AllAddr_LDS_gfx10<op>;
21792166

21802167
let AsmString = opname # !cast<FLAT_Pseudo>(NAME#"_ST").AsmOperands # " lds" in

0 commit comments

Comments
 (0)