Skip to content

Commit f24d68a

Browse files
jayfoadjayfoad
committed
[AMDGPU] Remove FLAT_Real_AllAddr_gfx11 in favor of GLOBAL_Real_AllAddr_gfx11
Plus some related cleanups. NFC.
1 parent 7ccb31a commit f24d68a

File tree

1 file changed

+28
-38
lines changed

1 file changed

+28
-38
lines changed

‎llvm/lib/Target/AMDGPU/FLATInstructions.td

Lines changed: 28 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2365,12 +2365,6 @@ multiclass FLAT_Real_Base_gfx11<bits<7> op,
23652365
FLAT_Aliases_gfx11<name>,
23662366
FLAT_Real_gfx11<op, name>;
23672367

2368-
multiclass FLAT_Real_AllAddr_gfx11<bits<7> op,
2369-
string name = get_FLAT_ps<NAME>.Mnemonic> :
2370-
FLAT_Real_Base_gfx11<op, name> {
2371-
defm _SADDR : FLAT_Real_gfx11<op, name>;
2372-
}
2373-
23742368
multiclass FLAT_Real_Atomics_gfx11<bits<7> op,
23752369
string name = get_FLAT_ps<NAME>.Mnemonic> :
23762370
FLAT_Real_Base_gfx11<op, name> {
@@ -2379,8 +2373,7 @@ multiclass FLAT_Real_Atomics_gfx11<bits<7> op,
23792373

23802374
multiclass GLOBAL_Real_AllAddr_gfx11<bits<7> op,
23812375
string name = get_FLAT_ps<NAME>.Mnemonic> :
2382-
FLAT_Aliases_gfx11<name>,
2383-
FLAT_Real_gfx11<op, name> {
2376+
FLAT_Real_Base_gfx11<op, name> {
23842377
defm _SADDR : FLAT_Real_gfx11<op, name>;
23852378
}
23862379

@@ -2393,8 +2386,7 @@ multiclass GLOBAL_Real_Atomics_gfx11<bits<7> op,
23932386

23942387
multiclass SCRATCH_Real_AllAddr_gfx11<bits<7> op,
23952388
string name = get_FLAT_ps<NAME>.Mnemonic> :
2396-
FLAT_Aliases_gfx11<name>,
2397-
FLAT_Real_gfx11<op, name> {
2389+
FLAT_Real_Base_gfx11<op, name> {
23982390
defm _SADDR : FLAT_Real_gfx11<op, name>;
23992391
defm _ST : FLAT_Real_gfx11<op, name>;
24002392
defm _SVS : FLAT_Real_gfx11<op, name>;
@@ -2455,30 +2447,30 @@ defm FLAT_ATOMIC_FMAX : FLAT_Real_Atomics_gfx11<0x052, "flat_atomic_ma
24552447
defm FLAT_ATOMIC_ADD_F32 : FLAT_Real_Atomics_gfx11<0x056>;
24562448

24572449
// ENC_FLAT_GLBL.
2458-
defm GLOBAL_LOAD_UBYTE : FLAT_Real_AllAddr_gfx11<0x010, "global_load_u8">;
2459-
defm GLOBAL_LOAD_SBYTE : FLAT_Real_AllAddr_gfx11<0x011, "global_load_i8">;
2460-
defm GLOBAL_LOAD_USHORT : FLAT_Real_AllAddr_gfx11<0x012, "global_load_u16">;
2461-
defm GLOBAL_LOAD_SSHORT : FLAT_Real_AllAddr_gfx11<0x013, "global_load_i16">;
2462-
defm GLOBAL_LOAD_DWORD : FLAT_Real_AllAddr_gfx11<0x014, "global_load_b32">;
2463-
defm GLOBAL_LOAD_DWORDX2 : FLAT_Real_AllAddr_gfx11<0x015, "global_load_b64">;
2464-
defm GLOBAL_LOAD_DWORDX3 : FLAT_Real_AllAddr_gfx11<0x016, "global_load_b96">;
2465-
defm GLOBAL_LOAD_DWORDX4 : FLAT_Real_AllAddr_gfx11<0x017, "global_load_b128">;
2466-
defm GLOBAL_STORE_BYTE : FLAT_Real_AllAddr_gfx11<0x018, "global_store_b8">;
2467-
defm GLOBAL_STORE_SHORT : FLAT_Real_AllAddr_gfx11<0x019, "global_store_b16">;
2468-
defm GLOBAL_STORE_DWORD : FLAT_Real_AllAddr_gfx11<0x01a, "global_store_b32">;
2469-
defm GLOBAL_STORE_DWORDX2 : FLAT_Real_AllAddr_gfx11<0x01b, "global_store_b64">;
2470-
defm GLOBAL_STORE_DWORDX3 : FLAT_Real_AllAddr_gfx11<0x01c, "global_store_b96">;
2471-
defm GLOBAL_STORE_DWORDX4 : FLAT_Real_AllAddr_gfx11<0x01d, "global_store_b128">;
2472-
defm GLOBAL_LOAD_UBYTE_D16 : FLAT_Real_AllAddr_gfx11<0x01e, "global_load_d16_u8">;
2473-
defm GLOBAL_LOAD_SBYTE_D16 : FLAT_Real_AllAddr_gfx11<0x01f, "global_load_d16_i8">;
2474-
defm GLOBAL_LOAD_SHORT_D16 : FLAT_Real_AllAddr_gfx11<0x020, "global_load_d16_b16">;
2475-
defm GLOBAL_LOAD_UBYTE_D16_HI : FLAT_Real_AllAddr_gfx11<0x021, "global_load_d16_hi_u8">;
2476-
defm GLOBAL_LOAD_SBYTE_D16_HI : FLAT_Real_AllAddr_gfx11<0x022, "global_load_d16_hi_i8">;
2477-
defm GLOBAL_LOAD_SHORT_D16_HI : FLAT_Real_AllAddr_gfx11<0x023, "global_load_d16_hi_b16">;
2478-
defm GLOBAL_STORE_BYTE_D16_HI : FLAT_Real_AllAddr_gfx11<0x024, "global_store_d16_hi_b8">;
2479-
defm GLOBAL_STORE_SHORT_D16_HI : FLAT_Real_AllAddr_gfx11<0x025, "global_store_d16_hi_b16">;
2480-
defm GLOBAL_LOAD_DWORD_ADDTID : FLAT_Real_AllAddr_gfx11<0x028, "global_load_addtid_b32">;
2481-
defm GLOBAL_STORE_DWORD_ADDTID : FLAT_Real_AllAddr_gfx11<0x029, "global_store_addtid_b32">;
2450+
defm GLOBAL_LOAD_UBYTE : GLOBAL_Real_AllAddr_gfx11<0x010, "global_load_u8">;
2451+
defm GLOBAL_LOAD_SBYTE : GLOBAL_Real_AllAddr_gfx11<0x011, "global_load_i8">;
2452+
defm GLOBAL_LOAD_USHORT : GLOBAL_Real_AllAddr_gfx11<0x012, "global_load_u16">;
2453+
defm GLOBAL_LOAD_SSHORT : GLOBAL_Real_AllAddr_gfx11<0x013, "global_load_i16">;
2454+
defm GLOBAL_LOAD_DWORD : GLOBAL_Real_AllAddr_gfx11<0x014, "global_load_b32">;
2455+
defm GLOBAL_LOAD_DWORDX2 : GLOBAL_Real_AllAddr_gfx11<0x015, "global_load_b64">;
2456+
defm GLOBAL_LOAD_DWORDX3 : GLOBAL_Real_AllAddr_gfx11<0x016, "global_load_b96">;
2457+
defm GLOBAL_LOAD_DWORDX4 : GLOBAL_Real_AllAddr_gfx11<0x017, "global_load_b128">;
2458+
defm GLOBAL_STORE_BYTE : GLOBAL_Real_AllAddr_gfx11<0x018, "global_store_b8">;
2459+
defm GLOBAL_STORE_SHORT : GLOBAL_Real_AllAddr_gfx11<0x019, "global_store_b16">;
2460+
defm GLOBAL_STORE_DWORD : GLOBAL_Real_AllAddr_gfx11<0x01a, "global_store_b32">;
2461+
defm GLOBAL_STORE_DWORDX2 : GLOBAL_Real_AllAddr_gfx11<0x01b, "global_store_b64">;
2462+
defm GLOBAL_STORE_DWORDX3 : GLOBAL_Real_AllAddr_gfx11<0x01c, "global_store_b96">;
2463+
defm GLOBAL_STORE_DWORDX4 : GLOBAL_Real_AllAddr_gfx11<0x01d, "global_store_b128">;
2464+
defm GLOBAL_LOAD_UBYTE_D16 : GLOBAL_Real_AllAddr_gfx11<0x01e, "global_load_d16_u8">;
2465+
defm GLOBAL_LOAD_SBYTE_D16 : GLOBAL_Real_AllAddr_gfx11<0x01f, "global_load_d16_i8">;
2466+
defm GLOBAL_LOAD_SHORT_D16 : GLOBAL_Real_AllAddr_gfx11<0x020, "global_load_d16_b16">;
2467+
defm GLOBAL_LOAD_UBYTE_D16_HI : GLOBAL_Real_AllAddr_gfx11<0x021, "global_load_d16_hi_u8">;
2468+
defm GLOBAL_LOAD_SBYTE_D16_HI : GLOBAL_Real_AllAddr_gfx11<0x022, "global_load_d16_hi_i8">;
2469+
defm GLOBAL_LOAD_SHORT_D16_HI : GLOBAL_Real_AllAddr_gfx11<0x023, "global_load_d16_hi_b16">;
2470+
defm GLOBAL_STORE_BYTE_D16_HI : GLOBAL_Real_AllAddr_gfx11<0x024, "global_store_d16_hi_b8">;
2471+
defm GLOBAL_STORE_SHORT_D16_HI : GLOBAL_Real_AllAddr_gfx11<0x025, "global_store_d16_hi_b16">;
2472+
defm GLOBAL_LOAD_DWORD_ADDTID : GLOBAL_Real_AllAddr_gfx11<0x028, "global_load_addtid_b32">;
2473+
defm GLOBAL_STORE_DWORD_ADDTID : GLOBAL_Real_AllAddr_gfx11<0x029, "global_store_addtid_b32">;
24822474
defm GLOBAL_ATOMIC_SWAP : GLOBAL_Real_Atomics_gfx11<0x033, "global_atomic_swap_b32">;
24832475
defm GLOBAL_ATOMIC_CMPSWAP : GLOBAL_Real_Atomics_gfx11<0x034, "global_atomic_cmpswap_b32">;
24842476
defm GLOBAL_ATOMIC_ADD : GLOBAL_Real_Atomics_gfx11<0x035, "global_atomic_add_u32">;
@@ -2574,8 +2566,7 @@ multiclass VFLAT_Real_Atomics_gfx12<bits<8> op,
25742566
multiclass VGLOBAL_Real_AllAddr_gfx12<bits<8> op,
25752567
string name = get_FLAT_ps<NAME>.Mnemonic,
25762568
string alias = name> :
2577-
VFLAT_Aliases_gfx12<name, alias>,
2578-
VFLAT_Real_gfx12<op, name> {
2569+
VFLAT_Real_Base_gfx12<op, name, alias> {
25792570
defm _SADDR : VFLAT_Real_gfx12<op, name>;
25802571
}
25812572

@@ -2598,8 +2589,7 @@ multiclass VGLOBAL_Real_Atomics_gfx12<bits<8> op,
25982589

25992590
multiclass VSCRATCH_Real_AllAddr_gfx12<bits<8> op,
26002591
string name = get_FLAT_ps<NAME>.Mnemonic> :
2601-
VFLAT_Aliases_gfx12<name>,
2602-
VFLAT_Real_gfx12<op, name> {
2592+
VFLAT_Real_Base_gfx12<op, name> {
26032593
defm _SADDR : VFLAT_Real_gfx12<op, name>;
26042594
defm _ST : VFLAT_Real_gfx12<op, name>;
26052595
defm _SVS : VFLAT_Real_gfx12<op, name>;

0 commit comments

Comments
 (0)