[Libclc-dev] [PATCH 02/15] atomic: Add generic implementation of atom[ic]_max

[Aaron Watry]

Not used yet...

v2: Correct int/uint behavior
---
 generic/include/clc/atomic/atomic_max.h            |  3 +++
 .../atom_max.h                                     |  2 ++
 .../cl_khr_local_int32_extended_atomics/atom_max.h |  2 ++
 generic/include/clc/clc.h                          |  7 +++++++
 generic/lib/SOURCES                                |  2 ++
 generic/lib/atomic/atomic_impl.ll                  | 24 ++++++++++++++++++++++
 .../atom_max.cl                                    |  9 ++++++++
 .../atom_max.cl                                    |  9 ++++++++
 8 files changed, 58 insertions(+)
 create mode 100644 generic/include/clc/atomic/atomic_max.h
 create mode 100644 generic/include/clc/cl_khr_global_int32_extended_atomics/atom_max.h
 create mode 100644 generic/include/clc/cl_khr_local_int32_extended_atomics/atom_max.h
 create mode 100644 generic/lib/cl_khr_global_int32_extended_atomics/atom_max.cl
 create mode 100644 generic/lib/cl_khr_local_int32_extended_atomics/atom_max.cl

diff --git a/generic/include/clc/atomic/atomic_max.h b/generic/include/clc/atomic/atomic_max.h
new file mode 100644
index 0000000..30dc180
--- /dev/null
+++ b/generic/include/clc/atomic/atomic_max.h
@@ -0,0 +1,3 @@
+#define __CLC_FUNCTION atomic_max
+#include <clc/atomic/atomic_decl.inc>
+#undef __CLC_FUNCTION
diff --git a/generic/include/clc/cl_khr_global_int32_extended_atomics/atom_max.h b/generic/include/clc/cl_khr_global_int32_extended_atomics/atom_max.h
new file mode 100644
index 0000000..b46ce29
--- /dev/null
+++ b/generic/include/clc/cl_khr_global_int32_extended_atomics/atom_max.h
@@ -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);
diff --git a/generic/include/clc/cl_khr_local_int32_extended_atomics/atom_max.h b/generic/include/clc/cl_khr_local_int32_extended_atomics/atom_max.h
new file mode 100644
index 0000000..7d6b17d
--- /dev/null
+++ b/generic/include/clc/cl_khr_local_int32_extended_atomics/atom_max.h
@@ -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);
diff --git a/generic/include/clc/clc.h b/generic/include/clc/clc.h
index 875496c..20759d2 100644
--- a/generic/include/clc/clc.h
+++ b/generic/include/clc/clc.h
@@ -144,6 +144,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 */
@@ -152,11 +153,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
diff --git a/generic/lib/SOURCES b/generic/lib/SOURCES
index 6777f6c..76d0d77 100644
--- a/generic/lib/SOURCES
+++ b/generic/lib/SOURCES
@@ -4,10 +4,12 @@ cl_khr_global_int32_base_atomics/atom_add.cl
 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
diff --git a/generic/lib/atomic/atomic_impl.ll b/generic/lib/atomic/atomic_impl.ll
index 9df5b9f..29ef2d1 100644
--- a/generic/lib/atomic/atomic_impl.ll
+++ b/generic/lib/atomic/atomic_impl.ll
@@ -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
diff --git a/generic/lib/cl_khr_global_int32_extended_atomics/atom_max.cl b/generic/lib/cl_khr_global_int32_extended_atomics/atom_max.cl
new file mode 100644
index 0000000..09177ed
--- /dev/null
+++ b/generic/lib/cl_khr_global_int32_extended_atomics/atom_max.cl
@@ -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)
diff --git a/generic/lib/cl_khr_local_int32_extended_atomics/atom_max.cl b/generic/lib/cl_khr_local_int32_extended_atomics/atom_max.cl
new file mode 100644
index 0000000..b90301b
--- /dev/null
+++ b/generic/lib/cl_khr_local_int32_extended_atomics/atom_max.cl
@@ -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)
-- 
1.9.1