From: Jan Vesely Date: Thu, 21 Jun 2018 19:27:23 +0000 (+0000) Subject: atom: Consolidate cl_khr_int64_{base,extended}_atomics declarations X-Git-Tag: llvmorg-7.0.0-rc1~3200 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b9cbe0bf514b141efc2e9bb35f625992b670431a;p=platform%2Fupstream%2Fllvm.git atom: Consolidate cl_khr_int64_{base,extended}_atomics declarations Reviewed-By: Aaron Watry Tested-By: Aaron Watry Signed-off-by: Jan Vesely llvm-svn: 335277 --- diff --git a/libclc/generic/include/clc/atom_decl_int64.inc b/libclc/generic/include/clc/atom_decl_int64.inc new file mode 100644 index 0000000..1e0cc32 --- /dev/null +++ b/libclc/generic/include/clc/atom_decl_int64.inc @@ -0,0 +1,11 @@ +#define __CLC_DECLARE_ATOM(ADDRSPACE, TYPE) \ + _CLC_OVERLOAD _CLC_DECL TYPE __CLC_FUNCTION (volatile ADDRSPACE TYPE *, TYPE); + +__CLC_DECLARE_ATOM(local, long) +__CLC_DECLARE_ATOM(local, ulong) +__CLC_DECLARE_ATOM(global, long) +__CLC_DECLARE_ATOM(global, ulong) + +#undef __CLC_DECLARE_ATOM + +#undef __CLC_FUNCTION diff --git a/libclc/generic/include/clc/cl_khr_int64_base_atomics/atom_add.h b/libclc/generic/include/clc/cl_khr_int64_base_atomics/atom_add.h index 5addc13..6f6adad 100644 --- a/libclc/generic/include/clc/cl_khr_int64_base_atomics/atom_add.h +++ b/libclc/generic/include/clc/cl_khr_int64_base_atomics/atom_add.h @@ -1,4 +1,2 @@ -_CLC_OVERLOAD _CLC_DECL long atom_add(volatile global long *p, long val); -_CLC_OVERLOAD _CLC_DECL unsigned long atom_add(volatile global unsigned long *p, unsigned long val); -_CLC_OVERLOAD _CLC_DECL long atom_add(volatile local long *p, long val); -_CLC_OVERLOAD _CLC_DECL unsigned long atom_add(volatile local unsigned long *p, unsigned long val); +#define __CLC_FUNCTION atom_add +#include diff --git a/libclc/generic/include/clc/cl_khr_int64_base_atomics/atom_sub.h b/libclc/generic/include/clc/cl_khr_int64_base_atomics/atom_sub.h index 2186ec9..e0431dd 100644 --- a/libclc/generic/include/clc/cl_khr_int64_base_atomics/atom_sub.h +++ b/libclc/generic/include/clc/cl_khr_int64_base_atomics/atom_sub.h @@ -1,4 +1,2 @@ -_CLC_OVERLOAD _CLC_DECL long atom_sub(volatile global long *p, long val); -_CLC_OVERLOAD _CLC_DECL unsigned long atom_sub(volatile global unsigned long *p, unsigned long val); -_CLC_OVERLOAD _CLC_DECL long atom_sub(volatile local long *p, long val); -_CLC_OVERLOAD _CLC_DECL unsigned long atom_sub(volatile local unsigned long *p, unsigned long val); +#define __CLC_FUNCTION atom_sub +#include diff --git a/libclc/generic/include/clc/cl_khr_int64_base_atomics/atom_xchg.h b/libclc/generic/include/clc/cl_khr_int64_base_atomics/atom_xchg.h index 3627af1..cac9688 100644 --- a/libclc/generic/include/clc/cl_khr_int64_base_atomics/atom_xchg.h +++ b/libclc/generic/include/clc/cl_khr_int64_base_atomics/atom_xchg.h @@ -1,4 +1,2 @@ -_CLC_OVERLOAD _CLC_DECL long atom_xchg(volatile global long *p, long val); -_CLC_OVERLOAD _CLC_DECL unsigned long atom_xchg(volatile global unsigned long *p, unsigned long val); -_CLC_OVERLOAD _CLC_DECL long atom_xchg(volatile local long *p, long val); -_CLC_OVERLOAD _CLC_DECL unsigned long atom_xchg(volatile local unsigned long *p, unsigned long val); +#define __CLC_FUNCTION atom_xchg +#include diff --git a/libclc/generic/include/clc/cl_khr_int64_extended_atomics/atom_and.h b/libclc/generic/include/clc/cl_khr_int64_extended_atomics/atom_and.h index 388df1d..b8e6104 100644 --- a/libclc/generic/include/clc/cl_khr_int64_extended_atomics/atom_and.h +++ b/libclc/generic/include/clc/cl_khr_int64_extended_atomics/atom_and.h @@ -1,4 +1,2 @@ -_CLC_OVERLOAD _CLC_DECL long atom_and(volatile global long *p, long val); -_CLC_OVERLOAD _CLC_DECL unsigned long atom_and(volatile global unsigned long *p, unsigned long val); -_CLC_OVERLOAD _CLC_DECL long atom_and(volatile local long *p, long val); -_CLC_OVERLOAD _CLC_DECL unsigned long atom_and(volatile local unsigned long *p, unsigned long val); +#define __CLC_FUNCTION atom_and +#include diff --git a/libclc/generic/include/clc/cl_khr_int64_extended_atomics/atom_max.h b/libclc/generic/include/clc/cl_khr_int64_extended_atomics/atom_max.h index b84b5a0..b9cff19 100644 --- a/libclc/generic/include/clc/cl_khr_int64_extended_atomics/atom_max.h +++ b/libclc/generic/include/clc/cl_khr_int64_extended_atomics/atom_max.h @@ -1,4 +1,2 @@ -_CLC_OVERLOAD _CLC_DECL long atom_max(volatile global long *p, long val); -_CLC_OVERLOAD _CLC_DECL unsigned long atom_max(volatile global unsigned long *p, unsigned long val); -_CLC_OVERLOAD _CLC_DECL long atom_max(volatile local long *p, long val); -_CLC_OVERLOAD _CLC_DECL unsigned long atom_max(volatile local unsigned long *p, unsigned long val); +#define __CLC_FUNCTION atom_max +#include diff --git a/libclc/generic/include/clc/cl_khr_int64_extended_atomics/atom_min.h b/libclc/generic/include/clc/cl_khr_int64_extended_atomics/atom_min.h index bd70b0b..0a19d21 100644 --- a/libclc/generic/include/clc/cl_khr_int64_extended_atomics/atom_min.h +++ b/libclc/generic/include/clc/cl_khr_int64_extended_atomics/atom_min.h @@ -1,4 +1,2 @@ -_CLC_OVERLOAD _CLC_DECL long atom_min(volatile global long *p, long val); -_CLC_OVERLOAD _CLC_DECL unsigned long atom_min(volatile global unsigned long *p, unsigned long val); -_CLC_OVERLOAD _CLC_DECL long atom_min(volatile local long *p, long val); -_CLC_OVERLOAD _CLC_DECL unsigned long atom_min(volatile local unsigned long *p, unsigned long val); +#define __CLC_FUNCTION atom_min +#include diff --git a/libclc/generic/include/clc/cl_khr_int64_extended_atomics/atom_or.h b/libclc/generic/include/clc/cl_khr_int64_extended_atomics/atom_or.h index e307822..f4baa36 100644 --- a/libclc/generic/include/clc/cl_khr_int64_extended_atomics/atom_or.h +++ b/libclc/generic/include/clc/cl_khr_int64_extended_atomics/atom_or.h @@ -1,4 +1,2 @@ -_CLC_OVERLOAD _CLC_DECL long atom_or(volatile global long *p, long val); -_CLC_OVERLOAD _CLC_DECL unsigned long atom_or(volatile global unsigned long *p, unsigned long val); -_CLC_OVERLOAD _CLC_DECL long atom_or(volatile local long *p, long val); -_CLC_OVERLOAD _CLC_DECL unsigned long atom_or(volatile local unsigned long *p, unsigned long val); +#define __CLC_FUNCTION atom_or +#include diff --git a/libclc/generic/include/clc/cl_khr_int64_extended_atomics/atom_xor.h b/libclc/generic/include/clc/cl_khr_int64_extended_atomics/atom_xor.h index 54eb492..d64a342 100644 --- a/libclc/generic/include/clc/cl_khr_int64_extended_atomics/atom_xor.h +++ b/libclc/generic/include/clc/cl_khr_int64_extended_atomics/atom_xor.h @@ -1,4 +1,2 @@ -_CLC_OVERLOAD _CLC_DECL long atom_xor(volatile global long *p, long val); -_CLC_OVERLOAD _CLC_DECL unsigned long atom_xor(volatile global unsigned long *p, unsigned long val); -_CLC_OVERLOAD _CLC_DECL long atom_xor(volatile local long *p, long val); -_CLC_OVERLOAD _CLC_DECL unsigned long atom_xor(volatile local unsigned long *p, unsigned long val); +#define __CLC_FUNCTION atom_xor +#include