Author: jvesely Date: Sat Nov 3 17:35:15 2018 New Revision: 346078 URL: http://llvm.org/viewvc/llvm-project?rev=346078&view=rev Log: r600: Convert barrier to clc
Signed-off-by: Jan Vesely <jan.ves...@rutgers.edu> Reviewer: Aaron Watry Added: libclc/trunk/r600/lib/synchronization/barrier.cl Removed: libclc/trunk/r600/lib/OVERRIDES_3.9 libclc/trunk/r600/lib/OVERRIDES_4.0 libclc/trunk/r600/lib/OVERRIDES_5.0 libclc/trunk/r600/lib/OVERRIDES_6.0 libclc/trunk/r600/lib/SOURCES_4.0 libclc/trunk/r600/lib/SOURCES_5.0 libclc/trunk/r600/lib/SOURCES_6.0 libclc/trunk/r600/lib/synchronization/barrier_impl.39.ll libclc/trunk/r600/lib/synchronization/barrier_impl.ll Modified: libclc/trunk/r600/lib/SOURCES libclc/trunk/r600/lib/SOURCES_3.9 Removed: libclc/trunk/r600/lib/OVERRIDES_3.9 URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/OVERRIDES_3.9?rev=346077&view=auto ============================================================================== --- libclc/trunk/r600/lib/OVERRIDES_3.9 (original) +++ libclc/trunk/r600/lib/OVERRIDES_3.9 (removed) @@ -1 +0,0 @@ -synchronization/barrier_impl.ll Removed: libclc/trunk/r600/lib/OVERRIDES_4.0 URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/OVERRIDES_4.0?rev=346077&view=auto ============================================================================== --- libclc/trunk/r600/lib/OVERRIDES_4.0 (original) +++ libclc/trunk/r600/lib/OVERRIDES_4.0 (removed) @@ -1 +0,0 @@ -synchronization/barrier_impl.ll Removed: libclc/trunk/r600/lib/OVERRIDES_5.0 URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/OVERRIDES_5.0?rev=346077&view=auto ============================================================================== --- libclc/trunk/r600/lib/OVERRIDES_5.0 (original) +++ libclc/trunk/r600/lib/OVERRIDES_5.0 (removed) @@ -1 +0,0 @@ -synchronization/barrier_impl.ll Removed: libclc/trunk/r600/lib/OVERRIDES_6.0 URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/OVERRIDES_6.0?rev=346077&view=auto ============================================================================== --- libclc/trunk/r600/lib/OVERRIDES_6.0 (original) +++ libclc/trunk/r600/lib/OVERRIDES_6.0 (removed) @@ -1 +0,0 @@ -synchronization/barrier_impl.ll Modified: libclc/trunk/r600/lib/SOURCES URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/SOURCES?rev=346078&r1=346077&r2=346078&view=diff ============================================================================== --- libclc/trunk/r600/lib/SOURCES (original) +++ libclc/trunk/r600/lib/SOURCES Sat Nov 3 17:35:15 2018 @@ -1,6 +1,6 @@ math/fmax.cl math/fmin.cl -synchronization/barrier_impl.ll +synchronization/barrier.cl workitem/get_global_offset.cl workitem/get_group_id.cl workitem/get_global_size.cl Modified: libclc/trunk/r600/lib/SOURCES_3.9 URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/SOURCES_3.9?rev=346078&r1=346077&r2=346078&view=diff ============================================================================== --- libclc/trunk/r600/lib/SOURCES_3.9 (original) +++ libclc/trunk/r600/lib/SOURCES_3.9 Sat Nov 3 17:35:15 2018 @@ -13,4 +13,3 @@ image/write_imagef.cl image/write_imagei.cl image/write_imageui.cl image/write_image_impl.ll -synchronization/barrier_impl.39.ll Removed: libclc/trunk/r600/lib/SOURCES_4.0 URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/SOURCES_4.0?rev=346077&view=auto ============================================================================== --- libclc/trunk/r600/lib/SOURCES_4.0 (original) +++ libclc/trunk/r600/lib/SOURCES_4.0 (removed) @@ -1 +0,0 @@ -synchronization/barrier_impl.39.ll Removed: libclc/trunk/r600/lib/SOURCES_5.0 URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/SOURCES_5.0?rev=346077&view=auto ============================================================================== --- libclc/trunk/r600/lib/SOURCES_5.0 (original) +++ libclc/trunk/r600/lib/SOURCES_5.0 (removed) @@ -1 +0,0 @@ -synchronization/barrier_impl.39.ll Removed: libclc/trunk/r600/lib/SOURCES_6.0 URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/SOURCES_6.0?rev=346077&view=auto ============================================================================== --- libclc/trunk/r600/lib/SOURCES_6.0 (original) +++ libclc/trunk/r600/lib/SOURCES_6.0 (removed) @@ -1 +0,0 @@ -synchronization/barrier_impl.39.ll Added: libclc/trunk/r600/lib/synchronization/barrier.cl URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/synchronization/barrier.cl?rev=346078&view=auto ============================================================================== --- libclc/trunk/r600/lib/synchronization/barrier.cl (added) +++ libclc/trunk/r600/lib/synchronization/barrier.cl Sat Nov 3 17:35:15 2018 @@ -0,0 +1,9 @@ +#include <clc/clc.h> + +_CLC_DEF void __clc_r600_barrier(void) __asm("llvm.r600.group.barrier"); + +_CLC_DEF void barrier(uint flags) +{ + // We should call mem_fence here, but that is not implemented for r600 yet + __clc_r600_barrier(); +} Removed: libclc/trunk/r600/lib/synchronization/barrier_impl.39.ll URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/synchronization/barrier_impl.39.ll?rev=346077&view=auto ============================================================================== --- libclc/trunk/r600/lib/synchronization/barrier_impl.39.ll (original) +++ libclc/trunk/r600/lib/synchronization/barrier_impl.39.ll (removed) @@ -1,13 +0,0 @@ -declare void @llvm.r600.group.barrier() #0 - -target datalayout = "e-p:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64" - -define void @barrier(i32 %flags) #1 { -entry: - ; We should call mem_fence here, but that is not implemented for r600 yet - tail call void @llvm.r600.group.barrier() - ret void -} - -attributes #0 = { nounwind convergent } -attributes #1 = { nounwind convergent alwaysinline } Removed: libclc/trunk/r600/lib/synchronization/barrier_impl.ll URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/r600/lib/synchronization/barrier_impl.ll?rev=346077&view=auto ============================================================================== --- libclc/trunk/r600/lib/synchronization/barrier_impl.ll (original) +++ libclc/trunk/r600/lib/synchronization/barrier_impl.ll (removed) @@ -1,13 +0,0 @@ -declare void @llvm.r600.group.barrier() #0 - -target datalayout = "e-p:32:32-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-v2048:2048-n32:64-S32-A5" - -define void @barrier(i32 %flags) #1 { -entry: - ; We should call mem_fence here, but that is not implemented for r600 yet - tail call void @llvm.r600.group.barrier() - ret void -} - -attributes #0 = { nounwind convergent } -attributes #1 = { nounwind convergent alwaysinline } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits