Skip to content

Commit cb84f13

Browse files
authored
[AMDGPU] Remove unneeded addr mode predicates on FLAT Real instructions (llvm#85641)
These predicates should be copied from the corresponding Pseudo instruction. Previously that did not work because of a problem with setting the right predicates on the Pseudos, but llvm#85442 fixed that.
1 parent fd93a5e commit cb84f13

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

llvm/lib/Target/AMDGPU/FLATInstructions.td

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2135,9 +2135,7 @@ multiclass FLAT_Real_SADDR_RTN_gfx10<bits<7> op> {
21352135

21362136
multiclass FLAT_Real_ST_gfx10<bits<7> op> {
21372137
def _ST_gfx10 :
2138-
FLAT_Real_gfx10<op, !cast<FLAT_Pseudo>(NAME#"_ST")> {
2139-
let OtherPredicates = [HasFlatScratchSTMode];
2140-
}
2138+
FLAT_Real_gfx10<op, !cast<FLAT_Pseudo>(NAME#"_ST")>;
21412139
}
21422140

21432141
multiclass FLAT_Real_AllAddr_gfx10<bits<7> op> :
@@ -2372,15 +2370,11 @@ multiclass FLAT_Real_SADDR_RTN_gfx11<bits<7> op, string ps, string opName> {
23722370
}
23732371

23742372
multiclass FLAT_Real_ST_gfx11<bits<7> op, string ps, string opName> {
2375-
def _ST_gfx11 : FLAT_Real_gfx11<op, !cast<FLAT_Pseudo>(ps#"_ST"), opName> {
2376-
let OtherPredicates = [HasFlatScratchSTMode];
2377-
}
2373+
def _ST_gfx11 : FLAT_Real_gfx11<op, !cast<FLAT_Pseudo>(ps#"_ST"), opName>;
23782374
}
23792375

23802376
multiclass FLAT_Real_SVS_gfx11<bits<7> op, string ps, string opName> {
2381-
def _SVS_gfx11 : FLAT_Real_gfx11<op, !cast<FLAT_Pseudo>(ps#"_SVS"), opName> {
2382-
let OtherPredicates = [HasFlatScratchSVSMode];
2383-
}
2377+
def _SVS_gfx11 : FLAT_Real_gfx11<op, !cast<FLAT_Pseudo>(ps#"_SVS"), opName>;
23842378
}
23852379

23862380
multiclass FLAT_Real_AllAddr_gfx11<bits<7> op, string ps, string opName, int renamed = false> :
@@ -2582,15 +2576,11 @@ multiclass VFLAT_Real_SADDR_RTN_gfx12<bits<8> op, string ps, string opName> {
25822576
}
25832577

25842578
multiclass VFLAT_Real_ST_gfx12<bits<8> op, string ps, string opName> {
2585-
def _ST_gfx12 : VFLAT_Real_gfx12<op, !cast<FLAT_Pseudo>(ps#"_ST"), opName> {
2586-
let OtherPredicates = [HasFlatScratchSTMode];
2587-
}
2579+
def _ST_gfx12 : VFLAT_Real_gfx12<op, !cast<FLAT_Pseudo>(ps#"_ST"), opName>;
25882580
}
25892581

25902582
multiclass VFLAT_Real_SVS_gfx12<bits<8> op, string ps, string opName> {
2591-
def _SVS_gfx12 : VFLAT_Real_gfx12<op, !cast<FLAT_Pseudo>(ps#"_SVS"), opName> {
2592-
let OtherPredicates = [HasFlatScratchSVSMode];
2593-
}
2583+
def _SVS_gfx12 : VFLAT_Real_gfx12<op, !cast<FLAT_Pseudo>(ps#"_SVS"), opName>;
25942584
}
25952585

25962586
multiclass VFLAT_Real_Atomics_gfx12<bits<8> op, string ps = NAME, string opName = !tolower(NAME),

0 commit comments

Comments
 (0)