Skip to content

Commit 87ce332

Browse files
arsenmarsenm
committed
clang/AMDGPU: Emit atomicrmw for flat/global atomic min/max f64 builtins
1 parent 5822cc2 commit 87ce332

File tree

2 files changed

+21
-33
lines changed

2 files changed

+21
-33
lines changed

‎clang/lib/CodeGen/CGBuiltin.cpp

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18929,32 +18929,6 @@ 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_fmin_f64:
18933-
case AMDGPU::BI__builtin_amdgcn_global_atomic_fmax_f64:
18934-
case AMDGPU::BI__builtin_amdgcn_flat_atomic_fmin_f64:
18935-
case AMDGPU::BI__builtin_amdgcn_flat_atomic_fmax_f64: {
18936-
Intrinsic::ID IID;
18937-
llvm::Type *ArgTy = llvm::Type::getDoubleTy(getLLVMContext());
18938-
switch (BuiltinID) {
18939-
case AMDGPU::BI__builtin_amdgcn_global_atomic_fmin_f64:
18940-
IID = Intrinsic::amdgcn_global_atomic_fmin;
18941-
break;
18942-
case AMDGPU::BI__builtin_amdgcn_global_atomic_fmax_f64:
18943-
IID = Intrinsic::amdgcn_global_atomic_fmax;
18944-
break;
18945-
case AMDGPU::BI__builtin_amdgcn_flat_atomic_fmin_f64:
18946-
IID = Intrinsic::amdgcn_flat_atomic_fmin;
18947-
break;
18948-
case AMDGPU::BI__builtin_amdgcn_flat_atomic_fmax_f64:
18949-
IID = Intrinsic::amdgcn_flat_atomic_fmax;
18950-
break;
18951-
}
18952-
llvm::Value *Addr = EmitScalarExpr(E->getArg(0));
18953-
llvm::Value *Val = EmitScalarExpr(E->getArg(1));
18954-
llvm::Function *F =
18955-
CGM.getIntrinsic(IID, {ArgTy, Addr->getType(), Val->getType()});
18956-
return Builder.CreateCall(F, {Addr, Val});
18957-
}
1895818932
case AMDGPU::BI__builtin_amdgcn_global_load_tr_b64_i32:
1895918933
case AMDGPU::BI__builtin_amdgcn_global_load_tr_b64_v2i32:
1896018934
case AMDGPU::BI__builtin_amdgcn_global_load_tr_b128_v4i16:
@@ -19338,7 +19312,11 @@ Value *CodeGenFunction::EmitAMDGPUBuiltinExpr(unsigned BuiltinID,
1933819312
case AMDGPU::BI__builtin_amdgcn_flat_atomic_fadd_f32:
1933919313
case AMDGPU::BI__builtin_amdgcn_flat_atomic_fadd_f64:
1934019314
case AMDGPU::BI__builtin_amdgcn_global_atomic_fadd_v2bf16:
19341-
case AMDGPU::BI__builtin_amdgcn_flat_atomic_fadd_v2bf16: {
19315+
case AMDGPU::BI__builtin_amdgcn_flat_atomic_fadd_v2bf16:
19316+
case AMDGPU::BI__builtin_amdgcn_global_atomic_fmin_f64:
19317+
case AMDGPU::BI__builtin_amdgcn_global_atomic_fmax_f64:
19318+
case AMDGPU::BI__builtin_amdgcn_flat_atomic_fmin_f64:
19319+
case AMDGPU::BI__builtin_amdgcn_flat_atomic_fmax_f64: {
1934219320
llvm::AtomicRMWInst::BinOp BinOp;
1934319321
switch (BuiltinID) {
1934419322
case AMDGPU::BI__builtin_amdgcn_atomic_inc32:
@@ -19365,8 +19343,12 @@ Value *CodeGenFunction::EmitAMDGPUBuiltinExpr(unsigned BuiltinID,
1936519343
BinOp = llvm::AtomicRMWInst::FAdd;
1936619344
break;
1936719345
case AMDGPU::BI__builtin_amdgcn_ds_fminf:
19346+
case AMDGPU::BI__builtin_amdgcn_global_atomic_fmin_f64:
19347+
case AMDGPU::BI__builtin_amdgcn_flat_atomic_fmin_f64:
1936819348
BinOp = llvm::AtomicRMWInst::FMin;
1936919349
break;
19350+
case AMDGPU::BI__builtin_amdgcn_global_atomic_fmax_f64:
19351+
case AMDGPU::BI__builtin_amdgcn_flat_atomic_fmax_f64:
1937019352
case AMDGPU::BI__builtin_amdgcn_ds_fmaxf:
1937119353
BinOp = llvm::AtomicRMWInst::FMax;
1937219354
break;

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ void test_global_add_half2(__global half2 *addr, half2 x) {
2727
}
2828

2929
// CHECK-LABEL: test_global_global_min_f64
30-
// CHECK: call double @llvm.amdgcn.global.atomic.fmin.f64.p1.f64(ptr addrspace(1) %{{.*}}, double %{{.*}})
30+
// CHECK: = atomicrmw fmin ptr addrspace(1) {{.+}}, double %{{.+}} syncscope("agent") monotonic, align 8, !amdgpu.no.fine.grained.memory !{{[0-9]+$}}
31+
3132
// GFX90A-LABEL: test_global_global_min_f64$local
3233
// GFX90A: global_atomic_min_f64
3334
void test_global_global_min_f64(__global double *addr, double x){
@@ -36,7 +37,8 @@ void test_global_global_min_f64(__global double *addr, double x){
3637
}
3738

3839
// CHECK-LABEL: test_global_max_f64
39-
// CHECK: call double @llvm.amdgcn.global.atomic.fmax.f64.p1.f64(ptr addrspace(1) %{{.*}}, double %{{.*}})
40+
// CHECK: = atomicrmw fmax ptr addrspace(1) {{.+}}, double %{{.+}} syncscope("agent") monotonic, align 8, !amdgpu.no.fine.grained.memory !{{[0-9]+$}}
41+
4042
// GFX90A-LABEL: test_global_max_f64$local
4143
// GFX90A: global_atomic_max_f64
4244
void test_global_max_f64(__global double *addr, double x){
@@ -65,7 +67,8 @@ void test_flat_global_add_f64(__global double *addr, double x){
6567
}
6668

6769
// CHECK-LABEL: test_flat_min_flat_f64
68-
// CHECK: call double @llvm.amdgcn.flat.atomic.fmin.f64.p0.f64(ptr %{{.*}}, double %{{.*}})
70+
// CHECK: = atomicrmw fmin ptr {{.+}}, double %{{.+}} syncscope("agent") monotonic, align 8, !amdgpu.no.fine.grained.memory !{{[0-9]+$}}
71+
6972
// GFX90A-LABEL: test_flat_min_flat_f64$local
7073
// GFX90A: flat_atomic_min_f64
7174
void test_flat_min_flat_f64(__generic double *addr, double x){
@@ -74,7 +77,8 @@ void test_flat_min_flat_f64(__generic double *addr, double x){
7477
}
7578

7679
// CHECK-LABEL: test_flat_global_min_f64
77-
// CHECK: call double @llvm.amdgcn.flat.atomic.fmin.f64.p1.f64(ptr addrspace(1) %{{.*}}, double %{{.*}})
80+
// CHECK: = atomicrmw fmin ptr addrspace(1) {{.+}}, double %{{.+}} syncscope("agent") monotonic, align 8, !amdgpu.no.fine.grained.memory !{{[0-9]+$}}
81+
7882
// GFX90A: test_flat_global_min_f64$local
7983
// GFX90A: global_atomic_min_f64
8084
void test_flat_global_min_f64(__global double *addr, double x){
@@ -83,7 +87,8 @@ void test_flat_global_min_f64(__global double *addr, double x){
8387
}
8488

8589
// CHECK-LABEL: test_flat_max_flat_f64
86-
// CHECK: call double @llvm.amdgcn.flat.atomic.fmax.f64.p0.f64(ptr %{{.*}}, double %{{.*}})
90+
// CHECK: = atomicrmw fmax ptr {{.+}}, double %{{.+}} syncscope("agent") monotonic, align 8, !amdgpu.no.fine.grained.memory !{{[0-9]+$}}
91+
8792
// GFX90A-LABEL: test_flat_max_flat_f64$local
8893
// GFX90A: flat_atomic_max_f64
8994
void test_flat_max_flat_f64(__generic double *addr, double x){
@@ -92,7 +97,8 @@ void test_flat_max_flat_f64(__generic double *addr, double x){
9297
}
9398

9499
// CHECK-LABEL: test_flat_global_max_f64
95-
// CHECK: call double @llvm.amdgcn.flat.atomic.fmax.f64.p1.f64(ptr addrspace(1) %{{.*}}, double %{{.*}})
100+
// CHECK: = atomicrmw fmax ptr addrspace(1) {{.+}}, double %{{.+}} syncscope("agent") monotonic, align 8, !amdgpu.no.fine.grained.memory !{{[0-9]+$}}
101+
96102
// GFX90A-LABEL: test_flat_global_max_f64$local
97103
// GFX90A: global_atomic_max_f64
98104
void test_flat_global_max_f64(__global double *addr, double x){

0 commit comments

Comments
 (0)