Skip to content

Commit 935b9f6

Browse files
committed
[AMDGPU] Make use of multiclass inheritance. NFC.
1 parent c4a00be commit 935b9f6

File tree

4 files changed

+12
-19
lines changed

4 files changed

+12
-19
lines changed

llvm/include/llvm/IR/IntrinsicsAMDGPU.td

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,18 +1026,14 @@ defset list<AMDGPUImageDimIntrinsic> AMDGPUImageDimAtomicIntrinsics = {
10261026
}
10271027
}
10281028

1029-
multiclass AMDGPUImageDimAtomic<string opmod, LLVMType rettype = llvm_anyint_ty> {
1030-
defm ""
1031-
: AMDGPUImageDimAtomicX<opmod, [AMDGPUArg<LLVMMatchType<0>, "vdata">], rettype>;
1032-
}
1029+
multiclass AMDGPUImageDimAtomic<string opmod, LLVMType rettype = llvm_anyint_ty> :
1030+
AMDGPUImageDimAtomicX<opmod, [AMDGPUArg<LLVMMatchType<0>, "vdata">], rettype>;
10331031

1034-
multiclass AMDGPUImageDimFloatAtomic<string opmod> {
1035-
defm "" : AMDGPUImageDimAtomic<opmod, llvm_anyfloat_ty>;
1036-
}
1032+
multiclass AMDGPUImageDimFloatAtomic<string opmod> :
1033+
AMDGPUImageDimAtomic<opmod, llvm_anyfloat_ty>;
10371034

1038-
multiclass AMDGPUImageDimAnyAtomic<string opmod> {
1039-
defm "" : AMDGPUImageDimAtomic<opmod, llvm_any_ty>;
1040-
}
1035+
multiclass AMDGPUImageDimAnyAtomic<string opmod> :
1036+
AMDGPUImageDimAtomic<opmod, llvm_any_ty>;
10411037

10421038
defm int_amdgcn_image_atomic_swap : AMDGPUImageDimAnyAtomic<"ATOMIC_SWAP">;
10431039
defm int_amdgcn_image_atomic_add : AMDGPUImageDimAtomic<"ATOMIC_ADD">;

llvm/lib/Target/AMDGPU/BUFInstructions.td

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1583,9 +1583,8 @@ multiclass BufferAtomicPat<string OpPrefix, ValueType vt, string Inst, bit isInt
15831583
defm : BufferAtomicPat_Common<OpPrefix, vt, Inst # "_VBUFFER", isIntr>;
15841584
}
15851585

1586-
multiclass BufferAtomicIntrPat<string OpPrefix, ValueType vt, string Inst> {
1587-
defm : BufferAtomicPat<OpPrefix, vt, Inst, /* isIntr */ 1>;
1588-
}
1586+
multiclass BufferAtomicIntrPat<string OpPrefix, ValueType vt, string Inst> :
1587+
BufferAtomicPat<OpPrefix, vt, Inst, /* isIntr */ 1>;
15891588

15901589
multiclass BufferAtomicCmpSwapPat_Common<ValueType vt, ValueType data_vt, string Inst> {
15911590
foreach RtnMode = ["ret", "noret"] in {

llvm/lib/Target/AMDGPU/VOP1Instructions.td

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -882,9 +882,8 @@ multiclass VOP1_Real_dpp8_with_name<GFXGen Gen, bits<9> op, string opName,
882882
}
883883
}
884884

885-
multiclass VOP1_Realtriple_e64<GFXGen Gen, bits<9> op> {
886-
defm NAME : VOP3_Realtriple<Gen, {0, 1, 1, op{6-0}}, /*isSingle=*/ 0, NAME>;
887-
}
885+
multiclass VOP1_Realtriple_e64<GFXGen Gen, bits<9> op> :
886+
VOP3_Realtriple<Gen, {0, 1, 1, op{6-0}}, /*isSingle=*/ 0, NAME>;
888887

889888
multiclass VOP1_Realtriple_e64_with_name<GFXGen Gen, bits<9> op, string opName,
890889
string asmName> {

llvm/lib/Target/AMDGPU/VOP2Instructions.td

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1513,9 +1513,8 @@ multiclass VOP2be_Real_dpp8<GFXGen Gen, bits<6> op, string opName, string asmNam
15131513
}
15141514

15151515
// We don't want to override separate decoderNamespaces within these
1516-
multiclass VOP2_Realtriple_e64<GFXGen Gen, bits<6> op> {
1517-
defm NAME : VOP3_Realtriple<Gen, {0, 1, 0, 0, op{5-0}}, /*isSingle=*/ 0, NAME> ;
1518-
}
1516+
multiclass VOP2_Realtriple_e64<GFXGen Gen, bits<6> op> :
1517+
VOP3_Realtriple<Gen, {0, 1, 0, 0, op{5-0}}, /*isSingle=*/ 0, NAME>;
15191518

15201519
multiclass VOP2_Realtriple_e64_with_name<GFXGen Gen, bits<6> op, string opName,
15211520
string asmName> {

0 commit comments

Comments
 (0)