diff options
author | Jan Vesely <jan.vesely@rutgers.edu> | 2018-06-21 19:27:07 +0000 |
---|---|---|
committer | Jan Vesely <jan.vesely@rutgers.edu> | 2018-06-21 19:27:07 +0000 |
commit | eabc110372dab0b150ad8488a93d6d95db620e05 (patch) | |
tree | 7e3105515cdd1fedf3e19720e57e103a6aae08bd /libclc | |
parent | be73fd6b5d4f2f10202e0f24fe0e1bfd1fb5a690 (diff) |
atomic: Move define cleanup to shared include
Reviewed-By: Aaron Watry <awatry@gmail.com>
Tested-By: Aaron Watry <awatry@gmail.com>
Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
llvm-svn: 335274
Diffstat (limited to 'libclc')
-rw-r--r-- | libclc/generic/include/clc/atomic/atomic_add.h | 3 | ||||
-rw-r--r-- | libclc/generic/include/clc/atomic/atomic_and.h | 3 | ||||
-rw-r--r-- | libclc/generic/include/clc/atomic/atomic_decl.inc | 6 | ||||
-rw-r--r-- | libclc/generic/include/clc/atomic/atomic_max.h | 3 | ||||
-rw-r--r-- | libclc/generic/include/clc/atomic/atomic_min.h | 3 | ||||
-rw-r--r-- | libclc/generic/include/clc/atomic/atomic_or.h | 3 | ||||
-rw-r--r-- | libclc/generic/include/clc/atomic/atomic_sub.h | 3 | ||||
-rw-r--r-- | libclc/generic/include/clc/atomic/atomic_xchg.h | 7 | ||||
-rw-r--r-- | libclc/generic/include/clc/atomic/atomic_xor.h | 3 |
9 files changed, 8 insertions, 26 deletions
diff --git a/libclc/generic/include/clc/atomic/atomic_add.h b/libclc/generic/include/clc/atomic/atomic_add.h index 7dd4fd3c682e..302e4fbc51bd 100644 --- a/libclc/generic/include/clc/atomic/atomic_add.h +++ b/libclc/generic/include/clc/atomic/atomic_add.h @@ -1,5 +1,2 @@ #define __CLC_FUNCTION atomic_add #include <clc/atomic/atomic_decl.inc> -#undef __CLC_FUNCTION -#undef __CLC_DECLARE_ATOMIC -#undef __CLC_DECLARE_ATOMIC_ADDRSPACE diff --git a/libclc/generic/include/clc/atomic/atomic_and.h b/libclc/generic/include/clc/atomic/atomic_and.h index a198c46b7ee9..4759b9f96e02 100644 --- a/libclc/generic/include/clc/atomic/atomic_and.h +++ b/libclc/generic/include/clc/atomic/atomic_and.h @@ -1,5 +1,2 @@ #define __CLC_FUNCTION atomic_and #include <clc/atomic/atomic_decl.inc> -#undef __CLC_FUNCTION -#undef __CLC_DECLARE_ATOMIC -#undef __CLC_DECLARE_ATOMIC_ADDRSPACE diff --git a/libclc/generic/include/clc/atomic/atomic_decl.inc b/libclc/generic/include/clc/atomic/atomic_decl.inc index 49ccde2bae52..4d81ac139004 100644 --- a/libclc/generic/include/clc/atomic/atomic_decl.inc +++ b/libclc/generic/include/clc/atomic/atomic_decl.inc @@ -1,4 +1,3 @@ - #define __CLC_DECLARE_ATOMIC(ADDRSPACE, TYPE) \ _CLC_OVERLOAD _CLC_DECL TYPE __CLC_FUNCTION (volatile ADDRSPACE TYPE *, TYPE); @@ -8,3 +7,8 @@ __CLC_DECLARE_ATOMIC_ADDRSPACE(int) __CLC_DECLARE_ATOMIC_ADDRSPACE(uint) + +#undef __CLC_DECLARE_ATOMIC_ADDRSPACE +#undef __CLC_DECLARE_ATOMIC + +#undef __CLC_FUNCTION diff --git a/libclc/generic/include/clc/atomic/atomic_max.h b/libclc/generic/include/clc/atomic/atomic_max.h index ed09ec9caef2..f6803c47e432 100644 --- a/libclc/generic/include/clc/atomic/atomic_max.h +++ b/libclc/generic/include/clc/atomic/atomic_max.h @@ -1,5 +1,2 @@ #define __CLC_FUNCTION atomic_max #include <clc/atomic/atomic_decl.inc> -#undef __CLC_FUNCTION -#undef __CLC_DECLARE_ATOMIC -#undef __CLC_DECLARE_ATOMIC_ADDRSPACE diff --git a/libclc/generic/include/clc/atomic/atomic_min.h b/libclc/generic/include/clc/atomic/atomic_min.h index 6a46af403d06..dfa8179db6f5 100644 --- a/libclc/generic/include/clc/atomic/atomic_min.h +++ b/libclc/generic/include/clc/atomic/atomic_min.h @@ -1,5 +1,2 @@ #define __CLC_FUNCTION atomic_min #include <clc/atomic/atomic_decl.inc> -#undef __CLC_FUNCTION -#undef __CLC_DECLARE_ATOMIC -#undef __CLC_DECLARE_ATOMIC_ADDRSPACE diff --git a/libclc/generic/include/clc/atomic/atomic_or.h b/libclc/generic/include/clc/atomic/atomic_or.h index 2369d81a3a06..64ce311216e5 100644 --- a/libclc/generic/include/clc/atomic/atomic_or.h +++ b/libclc/generic/include/clc/atomic/atomic_or.h @@ -1,5 +1,2 @@ #define __CLC_FUNCTION atomic_or #include <clc/atomic/atomic_decl.inc> -#undef __CLC_FUNCTION -#undef __CLC_DECLARE_ATOMIC -#undef __CLC_DECLARE_ATOMIC_ADDRSPACE diff --git a/libclc/generic/include/clc/atomic/atomic_sub.h b/libclc/generic/include/clc/atomic/atomic_sub.h index 993e995001fa..0d2f99e68de7 100644 --- a/libclc/generic/include/clc/atomic/atomic_sub.h +++ b/libclc/generic/include/clc/atomic/atomic_sub.h @@ -1,5 +1,2 @@ #define __CLC_FUNCTION atomic_sub #include <clc/atomic/atomic_decl.inc> -#undef __CLC_FUNCTION -#undef __CLC_DECLARE_ATOMIC -#undef __CLC_DECLARE_ATOMIC_ADDRSPACE diff --git a/libclc/generic/include/clc/atomic/atomic_xchg.h b/libclc/generic/include/clc/atomic/atomic_xchg.h index ebe0d9af8098..59a957234239 100644 --- a/libclc/generic/include/clc/atomic/atomic_xchg.h +++ b/libclc/generic/include/clc/atomic/atomic_xchg.h @@ -1,6 +1,5 @@ #define __CLC_FUNCTION atomic_xchg + +_CLC_OVERLOAD _CLC_DECL float __CLC_FUNCTION (volatile local float *, float); +_CLC_OVERLOAD _CLC_DECL float __CLC_FUNCTION (volatile global float *, float); #include <clc/atomic/atomic_decl.inc> -__CLC_DECLARE_ATOMIC_ADDRSPACE(float); -#undef __CLC_FUNCTION -#undef __CLC_DECLARE_ATOMIC -#undef __CLC_DECLARE_ATOMIC_ADDRSPACE diff --git a/libclc/generic/include/clc/atomic/atomic_xor.h b/libclc/generic/include/clc/atomic/atomic_xor.h index 2cb74803ca92..1318bf20ae08 100644 --- a/libclc/generic/include/clc/atomic/atomic_xor.h +++ b/libclc/generic/include/clc/atomic/atomic_xor.h @@ -1,5 +1,2 @@ #define __CLC_FUNCTION atomic_xor #include <clc/atomic/atomic_decl.inc> -#undef __CLC_FUNCTION -#undef __CLC_DECLARE_ATOMIC -#undef __CLC_DECLARE_ATOMIC_ADDRSPACE |