@@ -2484,26 +2484,27 @@ multiclass MUBUF_Real_AllAddr_gfx11_gfx12_Impl2<bits<8> op, string real_name> :
2484
2484
MUBUF_Real_AllAddr_gfx11_Impl2<op, real_name>,
2485
2485
MUBUF_Real_AllAddr_gfx12_Impl2<op, real_name>;
2486
2486
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 > {
2489
2489
defm NAME : MUBUF_Real_AllAddr_gfx11_Impl2<op, real_name>;
2490
2490
if hasTFE then
2491
2491
defm _TFE : MUBUF_Real_AllAddr_gfx11_Impl2<op, real_name>;
2492
2492
}
2493
2493
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 > {
2496
2496
defm NAME : MUBUF_Real_AllAddr_gfx11_gfx12_Impl2<op, real_name>;
2497
2497
if hasTFE then
2498
2498
defm _TFE : MUBUF_Real_AllAddr_gfx11_gfx12_Impl2<op, real_name>;
2499
2499
}
2500
2500
2501
2501
// Non-renamed, non-atomic gfx11/gfx12 mubuf instructions.
2502
2502
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>;
2504
2504
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> {
2507
2508
defvar ps = get_BUF_ps<NAME>;
2508
2509
if !ne(ps.Mnemonic, real_name) then
2509
2510
def : Mnem_gfx11_gfx12<ps.Mnemonic, real_name>;
@@ -2519,7 +2520,7 @@ multiclass MUBUF_Real_Atomic_gfx11_impl<bits<8> op, bit is_return,
2519
2520
}
2520
2521
2521
2522
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 > {
2523
2524
defvar Rtn = !if(is_return, "_RTN", "");
2524
2525
defm _VBUFFER_BOTHEN#Rtn : VBUFFER_MUBUF_Real_gfx12<op, real_name>;
2525
2526
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,
2533
2534
MUBUF_Real_Atomic_gfx12_impl<op, is_return, real_name>;
2534
2535
2535
2536
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>;
2538
2539
2539
2540
multiclass MUBUF_Real_Atomic_gfx11<bits<8> op, string real_name> :
2540
2541
MUBUF_Real_Atomic_gfx11_impl<op, 0, real_name>,
2541
2542
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>;
2543
2545
}
2544
2546
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> :
2546
2550
MUBUF_Real_Atomic_gfx11_impl<op, 0, gfx11_name>,
2547
2551
MUBUF_Real_Atomic_gfx11_impl<op, 1, gfx11_name>,
2548
2552
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> {
2887
2891
defm _VBUFFER_OFFSET : VBUFFER_MTBUF_Real_gfx12<op, real_name>;
2888
2892
}
2889
2893
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>
2891
2896
: MTBUF_Real_AllAddr_gfx11_gfx12_Impl<op, real_name> {
2892
2897
defvar ps = get_BUF_ps<NAME>;
2893
2898
if !ne(ps.Mnemonic, real_name) then
0 commit comments