Skip to content

Commit e460da1

Browse files
authored
[AMDGPU] Use get_BUF_ps to default real_name of BUF instructions. NFC. (#84524)
1 parent 5120775 commit e460da1

File tree

1 file changed

+18
-13
lines changed

1 file changed

+18
-13
lines changed

llvm/lib/Target/AMDGPU/BUFInstructions.td

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2484,26 +2484,27 @@ multiclass MUBUF_Real_AllAddr_gfx11_gfx12_Impl2<bits<8> op, string real_name> :
24842484
MUBUF_Real_AllAddr_gfx11_Impl2<op, real_name>,
24852485
MUBUF_Real_AllAddr_gfx12_Impl2<op, real_name>;
24862486

2487-
multiclass MUBUF_Real_AllAddr_gfx11_Impl<bits<8> op, string real_name,
2488-
bit hasTFE = 1> {
2487+
multiclass MUBUF_Real_AllAddr_gfx11_Impl<bits<8> op, bit hasTFE,
2488+
string real_name = get_BUF_ps<NAME>.Mnemonic> {
24892489
defm NAME : MUBUF_Real_AllAddr_gfx11_Impl2<op, real_name>;
24902490
if hasTFE then
24912491
defm _TFE : MUBUF_Real_AllAddr_gfx11_Impl2<op, real_name>;
24922492
}
24932493

2494-
multiclass MUBUF_Real_AllAddr_gfx11_gfx12_Impl<bits<8> op, string real_name,
2495-
bit hasTFE = 1> {
2494+
multiclass MUBUF_Real_AllAddr_gfx11_gfx12_Impl<bits<8> op, bit hasTFE,
2495+
string real_name> {
24962496
defm NAME : MUBUF_Real_AllAddr_gfx11_gfx12_Impl2<op, real_name>;
24972497
if hasTFE then
24982498
defm _TFE : MUBUF_Real_AllAddr_gfx11_gfx12_Impl2<op, real_name>;
24992499
}
25002500

25012501
// Non-renamed, non-atomic gfx11/gfx12 mubuf instructions.
25022502
multiclass MUBUF_Real_AllAddr_gfx11<bits<8> op, bit hasTFE = 1> :
2503-
MUBUF_Real_AllAddr_gfx11_Impl<op, get_BUF_ps<NAME>.Mnemonic, hasTFE>;
2503+
MUBUF_Real_AllAddr_gfx11_Impl<op, hasTFE>;
25042504

2505-
multiclass MUBUF_Real_AllAddr_gfx11_gfx12<bits<8> op, string real_name = !tolower(NAME)> :
2506-
MUBUF_Real_AllAddr_gfx11_gfx12_Impl<op, real_name> {
2505+
multiclass MUBUF_Real_AllAddr_gfx11_gfx12<bits<8> op,
2506+
string real_name = get_BUF_ps<NAME>.Mnemonic> :
2507+
MUBUF_Real_AllAddr_gfx11_gfx12_Impl<op, /*hasTFE=*/1, real_name> {
25072508
defvar ps = get_BUF_ps<NAME>;
25082509
if !ne(ps.Mnemonic, real_name) then
25092510
def : Mnem_gfx11_gfx12<ps.Mnemonic, real_name>;
@@ -2519,7 +2520,7 @@ multiclass MUBUF_Real_Atomic_gfx11_impl<bits<8> op, bit is_return,
25192520
}
25202521

25212522
multiclass MUBUF_Real_Atomic_gfx12_impl<bits<8> op, bit is_return,
2522-
string real_name> {
2523+
string real_name = get_BUF_ps<NAME>.Mnemonic> {
25232524
defvar Rtn = !if(is_return, "_RTN", "");
25242525
defm _VBUFFER_BOTHEN#Rtn : VBUFFER_MUBUF_Real_gfx12<op, real_name>;
25252526
defm _VBUFFER_IDXEN#Rtn : VBUFFER_MUBUF_Real_gfx12<op, real_name>;
@@ -2533,16 +2534,19 @@ multiclass MUBUF_Real_Atomic_gfx11_gfx12_impl<bits<8> op, bit is_return,
25332534
MUBUF_Real_Atomic_gfx12_impl<op, is_return, real_name>;
25342535

25352536
multiclass MUBUF_Real_Atomic_gfx12<bits<8> op> :
2536-
MUBUF_Real_Atomic_gfx12_impl<op, 0, get_BUF_ps<NAME>.Mnemonic>,
2537-
MUBUF_Real_Atomic_gfx12_impl<op, 1, get_BUF_ps<NAME>.Mnemonic>;
2537+
MUBUF_Real_Atomic_gfx12_impl<op, 0>,
2538+
MUBUF_Real_Atomic_gfx12_impl<op, 1>;
25382539

25392540
multiclass MUBUF_Real_Atomic_gfx11<bits<8> op, string real_name> :
25402541
MUBUF_Real_Atomic_gfx11_impl<op, 0, real_name>,
25412542
MUBUF_Real_Atomic_gfx11_impl<op, 1, real_name> {
2542-
def : Mnem_gfx11_gfx12<get_BUF_ps<NAME>.Mnemonic, real_name>;
2543+
defvar ps = get_BUF_ps<NAME>;
2544+
def : Mnem_gfx11_gfx12<ps.Mnemonic, real_name>;
25432545
}
25442546

2545-
multiclass MUBUF_Real_Atomic_gfx11_gfx12<bits<8> op, string gfx12_name = !tolower(NAME), string gfx11_name = gfx12_name> :
2547+
multiclass MUBUF_Real_Atomic_gfx11_gfx12<bits<8> op,
2548+
string gfx12_name = get_BUF_ps<NAME>.Mnemonic,
2549+
string gfx11_name = gfx12_name> :
25462550
MUBUF_Real_Atomic_gfx11_impl<op, 0, gfx11_name>,
25472551
MUBUF_Real_Atomic_gfx11_impl<op, 1, gfx11_name>,
25482552
MUBUF_Real_Atomic_gfx12_impl<op, 0, gfx12_name>,
@@ -2887,7 +2891,8 @@ multiclass MTBUF_Real_AllAddr_gfx11_gfx12_Impl<bits<4> op, string real_name> {
28872891
defm _VBUFFER_OFFSET : VBUFFER_MTBUF_Real_gfx12<op, real_name>;
28882892
}
28892893

2890-
multiclass MTBUF_Real_AllAddr_gfx11_gfx12<bits<4> op, string real_name = !tolower(NAME)>
2894+
multiclass MTBUF_Real_AllAddr_gfx11_gfx12<bits<4> op,
2895+
string real_name = get_BUF_ps<NAME>.Mnemonic>
28912896
: MTBUF_Real_AllAddr_gfx11_gfx12_Impl<op, real_name> {
28922897
defvar ps = get_BUF_ps<NAME>;
28932898
if !ne(ps.Mnemonic, real_name) then

0 commit comments

Comments
 (0)