Author: jvesely
Date: Thu Jun 21 12:27:07 2018
New Revision: 335274
URL: http://llvm.org/viewvc/llvm-project?rev=335274&view=rev
Log:
atomic: Move define cleanup to shared include
Reviewed-By: Aaron Watry <awa...@gmail.com>
Tested-By: Aaron Watry <awa...@gmail.com>
Signed-off-by: Jan Vesely <jan.ves...@rutgers.edu>
Modified:
libclc/trunk/generic/include/clc/atomic/atomic_add.h
libclc/trunk/generic/include/clc/atomic/atomic_and.h
libclc/trunk/generic/include/clc/atomic/atomic_decl.inc
libclc/trunk/generic/include/clc/atomic/atomic_max.h
libclc/trunk/generic/include/clc/atomic/atomic_min.h
libclc/trunk/generic/include/clc/atomic/atomic_or.h
libclc/trunk/generic/include/clc/atomic/atomic_sub.h
libclc/trunk/generic/include/clc/atomic/atomic_xchg.h
libclc/trunk/generic/include/clc/atomic/atomic_xor.h
Modified: libclc/trunk/generic/include/clc/atomic/atomic_add.h
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/atomic/atomic_add.h?rev=335274&r1=335273&r2=335274&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/atomic/atomic_add.h (original)
+++ libclc/trunk/generic/include/clc/atomic/atomic_add.h Thu Jun 21 12:27:07
2018
@@ -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
Modified: libclc/trunk/generic/include/clc/atomic/atomic_and.h
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/atomic/atomic_and.h?rev=335274&r1=335273&r2=335274&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/atomic/atomic_and.h (original)
+++ libclc/trunk/generic/include/clc/atomic/atomic_and.h Thu Jun 21 12:27:07
2018
@@ -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
Modified: libclc/trunk/generic/include/clc/atomic/atomic_decl.inc
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/atomic/atomic_decl.inc?rev=335274&r1=335273&r2=335274&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/atomic/atomic_decl.inc (original)
+++ libclc/trunk/generic/include/clc/atomic/atomic_decl.inc Thu Jun 21 12:27:07
2018
@@ -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
Modified: 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=335274&r1=335273&r2=335274&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/atomic/atomic_max.h (original)
+++ libclc/trunk/generic/include/clc/atomic/atomic_max.h Thu Jun 21 12:27:07
2018
@@ -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
Modified: libclc/trunk/generic/include/clc/atomic/atomic_min.h
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/atomic/atomic_min.h?rev=335274&r1=335273&r2=335274&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/atomic/atomic_min.h (original)
+++ libclc/trunk/generic/include/clc/atomic/atomic_min.h Thu Jun 21 12:27:07
2018
@@ -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
Modified: 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=335274&r1=335273&r2=335274&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/atomic/atomic_or.h (original)
+++ libclc/trunk/generic/include/clc/atomic/atomic_or.h Thu Jun 21 12:27:07 2018
@@ -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
Modified: libclc/trunk/generic/include/clc/atomic/atomic_sub.h
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/atomic/atomic_sub.h?rev=335274&r1=335273&r2=335274&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/atomic/atomic_sub.h (original)
+++ libclc/trunk/generic/include/clc/atomic/atomic_sub.h Thu Jun 21 12:27:07
2018
@@ -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
Modified: libclc/trunk/generic/include/clc/atomic/atomic_xchg.h
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/atomic/atomic_xchg.h?rev=335274&r1=335273&r2=335274&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/atomic/atomic_xchg.h (original)
+++ libclc/trunk/generic/include/clc/atomic/atomic_xchg.h Thu Jun 21 12:27:07
2018
@@ -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
Modified: libclc/trunk/generic/include/clc/atomic/atomic_xor.h
URL:
http://llvm.org/viewvc/llvm-project/libclc/trunk/generic/include/clc/atomic/atomic_xor.h?rev=335274&r1=335273&r2=335274&view=diff
==============================================================================
--- libclc/trunk/generic/include/clc/atomic/atomic_xor.h (original)
+++ libclc/trunk/generic/include/clc/atomic/atomic_xor.h Thu Jun 21 12:27:07
2018
@@ -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
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
