Skip to content

Commit 484ad51

Browse files
arsenmarsenm
committed
clang/AMDGPU: Emit atomicrmw from {global|flat}_atomic_fadd_v2f16 builtins
1 parent 6558e04 commit 484ad51

File tree

4 files changed

+15
-19
lines changed

4 files changed

+15
-19
lines changed

‎clang/lib/CodeGen/CGBuiltin.cpp

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18929,22 +18929,15 @@ Value *CodeGenFunction::EmitAMDGPUBuiltinExpr(unsigned BuiltinID,
1892918929
Function *F = CGM.getIntrinsic(Intrin, { Src0->getType() });
1893018930
return Builder.CreateCall(F, { Src0, Builder.getFalse() });
1893118931
}
18932-
case AMDGPU::BI__builtin_amdgcn_global_atomic_fadd_v2f16:
1893318932
case AMDGPU::BI__builtin_amdgcn_global_atomic_fmin_f64:
1893418933
case AMDGPU::BI__builtin_amdgcn_global_atomic_fmax_f64:
1893518934
case AMDGPU::BI__builtin_amdgcn_flat_atomic_fadd_f64:
1893618935
case AMDGPU::BI__builtin_amdgcn_flat_atomic_fmin_f64:
1893718936
case AMDGPU::BI__builtin_amdgcn_flat_atomic_fmax_f64:
18938-
case AMDGPU::BI__builtin_amdgcn_flat_atomic_fadd_f32:
18939-
case AMDGPU::BI__builtin_amdgcn_flat_atomic_fadd_v2f16: {
18937+
case AMDGPU::BI__builtin_amdgcn_flat_atomic_fadd_f32: {
1894018938
Intrinsic::ID IID;
1894118939
llvm::Type *ArgTy = llvm::Type::getDoubleTy(getLLVMContext());
1894218940
switch (BuiltinID) {
18943-
case AMDGPU::BI__builtin_amdgcn_global_atomic_fadd_v2f16:
18944-
ArgTy = llvm::FixedVectorType::get(
18945-
llvm::Type::getHalfTy(getLLVMContext()), 2);
18946-
IID = Intrinsic::amdgcn_global_atomic_fadd;
18947-
break;
1894818941
case AMDGPU::BI__builtin_amdgcn_global_atomic_fmin_f64:
1894918942
IID = Intrinsic::amdgcn_global_atomic_fmin;
1895018943
break;
@@ -18964,11 +18957,6 @@ Value *CodeGenFunction::EmitAMDGPUBuiltinExpr(unsigned BuiltinID,
1896418957
ArgTy = llvm::Type::getFloatTy(getLLVMContext());
1896518958
IID = Intrinsic::amdgcn_flat_atomic_fadd;
1896618959
break;
18967-
case AMDGPU::BI__builtin_amdgcn_flat_atomic_fadd_v2f16:
18968-
ArgTy = llvm::FixedVectorType::get(
18969-
llvm::Type::getHalfTy(getLLVMContext()), 2);
18970-
IID = Intrinsic::amdgcn_flat_atomic_fadd;
18971-
break;
1897218960
}
1897318961
llvm::Value *Addr = EmitScalarExpr(E->getArg(0));
1897418962
llvm::Value *Val = EmitScalarExpr(E->getArg(1));
@@ -19369,7 +19357,9 @@ Value *CodeGenFunction::EmitAMDGPUBuiltinExpr(unsigned BuiltinID,
1936919357
case AMDGPU::BI__builtin_amdgcn_ds_fminf:
1937019358
case AMDGPU::BI__builtin_amdgcn_ds_fmaxf:
1937119359
case AMDGPU::BI__builtin_amdgcn_global_atomic_fadd_f32:
19372-
case AMDGPU::BI__builtin_amdgcn_global_atomic_fadd_f64: {
19360+
case AMDGPU::BI__builtin_amdgcn_global_atomic_fadd_f64:
19361+
case AMDGPU::BI__builtin_amdgcn_global_atomic_fadd_v2f16:
19362+
case AMDGPU::BI__builtin_amdgcn_flat_atomic_fadd_v2f16: {
1937319363
llvm::AtomicRMWInst::BinOp BinOp;
1937419364
switch (BuiltinID) {
1937519365
case AMDGPU::BI__builtin_amdgcn_atomic_inc32:
@@ -19387,6 +19377,8 @@ Value *CodeGenFunction::EmitAMDGPUBuiltinExpr(unsigned BuiltinID,
1938719377
case AMDGPU::BI__builtin_amdgcn_ds_atomic_fadd_v2bf16:
1938819378
case AMDGPU::BI__builtin_amdgcn_global_atomic_fadd_f32:
1938919379
case AMDGPU::BI__builtin_amdgcn_global_atomic_fadd_f64:
19380+
case AMDGPU::BI__builtin_amdgcn_global_atomic_fadd_v2f16:
19381+
case AMDGPU::BI__builtin_amdgcn_flat_atomic_fadd_v2f16:
1939019382
BinOp = llvm::AtomicRMWInst::FAdd;
1939119383
break;
1939219384
case AMDGPU::BI__builtin_amdgcn_ds_fminf:

‎clang/test/CodeGenOpenCL/builtins-fp-atomics-gfx12.cl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ void test_local_add_2f16_noret(__local half2 *addr, half2 x) {
4848
}
4949

5050
// CHECK-LABEL: test_flat_add_2f16
51-
// CHECK: call <2 x half> @llvm.amdgcn.flat.atomic.fadd.v2f16.p0.v2f16(ptr %{{.*}}, <2 x half> %{{.*}})
51+
// CHECK: [[RMW:%.+]] = atomicrmw fadd ptr %{{.+}}, <2 x half> %{{.+}} syncscope("agent") monotonic, align 4, !amdgpu.no.fine.grained.memory !{{[0-9]+$}}
52+
5253
// GFX12-LABEL: test_flat_add_2f16
5354
// GFX12: flat_atomic_pk_add_f16
5455
half2 test_flat_add_2f16(__generic half2 *addr, half2 x) {
@@ -64,7 +65,8 @@ short2 test_flat_add_2bf16(__generic short2 *addr, short2 x) {
6465
}
6566

6667
// CHECK-LABEL: test_global_add_half2
67-
// CHECK: call <2 x half> @llvm.amdgcn.global.atomic.fadd.v2f16.p1.v2f16(ptr addrspace(1) %{{.*}}, <2 x half> %{{.*}})
68+
// CHECK: [[RMW:%.+]] = atomicrmw fadd ptr addrspace(1) %{{.+}}, <2 x half> %{{.+}} syncscope("agent") monotonic, align 4, !amdgpu.no.fine.grained.memory !{{[0-9]+$}}
69+
6870
// GFX12-LABEL: test_global_add_half2
6971
// GFX12: global_atomic_pk_add_f16 v2, v[0:1], v2, off th:TH_ATOMIC_RETURN
7072
void test_global_add_half2(__global half2 *addr, half2 x) {
@@ -73,7 +75,8 @@ void test_global_add_half2(__global half2 *addr, half2 x) {
7375
}
7476

7577
// CHECK-LABEL: test_global_add_half2_noret
76-
// CHECK: call <2 x half> @llvm.amdgcn.global.atomic.fadd.v2f16.p1.v2f16(ptr addrspace(1) %{{.*}}, <2 x half> %{{.*}})
78+
// CHECK: [[RMW:%.+]] = atomicrmw fadd ptr addrspace(1) %{{.+}}, <2 x half> %{{.+}} syncscope("agent") monotonic, align 4, !amdgpu.no.fine.grained.memory !{{[0-9]+$}}
79+
7780
// GFX12-LABEL: test_global_add_half2_noret
7881
// GFX12: global_atomic_pk_add_f16 v[0:1], v2, off
7982
void test_global_add_half2_noret(__global half2 *addr, half2 x) {

‎clang/test/CodeGenOpenCL/builtins-fp-atomics-gfx90a.cl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ void test_global_add_f64(__global double *addr, double x) {
1818
}
1919

2020
// CHECK-LABEL: test_global_add_half2
21-
// CHECK: call <2 x half> @llvm.amdgcn.global.atomic.fadd.v2f16.p1.v2f16(ptr addrspace(1) %{{.*}}, <2 x half> %{{.*}})
21+
// CHECK: = atomicrmw fadd ptr addrspace(1) %{{.+}}, <2 x half> %{{.+}} syncscope("agent") monotonic, align 4, !amdgpu.no.fine.grained.memory !{{[0-9]+$}}
2222
// GFX90A-LABEL: test_global_add_half2
2323
// GFX90A: global_atomic_pk_add_f16 v2, v[0:1], v2, off glc
2424
void test_global_add_half2(__global half2 *addr, half2 x) {

‎clang/test/CodeGenOpenCL/builtins-fp-atomics-gfx940.cl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ half2 test_flat_add_f32(__generic float *addr, float x) {
1818
}
1919

2020
// CHECK-LABEL: test_flat_add_2f16
21-
// CHECK: call <2 x half> @llvm.amdgcn.flat.atomic.fadd.v2f16.p0.v2f16(ptr %{{.*}}, <2 x half> %{{.*}})
21+
// CHECK: [[RMW:%.+]] = atomicrmw fadd ptr %{{.+}}, <2 x half> %{{.+}} syncscope("agent") monotonic, align 4, !amdgpu.no.fine.grained.memory !{{[0-9]+$}}
22+
2223
// GFX940-LABEL: test_flat_add_2f16
2324
// GFX940: flat_atomic_pk_add_f16
2425
half2 test_flat_add_2f16(__generic half2 *addr, half2 x) {

0 commit comments

Comments
 (0)