[libclc] r217914 - atomic: Add atom[ic]_or

Aaron Watry awatry at gmail.com
Tue Sep 16 15:34:32 PDT 2014


Author: awatry
Date: Tue Sep 16 17:34:32 2014
New Revision: 217914

URL: http://llvm.org/viewvc/llvm-project?rev=217914&view=rev
Log:
atomic: Add atom[ic]_or

Signed-off-by: Aaron Watry <awatry at gmail.com>
Reviewed-by: Tom Stellard <thomas.stellard at amd.com>

Added:
    libclc/trunk/generic/include/clc/atomic/atomic_or.h
    libclc/trunk/generic/include/clc/cl_khr_global_int32_extended_atomics/atom_or.h
    libclc/trunk/generic/include/clc/cl_khr_local_int32_extended_atomics/atom_or.h
    libclc/trunk/generic/lib/cl_khr_global_int32_extended_atomics/atom_or.cl
    libclc/trunk/generic/lib/cl_khr_local_int32_extended_atomics/atom_or.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_or.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/atomic/atomic_or.h?rev=217914&view=auto
==============================================================================
--- libclc/trunk/generic/include/clc/atomic/atomic_or.h (added)
+++ libclc/trunk/generic/include/clc/atomic/atomic_or.h Tue Sep 16 17:34:32 2014
@@ -0,0 +1,3 @@
+#define __CLC_FUNCTION atomic_or
+#include <clc/atomic/atomic_decl.inc>
+#undef __CLC_FUNCTION

Added: libclc/trunk/generic/include/clc/cl_khr_global_int32_extended_atomics/atom_or.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/cl_khr_global_int32_extended_atomics/atom_or.h?rev=217914&view=auto
==============================================================================
--- libclc/trunk/generic/include/clc/cl_khr_global_int32_extended_atomics/atom_or.h (added)
+++ libclc/trunk/generic/include/clc/cl_khr_global_int32_extended_atomics/atom_or.h Tue Sep 16 17:34:32 2014
@@ -0,0 +1,2 @@
+_CLC_OVERLOAD _CLC_DECL int atom_or(global int *p, int val);
+_CLC_OVERLOAD _CLC_DECL unsigned int atom_or(global unsigned int *p, unsigned int val);

Added: libclc/trunk/generic/include/clc/cl_khr_local_int32_extended_atomics/atom_or.h
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/cl_khr_local_int32_extended_atomics/atom_or.h?rev=217914&view=auto
==============================================================================
--- libclc/trunk/generic/include/clc/cl_khr_local_int32_extended_atomics/atom_or.h (added)
+++ libclc/trunk/generic/include/clc/cl_khr_local_int32_extended_atomics/atom_or.h Tue Sep 16 17:34:32 2014
@@ -0,0 +1,2 @@
+_CLC_OVERLOAD _CLC_DECL int atom_or(local int *p, int val);
+_CLC_OVERLOAD _CLC_DECL unsigned int atom_or(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=217914&r1=217913&r2=217914&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/clc.h (original)
+++ libclc/trunk/generic/include/clc/clc.h Tue Sep 16 17:34:32 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_or.h>
 #include <clc/atomic/atomic_sub.h>
 
 /* cl_khr_global_int32_base_atomics Extension Functions */
@@ -156,6 +157,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_or.h>
 
 /* cl_khr_local_int32_base_atomics Extension Functions */
 #include <clc/cl_khr_local_int32_base_atomics/atom_add.h>
@@ -166,6 +168,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_or.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=217914&r1=217913&r2=217914&view=diff
==============================================================================
--- libclc/trunk/generic/lib/SOURCES (original)
+++ libclc/trunk/generic/lib/SOURCES Tue Sep 16 17:34:32 2014
@@ -6,12 +6,14 @@ 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_or.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_and.cl
 cl_khr_local_int32_extended_atomics/atom_max.cl
+cl_khr_local_int32_extended_atomics/atom_or.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=217914&r1=217913&r2=217914&view=diff
==============================================================================
--- libclc/trunk/generic/lib/atomic/atomic_impl.ll (original)
+++ libclc/trunk/generic/lib/atomic/atomic_impl.ll Tue Sep 16 17:34:32 2014
@@ -34,6 +34,17 @@ entry:
   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
+  ret i32 %0
+}
+
+define i32 @__clc_atomic_or_addr3(i32 addrspace(3)* nocapture %ptr, i32 %value) nounwind alwaysinline {
+entry:
+  %0 = atomicrmw volatile or 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

Added: libclc/trunk/generic/lib/cl_khr_global_int32_extended_atomics/atom_or.cl
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/cl_khr_global_int32_extended_atomics/atom_or.cl?rev=217914&view=auto
==============================================================================
--- libclc/trunk/generic/lib/cl_khr_global_int32_extended_atomics/atom_or.cl (added)
+++ libclc/trunk/generic/lib/cl_khr_global_int32_extended_atomics/atom_or.cl Tue Sep 16 17:34:32 2014
@@ -0,0 +1,9 @@
+#include <clc/clc.h>
+
+#define IMPL(TYPE) \
+_CLC_OVERLOAD _CLC_DEF TYPE atom_or(global TYPE *p, TYPE val) { \
+  return atomic_or(p, val); \
+}
+
+IMPL(int)
+IMPL(unsigned int)

Added: libclc/trunk/generic/lib/cl_khr_local_int32_extended_atomics/atom_or.cl
URL: http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/lib/cl_khr_local_int32_extended_atomics/atom_or.cl?rev=217914&view=auto
==============================================================================
--- libclc/trunk/generic/lib/cl_khr_local_int32_extended_atomics/atom_or.cl (added)
+++ libclc/trunk/generic/lib/cl_khr_local_int32_extended_atomics/atom_or.cl Tue Sep 16 17:34:32 2014
@@ -0,0 +1,9 @@
+#include <clc/clc.h>
+
+#define IMPL(TYPE) \
+_CLC_OVERLOAD _CLC_DEF TYPE atom_or(local TYPE *p, TYPE val) { \
+  return atomic_or(p, val); \
+}
+
+IMPL(int)
+IMPL(unsigned int)





More information about the cfe-commits mailing list