[Libclc-dev] [PATCH 07/15] atomic: Implement generic atom[ic]_xchg
Aaron Watry
awatry at gmail.com
Tue Sep 9 16:24:40 PDT 2014
Signed-off-by: Aaron Watry <awatry at gmail.com>
---
generic/include/clc/atomic/atomic_xchg.h | 5 +++++
.../include/clc/cl_khr_global_int32_base_atomics/atom_xchg.h | 2 ++
.../include/clc/cl_khr_local_int32_base_atomics/atom_xchg.h | 2 ++
generic/include/clc/clc.h | 3 +++
generic/lib/SOURCES | 3 +++
generic/lib/atomic/atomic_impl.ll | 12 ++++++++++++
generic/lib/atomic/atomic_xchg.cl | 9 +++++++++
generic/lib/cl_khr_global_int32_base_atomics/atom_xchg.cl | 9 +++++++++
generic/lib/cl_khr_local_int32_base_atomics/atom_xchg.cl | 9 +++++++++
9 files changed, 54 insertions(+)
create mode 100644 generic/include/clc/atomic/atomic_xchg.h
create mode 100644 generic/include/clc/cl_khr_global_int32_base_atomics/atom_xchg.h
create mode 100644 generic/include/clc/cl_khr_local_int32_base_atomics/atom_xchg.h
create mode 100644 generic/lib/atomic/atomic_xchg.cl
create mode 100644 generic/lib/cl_khr_global_int32_base_atomics/atom_xchg.cl
create mode 100644 generic/lib/cl_khr_local_int32_base_atomics/atom_xchg.cl
diff --git a/generic/include/clc/atomic/atomic_xchg.h b/generic/include/clc/atomic/atomic_xchg.h
new file mode 100644
index 0000000..7add098
--- /dev/null
+++ b/generic/include/clc/atomic/atomic_xchg.h
@@ -0,0 +1,5 @@
+#define __CLC_FUNCTION atomic_xchg
+#include <clc/atomic/atomic_decl.inc>
+__CLC_DECLARE_ATOMIC_ADDRSPACE(float);
+#undef __CLC_FUNCTION
+#undef __CLC_DECLARE_ATOMIC_ADDRSPACE
diff --git a/generic/include/clc/cl_khr_global_int32_base_atomics/atom_xchg.h b/generic/include/clc/cl_khr_global_int32_base_atomics/atom_xchg.h
new file mode 100644
index 0000000..6a18e9e
--- /dev/null
+++ b/generic/include/clc/cl_khr_global_int32_base_atomics/atom_xchg.h
@@ -0,0 +1,2 @@
+_CLC_OVERLOAD _CLC_DECL int atom_xchg(global int *p, int val);
+_CLC_OVERLOAD _CLC_DECL unsigned int atom_xchg(global unsigned int *p, unsigned int val);
diff --git a/generic/include/clc/cl_khr_local_int32_base_atomics/atom_xchg.h b/generic/include/clc/cl_khr_local_int32_base_atomics/atom_xchg.h
new file mode 100644
index 0000000..c5a1f09
--- /dev/null
+++ b/generic/include/clc/cl_khr_local_int32_base_atomics/atom_xchg.h
@@ -0,0 +1,2 @@
+_CLC_OVERLOAD _CLC_DECL int atom_xchg(local int *p, int val);
+_CLC_OVERLOAD _CLC_DECL unsigned int atom_xchg(local unsigned int *p, unsigned int val);
diff --git a/generic/include/clc/clc.h b/generic/include/clc/clc.h
index ebd204d..d26bd2d 100644
--- a/generic/include/clc/clc.h
+++ b/generic/include/clc/clc.h
@@ -149,6 +149,7 @@
#include <clc/atomic/atomic_min.h>
#include <clc/atomic/atomic_or.h>
#include <clc/atomic/atomic_sub.h>
+#include <clc/atomic/atomic_xchg.h>
#include <clc/atomic/atomic_xor.h>
/* cl_khr_global_int32_base_atomics Extension Functions */
@@ -156,6 +157,7 @@
#include <clc/cl_khr_global_int32_base_atomics/atom_dec.h>
#include <clc/cl_khr_global_int32_base_atomics/atom_inc.h>
#include <clc/cl_khr_global_int32_base_atomics/atom_sub.h>
+#include <clc/cl_khr_global_int32_base_atomics/atom_xchg.h>
/* cl_khr_global_int32_extended_atomics Extension Functions */
#include <clc/cl_khr_global_int32_extended_atomics/atom_and.h>
@@ -169,6 +171,7 @@
#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>
+#include <clc/cl_khr_local_int32_base_atomics/atom_xchg.h>
/* cl_khr_local_int32_extended_atomics Extension Functions */
#include <clc/cl_khr_local_int32_extended_atomics/atom_and.h>
diff --git a/generic/lib/SOURCES b/generic/lib/SOURCES
index 0540d62..d23370e 100644
--- a/generic/lib/SOURCES
+++ b/generic/lib/SOURCES
@@ -1,9 +1,11 @@
async/prefetch.cl
+atomic/atomic_xchg.cl
atomic/atomic_impl.ll
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_base_atomics/atom_xchg.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
@@ -13,6 +15,7 @@ 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_base_atomics/atom_xchg.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
diff --git a/generic/lib/atomic/atomic_impl.ll b/generic/lib/atomic/atomic_impl.ll
index 792762b..b5495cc 100644
--- a/generic/lib/atomic/atomic_impl.ll
+++ b/generic/lib/atomic/atomic_impl.ll
@@ -94,6 +94,18 @@ entry:
ret i32 %0
}
+define i32 @__clc_atomic_xchg_addr1(i32 addrspace(1)* nocapture %ptr, i32 %value) nounwind alwaysinline {
+entry:
+ %0 = atomicrmw volatile xchg i32 addrspace(1)* %ptr, i32 %value seq_cst
+ ret i32 %0
+}
+
+define i32 @__clc_atomic_xchg_addr3(i32 addrspace(3)* nocapture %ptr, i32 %value) nounwind alwaysinline {
+entry:
+ %0 = atomicrmw volatile xchg i32 addrspace(3)* %ptr, i32 %value seq_cst
+ ret i32 %0
+}
+
define i32 @__clc_atomic_xor_addr1(i32 addrspace(1)* nocapture %ptr, i32 %value) nounwind alwaysinline {
entry:
%0 = atomicrmw volatile xor i32 addrspace(1)* %ptr, i32 %value seq_cst
diff --git a/generic/lib/atomic/atomic_xchg.cl b/generic/lib/atomic/atomic_xchg.cl
new file mode 100644
index 0000000..9aee595
--- /dev/null
+++ b/generic/lib/atomic/atomic_xchg.cl
@@ -0,0 +1,9 @@
+#include <clc/clc.h>
+
+_CLC_OVERLOAD _CLC_DEF float atomic_xchg(volatile global float *p, float val) {
+ return as_float(atomic_xchg((volatile global int *)p, as_int(val)));
+}
+
+_CLC_OVERLOAD _CLC_DEF float atomic_xchg(volatile local float *p, float val) {
+ return as_float(atomic_xchg((volatile local int *)p, as_int(val)));
+}
diff --git a/generic/lib/cl_khr_global_int32_base_atomics/atom_xchg.cl b/generic/lib/cl_khr_global_int32_base_atomics/atom_xchg.cl
new file mode 100644
index 0000000..9c77db1
--- /dev/null
+++ b/generic/lib/cl_khr_global_int32_base_atomics/atom_xchg.cl
@@ -0,0 +1,9 @@
+#include <clc/clc.h>
+
+#define IMPL(TYPE) \
+_CLC_OVERLOAD _CLC_DEF TYPE atom_xchg(global TYPE *p, TYPE val) { \
+ return atomic_xchg(p, val); \
+}
+
+IMPL(int)
+IMPL(unsigned int)
diff --git a/generic/lib/cl_khr_local_int32_base_atomics/atom_xchg.cl b/generic/lib/cl_khr_local_int32_base_atomics/atom_xchg.cl
new file mode 100644
index 0000000..7d4bcca
--- /dev/null
+++ b/generic/lib/cl_khr_local_int32_base_atomics/atom_xchg.cl
@@ -0,0 +1,9 @@
+#include <clc/clc.h>
+
+#define IMPL(TYPE) \
+_CLC_OVERLOAD _CLC_DEF TYPE atom_xchg(local TYPE *p, TYPE val) { \
+ return atomic_xchg(p, val); \
+}
+
+IMPL(int)
+IMPL(unsigned int)
--
1.9.1
More information about the Libclc-dev
mailing list