Author: awatry Date: Tue Sep 16 17:34:41 2014 New Revision: 217916 URL: http://llvm.org/viewvc/llvm-project?rev=217916&view=rev Log: atomic: Add generic atomic_min implementation
Signed-off-by: Aaron Watry <[email protected]> Reviewed-by: Tom Stellard <[email protected]> Added: libclc/trunk/generic/include/clc/atomic/atomic_min.h libclc/trunk/generic/include/clc/cl_khr_global_int32_extended_atomics/atom_min.h libclc/trunk/generic/include/clc/cl_khr_local_int32_extended_atomics/atom_min.h libclc/trunk/generic/lib/cl_khr_global_int32_extended_atomics/atom_min.cl libclc/trunk/generic/lib/cl_khr_local_int32_extended_atomics/atom_min.cl Modified: libclc/trunk/generic/include/clc/clc.h libclc/trunk/generic/lib/SOURCES libclc/trunk/generic/lib/atomic/atomic_impl.ll Added: libclc/trunk/generic/include/clc/atomic/atomic_min.h URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/atomic/atomic_min.h?rev=217916&view=auto ============================================================================== --- libclc/trunk/generic/include/clc/atomic/atomic_min.h (added) +++ libclc/trunk/generic/include/clc/atomic/atomic_min.h Tue Sep 16 17:34:41 2014 @@ -0,0 +1,3 @@ +#define __CLC_FUNCTION atomic_min +#include <clc/atomic/atomic_decl.inc> +#undef __CLC_FUNCTION Added: libclc/trunk/generic/include/clc/cl_khr_global_int32_extended_atomics/atom_min.h URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/cl_khr_global_int32_extended_atomics/atom_min.h?rev=217916&view=auto ============================================================================== --- libclc/trunk/generic/include/clc/cl_khr_global_int32_extended_atomics/atom_min.h (added) +++ libclc/trunk/generic/include/clc/cl_khr_global_int32_extended_atomics/atom_min.h Tue Sep 16 17:34:41 2014 @@ -0,0 +1,2 @@ +_CLC_OVERLOAD _CLC_DECL int atom_min(global int *p, int val); +_CLC_OVERLOAD _CLC_DECL unsigned int atom_min(global unsigned int *p, unsigned int val); Added: libclc/trunk/generic/include/clc/cl_khr_local_int32_extended_atomics/atom_min.h URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/cl_khr_local_int32_extended_atomics/atom_min.h?rev=217916&view=auto ============================================================================== --- libclc/trunk/generic/include/clc/cl_khr_local_int32_extended_atomics/atom_min.h (added) +++ libclc/trunk/generic/include/clc/cl_khr_local_int32_extended_atomics/atom_min.h Tue Sep 16 17:34:41 2014 @@ -0,0 +1,2 @@ +_CLC_OVERLOAD _CLC_DECL int atom_min(local int *p, int val); +_CLC_OVERLOAD _CLC_DECL unsigned int atom_min(local unsigned int *p, unsigned int val); Modified: libclc/trunk/generic/include/clc/clc.h URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/clc.h?rev=217916&r1=217915&r2=217916&view=diff ============================================================================== --- libclc/trunk/generic/include/clc/clc.h (original) +++ libclc/trunk/generic/include/clc/clc.h Tue Sep 16 17:34:41 2014 @@ -145,6 +145,7 @@ #include <clc/atomic/atomic_dec.h> #include <clc/atomic/atomic_inc.h> #include <clc/atomic/atomic_max.h> +#include <clc/atomic/atomic_min.h> #include <clc/atomic/atomic_or.h> #include <clc/atomic/atomic_sub.h> #include <clc/atomic/atomic_xor.h> @@ -158,6 +159,7 @@ /* cl_khr_global_int32_extended_atomics Extension Functions */ #include <clc/cl_khr_global_int32_extended_atomics/atom_and.h> #include <clc/cl_khr_global_int32_extended_atomics/atom_max.h> +#include <clc/cl_khr_global_int32_extended_atomics/atom_min.h> #include <clc/cl_khr_global_int32_extended_atomics/atom_or.h> #include <clc/cl_khr_global_int32_extended_atomics/atom_xor.h> @@ -170,6 +172,7 @@ /* cl_khr_local_int32_extended_atomics Extension Functions */ #include <clc/cl_khr_local_int32_extended_atomics/atom_and.h> #include <clc/cl_khr_local_int32_extended_atomics/atom_max.h> +#include <clc/cl_khr_local_int32_extended_atomics/atom_min.h> #include <clc/cl_khr_local_int32_extended_atomics/atom_or.h> #include <clc/cl_khr_local_int32_extended_atomics/atom_xor.h> Modified: libclc/trunk/generic/lib/SOURCES URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/SOURCES?rev=217916&r1=217915&r2=217916&view=diff ============================================================================== --- libclc/trunk/generic/lib/SOURCES (original) +++ libclc/trunk/generic/lib/SOURCES Tue Sep 16 17:34:41 2014 @@ -6,6 +6,7 @@ cl_khr_global_int32_base_atomics/atom_in cl_khr_global_int32_base_atomics/atom_sub.cl cl_khr_global_int32_extended_atomics/atom_and.cl cl_khr_global_int32_extended_atomics/atom_max.cl +cl_khr_global_int32_extended_atomics/atom_min.cl cl_khr_global_int32_extended_atomics/atom_or.cl cl_khr_global_int32_extended_atomics/atom_xor.cl cl_khr_local_int32_base_atomics/atom_add.cl @@ -14,6 +15,7 @@ cl_khr_local_int32_base_atomics/atom_inc cl_khr_local_int32_base_atomics/atom_sub.cl cl_khr_local_int32_extended_atomics/atom_and.cl cl_khr_local_int32_extended_atomics/atom_max.cl +cl_khr_local_int32_extended_atomics/atom_min.cl cl_khr_local_int32_extended_atomics/atom_or.cl cl_khr_local_int32_extended_atomics/atom_xor.cl convert.cl Modified: libclc/trunk/generic/lib/atomic/atomic_impl.ll URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/atomic/atomic_impl.ll?rev=217916&r1=217915&r2=217916&view=diff ============================================================================== --- libclc/trunk/generic/lib/atomic/atomic_impl.ll (original) +++ libclc/trunk/generic/lib/atomic/atomic_impl.ll Tue Sep 16 17:34:41 2014 @@ -34,6 +34,18 @@ entry: ret i32 %0 } +define i32 @__clc_atomic_min_addr1(i32 addrspace(1)* nocapture %ptr, i32 %value) nounwind alwaysinline { +entry: + %0 = atomicrmw volatile min i32 addrspace(1)* %ptr, i32 %value seq_cst + ret i32 %0 +} + +define i32 @__clc_atomic_min_addr3(i32 addrspace(3)* nocapture %ptr, i32 %value) nounwind alwaysinline { +entry: + %0 = atomicrmw volatile min i32 addrspace(3)* %ptr, i32 %value seq_cst + ret i32 %0 +} + define i32 @__clc_atomic_or_addr1(i32 addrspace(1)* nocapture %ptr, i32 %value) nounwind alwaysinline { entry: %0 = atomicrmw volatile or i32 addrspace(1)* %ptr, i32 %value seq_cst @@ -58,6 +70,18 @@ entry: ret i32 %0 } +define i32 @__clc_atomic_umin_addr1(i32 addrspace(1)* nocapture %ptr, i32 %value) nounwind alwaysinline { +entry: + %0 = atomicrmw volatile umin i32 addrspace(1)* %ptr, i32 %value seq_cst + ret i32 %0 +} + +define i32 @__clc_atomic_umin_addr3(i32 addrspace(3)* nocapture %ptr, i32 %value) nounwind alwaysinline { +entry: + %0 = atomicrmw volatile umin i32 addrspace(3)* %ptr, i32 %value seq_cst + ret i32 %0 +} + define i32 @__clc_atomic_sub_addr1(i32 addrspace(1)* nocapture %ptr, i32 %value) nounwind alwaysinline { entry: %0 = atomicrmw volatile sub i32 addrspace(1)* %ptr, i32 %value seq_cst Added: libclc/trunk/generic/lib/cl_khr_global_int32_extended_atomics/atom_min.cl URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/cl_khr_global_int32_extended_atomics/atom_min.cl?rev=217916&view=auto ============================================================================== --- libclc/trunk/generic/lib/cl_khr_global_int32_extended_atomics/atom_min.cl (added) +++ libclc/trunk/generic/lib/cl_khr_global_int32_extended_atomics/atom_min.cl Tue Sep 16 17:34:41 2014 @@ -0,0 +1,9 @@ +#include <clc/clc.h> + +#define IMPL(TYPE) \ +_CLC_OVERLOAD _CLC_DEF TYPE atom_min(global TYPE *p, TYPE val) { \ + return atomic_min(p, val); \ +} + +IMPL(int) +IMPL(unsigned int) Added: libclc/trunk/generic/lib/cl_khr_local_int32_extended_atomics/atom_min.cl URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/cl_khr_local_int32_extended_atomics/atom_min.cl?rev=217916&view=auto ============================================================================== --- libclc/trunk/generic/lib/cl_khr_local_int32_extended_atomics/atom_min.cl (added) +++ libclc/trunk/generic/lib/cl_khr_local_int32_extended_atomics/atom_min.cl Tue Sep 16 17:34:41 2014 @@ -0,0 +1,9 @@ +#include <clc/clc.h> + +#define IMPL(TYPE) \ +_CLC_OVERLOAD _CLC_DEF TYPE atom_min(local TYPE *p, TYPE val) { \ + return atomic_min(p, val); \ +} + +IMPL(int) +IMPL(unsigned int) _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
