Author: awatry Date: Tue Sep 16 17:34:24 2014 New Revision: 217912 URL: http://llvm.org/viewvc/llvm-project?rev=217912&view=rev Log: atomic: Add generic implementation of atom[ic]_max
Not used yet... v2: Correct int/uint behavior Signed-off-by: Aaron Watry <[email protected]> Reviewed-by: Tom Stellard <[email protected]> Added: libclc/trunk/generic/include/clc/atomic/atomic_max.h libclc/trunk/generic/include/clc/cl_khr_global_int32_extended_atomics/ libclc/trunk/generic/include/clc/cl_khr_global_int32_extended_atomics/atom_max.h libclc/trunk/generic/include/clc/cl_khr_local_int32_extended_atomics/ libclc/trunk/generic/include/clc/cl_khr_local_int32_extended_atomics/atom_max.h libclc/trunk/generic/lib/cl_khr_global_int32_extended_atomics/ libclc/trunk/generic/lib/cl_khr_global_int32_extended_atomics/atom_max.cl libclc/trunk/generic/lib/cl_khr_local_int32_extended_atomics/ libclc/trunk/generic/lib/cl_khr_local_int32_extended_atomics/atom_max.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_max.h URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/atomic/atomic_max.h?rev=217912&view=auto ============================================================================== --- libclc/trunk/generic/include/clc/atomic/atomic_max.h (added) +++ libclc/trunk/generic/include/clc/atomic/atomic_max.h Tue Sep 16 17:34:24 2014 @@ -0,0 +1,3 @@ +#define __CLC_FUNCTION atomic_max +#include <clc/atomic/atomic_decl.inc> +#undef __CLC_FUNCTION Added: libclc/trunk/generic/include/clc/cl_khr_global_int32_extended_atomics/atom_max.h URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/cl_khr_global_int32_extended_atomics/atom_max.h?rev=217912&view=auto ============================================================================== --- libclc/trunk/generic/include/clc/cl_khr_global_int32_extended_atomics/atom_max.h (added) +++ libclc/trunk/generic/include/clc/cl_khr_global_int32_extended_atomics/atom_max.h Tue Sep 16 17:34:24 2014 @@ -0,0 +1,2 @@ +_CLC_OVERLOAD _CLC_DECL int atom_max(global int *p, int val); +_CLC_OVERLOAD _CLC_DECL unsigned int atom_max(global unsigned int *p, unsigned int val); Added: libclc/trunk/generic/include/clc/cl_khr_local_int32_extended_atomics/atom_max.h URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/cl_khr_local_int32_extended_atomics/atom_max.h?rev=217912&view=auto ============================================================================== --- libclc/trunk/generic/include/clc/cl_khr_local_int32_extended_atomics/atom_max.h (added) +++ libclc/trunk/generic/include/clc/cl_khr_local_int32_extended_atomics/atom_max.h Tue Sep 16 17:34:24 2014 @@ -0,0 +1,2 @@ +_CLC_OVERLOAD _CLC_DECL int atom_max(local int *p, int val); +_CLC_OVERLOAD _CLC_DECL unsigned int atom_max(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=217912&r1=217911&r2=217912&view=diff ============================================================================== --- libclc/trunk/generic/include/clc/clc.h (original) +++ libclc/trunk/generic/include/clc/clc.h Tue Sep 16 17:34:24 2014 @@ -143,6 +143,7 @@ #include <clc/atomic/atomic_add.h> #include <clc/atomic/atomic_dec.h> #include <clc/atomic/atomic_inc.h> +#include <clc/atomic/atomic_max.h> #include <clc/atomic/atomic_sub.h> /* cl_khr_global_int32_base_atomics Extension Functions */ @@ -151,11 +152,17 @@ #include <clc/cl_khr_global_int32_base_atomics/atom_inc.h> #include <clc/cl_khr_global_int32_base_atomics/atom_sub.h> +/* cl_khr_global_int32_extended_atomics Extension Functions */ +#include <clc/cl_khr_global_int32_extended_atomics/atom_max.h> + +/* cl_khr_local_int32_base_atomics Extension Functions */ #include <clc/cl_khr_local_int32_base_atomics/atom_add.h> #include <clc/cl_khr_local_int32_base_atomics/atom_dec.h> #include <clc/cl_khr_local_int32_base_atomics/atom_inc.h> #include <clc/cl_khr_local_int32_base_atomics/atom_sub.h> +/* cl_khr_local_int32_extended_atomics Extension Functions */ +#include <clc/cl_khr_local_int32_extended_atomics/atom_max.h> /* libclc internal defintions */ #ifdef __CLC_INTERNAL Modified: libclc/trunk/generic/lib/SOURCES URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/SOURCES?rev=217912&r1=217911&r2=217912&view=diff ============================================================================== --- libclc/trunk/generic/lib/SOURCES (original) +++ libclc/trunk/generic/lib/SOURCES Tue Sep 16 17:34:24 2014 @@ -4,10 +4,12 @@ cl_khr_global_int32_base_atomics/atom_ad cl_khr_global_int32_base_atomics/atom_dec.cl cl_khr_global_int32_base_atomics/atom_inc.cl cl_khr_global_int32_base_atomics/atom_sub.cl +cl_khr_global_int32_extended_atomics/atom_max.cl cl_khr_local_int32_base_atomics/atom_add.cl cl_khr_local_int32_base_atomics/atom_dec.cl cl_khr_local_int32_base_atomics/atom_inc.cl cl_khr_local_int32_base_atomics/atom_sub.cl +cl_khr_local_int32_extended_atomics/atom_max.cl convert.cl common/sign.cl geometric/cross.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=217912&r1=217911&r2=217912&view=diff ============================================================================== --- libclc/trunk/generic/lib/atomic/atomic_impl.ll (original) +++ libclc/trunk/generic/lib/atomic/atomic_impl.ll Tue Sep 16 17:34:24 2014 @@ -10,6 +10,30 @@ entry: ret i32 %0 } +define i32 @__clc_atomic_max_addr1(i32 addrspace(1)* nocapture %ptr, i32 %value) nounwind alwaysinline { +entry: + %0 = atomicrmw volatile max i32 addrspace(1)* %ptr, i32 %value seq_cst + ret i32 %0 +} + +define i32 @__clc_atomic_max_addr3(i32 addrspace(3)* nocapture %ptr, i32 %value) nounwind alwaysinline { +entry: + %0 = atomicrmw volatile max i32 addrspace(3)* %ptr, i32 %value seq_cst + ret i32 %0 +} + +define i32 @__clc_atomic_umax_addr1(i32 addrspace(1)* nocapture %ptr, i32 %value) nounwind alwaysinline { +entry: + %0 = atomicrmw volatile umax i32 addrspace(1)* %ptr, i32 %value seq_cst + ret i32 %0 +} + +define i32 @__clc_atomic_umax_addr3(i32 addrspace(3)* nocapture %ptr, i32 %value) nounwind alwaysinline { +entry: + %0 = atomicrmw volatile umax 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_max.cl URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/cl_khr_global_int32_extended_atomics/atom_max.cl?rev=217912&view=auto ============================================================================== --- libclc/trunk/generic/lib/cl_khr_global_int32_extended_atomics/atom_max.cl (added) +++ libclc/trunk/generic/lib/cl_khr_global_int32_extended_atomics/atom_max.cl Tue Sep 16 17:34:24 2014 @@ -0,0 +1,9 @@ +#include <clc/clc.h> + +#define IMPL(TYPE) \ +_CLC_OVERLOAD _CLC_DEF TYPE atom_max(global TYPE *p, TYPE val) { \ + return atomic_max(p, val); \ +} + +IMPL(int) +IMPL(unsigned int) Added: libclc/trunk/generic/lib/cl_khr_local_int32_extended_atomics/atom_max.cl URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/cl_khr_local_int32_extended_atomics/atom_max.cl?rev=217912&view=auto ============================================================================== --- libclc/trunk/generic/lib/cl_khr_local_int32_extended_atomics/atom_max.cl (added) +++ libclc/trunk/generic/lib/cl_khr_local_int32_extended_atomics/atom_max.cl Tue Sep 16 17:34:24 2014 @@ -0,0 +1,9 @@ +#include <clc/clc.h> + +#define IMPL(TYPE) \ +_CLC_OVERLOAD _CLC_DEF TYPE atom_max(local TYPE *p, TYPE val) { \ + return atomic_max(p, val); \ +} + +IMPL(int) +IMPL(unsigned int) _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
