diff options
| author | Jan Vesely <jan.vesely@rutgers.edu> | 2018-06-21 19:27:39 +0000 |
|---|---|---|
| committer | Jan Vesely <jan.vesely@rutgers.edu> | 2018-06-21 19:27:39 +0000 |
| commit | 8382e5bc488fba642213d4f2900b5b84ff76ca04 (patch) | |
| tree | 6b4be85706494b52b4923cba7eb43b3e9082298b /libclc/generic/include | |
| parent | 65e3541b789a5e7513910dd706dd18412c8ced0f (diff) | |
| download | bcm5719-llvm-8382e5bc488fba642213d4f2900b5b84ff76ca04.tar.gz bcm5719-llvm-8382e5bc488fba642213d4f2900b5b84ff76ca04.zip | |
atom: Use volatile pointers for cl_khr_{global,local}_int32_{base,extended}_atomics
int64 versions were switched to volatile pointers in cl1.1
cl1.1 also renamed atom_ functions to atomic_ that use volatile pointers.
CTS and applications use volatile pointers.
Passes CTS on carrizo
no return piglit tests still pass on turks.
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: 335280
Diffstat (limited to 'libclc/generic/include')
7 files changed, 13 insertions, 13 deletions
diff --git a/libclc/generic/include/clc/atom_decl_int32.inc b/libclc/generic/include/clc/atom_decl_int32.inc index dc763569c02..989ecfb2e2f 100644 --- a/libclc/generic/include/clc/atom_decl_int32.inc +++ b/libclc/generic/include/clc/atom_decl_int32.inc @@ -1,5 +1,5 @@ #define __CLC_DECLARE_ATOM(ADDRSPACE, TYPE) \ - _CLC_OVERLOAD _CLC_DECL TYPE __CLC_FUNCTION (ADDRSPACE TYPE *, TYPE); + _CLC_OVERLOAD _CLC_DECL TYPE __CLC_FUNCTION (volatile ADDRSPACE TYPE *, TYPE); __CLC_DECLARE_ATOM(__CLC_ADDRESS_SPACE, int) __CLC_DECLARE_ATOM(__CLC_ADDRESS_SPACE, uint) diff --git a/libclc/generic/include/clc/cl_khr_global_int32_base_atomics/atom_cmpxchg.h b/libclc/generic/include/clc/cl_khr_global_int32_base_atomics/atom_cmpxchg.h index 168f423396a..d84a9eb58db 100644 --- a/libclc/generic/include/clc/cl_khr_global_int32_base_atomics/atom_cmpxchg.h +++ b/libclc/generic/include/clc/cl_khr_global_int32_base_atomics/atom_cmpxchg.h @@ -1,2 +1,2 @@ -_CLC_OVERLOAD _CLC_DECL int atom_cmpxchg(global int *p, int cmp, int val); -_CLC_OVERLOAD _CLC_DECL unsigned int atom_cmpxchg(global unsigned int *p, unsigned int cmp, unsigned int val); +_CLC_OVERLOAD _CLC_DECL int atom_cmpxchg(volatile global int *p, int cmp, int val); +_CLC_OVERLOAD _CLC_DECL unsigned int atom_cmpxchg(volatile global unsigned int *p, unsigned int cmp, unsigned int val); diff --git a/libclc/generic/include/clc/cl_khr_global_int32_base_atomics/atom_dec.h b/libclc/generic/include/clc/cl_khr_global_int32_base_atomics/atom_dec.h index bbc872ce052..d3c1c45105c 100644 --- a/libclc/generic/include/clc/cl_khr_global_int32_base_atomics/atom_dec.h +++ b/libclc/generic/include/clc/cl_khr_global_int32_base_atomics/atom_dec.h @@ -1,2 +1,2 @@ -_CLC_OVERLOAD _CLC_DECL int atom_dec(global int *p); -_CLC_OVERLOAD _CLC_DECL unsigned int atom_dec(global unsigned int *p); +_CLC_OVERLOAD _CLC_DECL int atom_dec(volatile global int *p); +_CLC_OVERLOAD _CLC_DECL unsigned int atom_dec(volatile global unsigned int *p); diff --git a/libclc/generic/include/clc/cl_khr_global_int32_base_atomics/atom_inc.h b/libclc/generic/include/clc/cl_khr_global_int32_base_atomics/atom_inc.h index 050747c7940..712374d5e49 100644 --- a/libclc/generic/include/clc/cl_khr_global_int32_base_atomics/atom_inc.h +++ b/libclc/generic/include/clc/cl_khr_global_int32_base_atomics/atom_inc.h @@ -1,2 +1,2 @@ -_CLC_OVERLOAD _CLC_DECL int atom_inc(global int *p); -_CLC_OVERLOAD _CLC_DECL unsigned int atom_inc(global unsigned int *p); +_CLC_OVERLOAD _CLC_DECL int atom_inc(volatile global int *p); +_CLC_OVERLOAD _CLC_DECL unsigned int atom_inc(volatile global unsigned int *p); diff --git a/libclc/generic/include/clc/cl_khr_local_int32_base_atomics/atom_cmpxchg.h b/libclc/generic/include/clc/cl_khr_local_int32_base_atomics/atom_cmpxchg.h index e10a84f2cb4..c967d365c46 100644 --- a/libclc/generic/include/clc/cl_khr_local_int32_base_atomics/atom_cmpxchg.h +++ b/libclc/generic/include/clc/cl_khr_local_int32_base_atomics/atom_cmpxchg.h @@ -1,2 +1,2 @@ -_CLC_OVERLOAD _CLC_DECL int atom_cmpxchg(local int *p, int cmp, int val); -_CLC_OVERLOAD _CLC_DECL unsigned int atom_cmpxchg(local unsigned int *p, unsigned int cmp, unsigned int val); +_CLC_OVERLOAD _CLC_DECL int atom_cmpxchg(volatile local int *p, int cmp, int val); +_CLC_OVERLOAD _CLC_DECL unsigned int atom_cmpxchg(volatile local unsigned int *p, unsigned int cmp, unsigned int val); diff --git a/libclc/generic/include/clc/cl_khr_local_int32_base_atomics/atom_dec.h b/libclc/generic/include/clc/cl_khr_local_int32_base_atomics/atom_dec.h index e74d8fc12b9..7bb33c9073a 100644 --- a/libclc/generic/include/clc/cl_khr_local_int32_base_atomics/atom_dec.h +++ b/libclc/generic/include/clc/cl_khr_local_int32_base_atomics/atom_dec.h @@ -1,2 +1,2 @@ -_CLC_OVERLOAD _CLC_DECL int atom_dec(local int *p); -_CLC_OVERLOAD _CLC_DECL unsigned int atom_dec(local unsigned int *p); +_CLC_OVERLOAD _CLC_DECL int atom_dec(volatile local int *p); +_CLC_OVERLOAD _CLC_DECL unsigned int atom_dec(volatile local unsigned int *p); diff --git a/libclc/generic/include/clc/cl_khr_local_int32_base_atomics/atom_inc.h b/libclc/generic/include/clc/cl_khr_local_int32_base_atomics/atom_inc.h index 718f1f2b804..96e6f30a311 100644 --- a/libclc/generic/include/clc/cl_khr_local_int32_base_atomics/atom_inc.h +++ b/libclc/generic/include/clc/cl_khr_local_int32_base_atomics/atom_inc.h @@ -1,2 +1,2 @@ -_CLC_OVERLOAD _CLC_DECL int atom_inc(local int *p); -_CLC_OVERLOAD _CLC_DECL unsigned int atom_inc(local unsigned int *p); +_CLC_OVERLOAD _CLC_DECL int atom_inc(volatile local int *p); +_CLC_OVERLOAD _CLC_DECL unsigned int atom_inc(volatile local unsigned int *p); |
