aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add missing "varying/varying" atomic_compare_exchange_global() functions.

Browse Source
This commit is contained in:
Matt Pharr
2012-02-03 13:19:15 -08:00
parent 83c8650b36
commit c2ecc15b93
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
stdlib.ispc
View File

@@ -1363,6 +1363,14 @@ DEFINE_ATOMIC_SWAP(double,double)
#undef DEFINE_ATOMIC_SWAP #undef DEFINE_ATOMIC_SWAP
#define ATOMIC_DECL_CMPXCHG(TA, TB, MASKTYPE) \ #define ATOMIC_DECL_CMPXCHG(TA, TB, MASKTYPE) \
static inline uniform TA atomic_compare_exchange_global( \
uniform TA * uniform ptr, uniform TA oldval, uniform TA newval) { \
memory_barrier(); \
uniform TA ret = \
__atomic_compare_exchange_uniform_##TB##_global(ptr, oldval, newval); \
memory_barrier(); \
return ret; \
} \
static inline TA atomic_compare_exchange_global( \ static inline TA atomic_compare_exchange_global( \
uniform TA * uniform ptr, TA oldval, TA newval) { \ uniform TA * uniform ptr, TA oldval, TA newval) { \
memory_barrier(); \ memory_barrier(); \
@@ -1371,11 +1379,22 @@ static inline TA atomic_compare_exchange_global( \
memory_barrier(); \ memory_barrier(); \
return ret; \ return ret; \
} \ } \
static inline uniform TA atomic_compare_exchange_global( \ static inline TA atomic_compare_exchange_global( \
uniform TA * uniform ptr, uniform TA oldval, uniform TA newval) { \ uniform TA * varying ptr, TA oldval, TA newval) { \
memory_barrier(); \ uniform TA * uniform ptrArray[programCount]; \
uniform TA ret = \ ptrArray[programIndex] = ptr; \
__atomic_compare_exchange_uniform_##TB##_global(ptr, oldval, newval); \ memory_barrier(); \
TA ret; \
uniform int mask = lanemask(); \
for (uniform int i = 0; i < programCount; ++i) { \
if ((mask & (1 << i)) == 0) \
continue; \
uniform TA r = \
__atomic_compare_exchange_uniform_##TB##_global(ptrArray[i], \
extract(oldval, i), \
extract(newval, i)); \
ret = insert(ret, i, r); \
} \
memory_barrier(); \ memory_barrier(); \
return ret; \ return ret; \
} }