maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

AMDGPU: Fix the mapping of sub group sync scope 

Map memory_scope_sub_group to "wavefront" sync scope

Differential Revision: https://reviews.llvm.org/D58847

llvm-svn: 355549
This commit is contained in:
Konstantin Zhuravlyov 2019-03-06 20:54:48 +00:00
parent a4a167fb75
commit 3161c89a22
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/CodeGen/TargetInfo.cpp
View File

@ -7959,7 +7959,7 @@ AMDGPUTargetCodeGenInfo::getLLVMSyncScopeID(SyncScope S,
Name = ""; Name = "";
break; break;
case SyncScope::OpenCLSubGroup: case SyncScope::OpenCLSubGroup:
Name = "subgroup"; Name = "wavefront";
} }
return C.getOrInsertSyncScopeID(Name); return C.getOrInsertSyncScopeID(Name);
} }

10
clang/test/CodeGenOpenCL/atomic-ops.cl
View File

@ -41,7 +41,7 @@ void fi1(atomic_int *i) {
// CHECK: load atomic i32, i32* %{{[.0-9A-Z_a-z]+}} seq_cst // CHECK: load atomic i32, i32* %{{[.0-9A-Z_a-z]+}} seq_cst
x = __opencl_atomic_load(i, memory_order_seq_cst, memory_scope_all_svm_devices); x = __opencl_atomic_load(i, memory_order_seq_cst, memory_scope_all_svm_devices);
// CHECK: load atomic i32, i32* %{{[.0-9A-Z_a-z]+}} syncscope("subgroup") seq_cst // CHECK: load atomic i32, i32* %{{[.0-9A-Z_a-z]+}} syncscope("wavefront") seq_cst
x = __opencl_atomic_load(i, memory_order_seq_cst, memory_scope_sub_group); x = __opencl_atomic_load(i, memory_order_seq_cst, memory_scope_sub_group);
} }
@ -109,7 +109,7 @@ void fi5(atomic_int *i, int scope) {
// CHECK: load atomic i32, i32* %{{.*}} seq_cst // CHECK: load atomic i32, i32* %{{.*}} seq_cst
// CHECK: br label %[[continue]] // CHECK: br label %[[continue]]
// CHECK: [[opencl_subgroup]]: // CHECK: [[opencl_subgroup]]:
// CHECK: load atomic i32, i32* %{{.*}} syncscope("subgroup") seq_cst // CHECK: load atomic i32, i32* %{{.*}} syncscope("wavefront") seq_cst
// CHECK: br label %[[continue]] // CHECK: br label %[[continue]]
// CHECK: [[continue]]: // CHECK: [[continue]]:
int x = __opencl_atomic_load(i, memory_order_seq_cst, scope); int x = __opencl_atomic_load(i, memory_order_seq_cst, scope);
@ -147,7 +147,7 @@ void fi6(atomic_int *i, int order, int scope) {
// CHECK: [[MON_ALL]]: // CHECK: [[MON_ALL]]:
// CHECK: load atomic i32, i32* %{{.*}} monotonic // CHECK: load atomic i32, i32* %{{.*}} monotonic
// CHECK: [[MON_SUB]]: // CHECK: [[MON_SUB]]:
// CHECK: load atomic i32, i32* %{{.*}} syncscope("subgroup") monotonic // CHECK: load atomic i32, i32* %{{.*}} syncscope("wavefront") monotonic
// CHECK: [[ACQ_WG]]: // CHECK: [[ACQ_WG]]:
// CHECK: load atomic i32, i32* %{{.*}} syncscope("workgroup") acquire // CHECK: load atomic i32, i32* %{{.*}} syncscope("workgroup") acquire
// CHECK: [[ACQ_DEV]]: // CHECK: [[ACQ_DEV]]:
@ -155,7 +155,7 @@ void fi6(atomic_int *i, int order, int scope) {
// CHECK: [[ACQ_ALL]]: // CHECK: [[ACQ_ALL]]:
// CHECK: load atomic i32, i32* %{{.*}} acquire // CHECK: load atomic i32, i32* %{{.*}} acquire
// CHECK: [[ACQ_SUB]]: // CHECK: [[ACQ_SUB]]:
// CHECK: load atomic i32, i32* %{{.*}} syncscope("subgroup") acquire // CHECK: load atomic i32, i32* %{{.*}} syncscope("wavefront") acquire
// CHECK: [[SEQ_WG]]: // CHECK: [[SEQ_WG]]:
// CHECK: load atomic i32, i32* %{{.*}} syncscope("workgroup") seq_cst // CHECK: load atomic i32, i32* %{{.*}} syncscope("workgroup") seq_cst
// CHECK: [[SEQ_DEV]]: // CHECK: [[SEQ_DEV]]:
@ -163,7 +163,7 @@ void fi6(atomic_int *i, int order, int scope) {
// CHECK: [[SEQ_ALL]]: // CHECK: [[SEQ_ALL]]:
// CHECK: load atomic i32, i32* %{{.*}} seq_cst // CHECK: load atomic i32, i32* %{{.*}} seq_cst
// CHECK: [[SEQ_SUB]]: // CHECK: [[SEQ_SUB]]:
// CHECK: load atomic i32, i32* %{{.*}} syncscope("subgroup") seq_cst // CHECK: load atomic i32, i32* %{{.*}} syncscope("wavefront") seq_cst
int x = __opencl_atomic_load(i, order, scope); int x = __opencl_atomic_load(i, order, scope);
} }