Skip to content

Replace #pragma omp atomic with GCC/clang builtins #3681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidrohr merged 2 commits into from
Jun 1, 2020
Merged

Replace #pragma omp atomic with GCC/clang builtins #3681

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bf932e
GPU: Replace OpenMP #pragma omp atomic with GCC/clang builtins
davidrohr May 31, 2020
ebcce7f
GPU: Add AtomicCAS
davidrohr May 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 39 additions & 26 deletions GPU/Common/GPUCommonMath.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,13 @@ class GPUCommonMath
{
return GPUCommonMath::AtomicExchInt(addr, val);
}

template <class T>
GPUdi() static T AtomicCAS(GPUglobalref() GPUgeneric() GPUAtomic(T) * addr, T cmp, T val)
{
return GPUCommonMath::AtomicCASInt(addr, cmp, val);
}

template <class T>
GPUdi() static T AtomicAdd(GPUglobalref() GPUgeneric() GPUAtomic(T) * addr, T val)
{
Expand Down Expand Up @@ -138,6 +145,8 @@ class GPUCommonMath
template <class S, class T>
GPUd() static unsigned int AtomicExchInt(S* addr, T val);
template <class S, class T>
GPUd() static T AtomicCASInt(S* addr, T cmp, T val);
template <class S, class T>
GPUd() static unsigned int AtomicAddInt(S* addr, T val);
template <class S, class T>
GPUd() static void AtomicMaxInt(S* addr, T val);
Expand Down Expand Up @@ -367,11 +376,6 @@ GPUhdi() float GPUCommonMath::Copysign(float x, float y)
#endif // GPUCA_GPUCODE
}

#ifndef GPUCA_GPUCODE
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-value" // GCC BUG in omp atomic capture gives false warning
#endif

template <class S, class T>
GPUdi() unsigned int GPUCommonMath::AtomicExchInt(S* addr, T val)
{
Expand All @@ -381,17 +385,34 @@ GPUdi() unsigned int GPUCommonMath::AtomicExchInt(S* addr, T val)
return ::atomic_xchg(addr, val);
#elif defined(GPUCA_GPUCODE) && (defined(__CUDACC__) || defined(__HIPCC__))
return ::atomicExch(addr, val);
#else
#elif defined(WITH_OPENMP)
unsigned int old;
#ifdef WITH_OPENMP
#pragma omp atomic capture
__atomic_exchange(addr, &val, &old, __ATOMIC_SEQ_CST);
return old;
#else
unsigned int old = *addr;
*addr = val;
return old;
#endif
{
old = *addr;
*addr = val;
}
}

template <class S, class T>
GPUdi() T GPUCommonMath::AtomicCASInt(S* addr, T cmp, T val)
{
#if defined(GPUCA_GPUCODE) && defined(__OPENCLCPP__) && (!defined(__clang__) || defined(GPUCA_OPENCL_CPP_CLANG_C11_ATOMICS))
return ::atomic_compare_exchange(addr, cmp, val);
#elif defined(GPUCA_GPUCODE) && defined(__OPENCL__)
return ::atomic_cmpxchg(addr, cmp, val);
#elif defined(GPUCA_GPUCODE) && (defined(__CUDACC__) || defined(__HIPCC__))
return ::atomicCAS(addr, cmp, val);
#elif defined(WITH_OPENMP)
__atomic_compare_exchange(addr, &cmp, &val, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
return cmp;
#else
T old = *addr;
*addr = (old == cmp) ? val : old;
return old;
#endif // GPUCA_GPUCODE
#endif
}

template <class S, class T>
Expand All @@ -403,17 +424,13 @@ GPUdi() unsigned int GPUCommonMath::AtomicAddInt(S* addr, T val)
return ::atomic_add(addr, val);
#elif defined(GPUCA_GPUCODE) && (defined(__CUDACC__) || defined(__HIPCC__))
return ::atomicAdd(addr, val);
#elif defined(WITH_OPENMP)
return __atomic_add_fetch(addr, val, __ATOMIC_SEQ_CST) - val;
#else
unsigned int old;
#ifdef WITH_OPENMP
#pragma omp atomic capture
#endif
{
old = *addr;
*addr += val;
}
unsigned int old = *addr;
*addr += val;
return old;
#endif // GPUCA_GPUCODE
#endif
}

template <class S, class T>
Expand Down Expand Up @@ -456,10 +473,6 @@ GPUdi() void GPUCommonMath::AtomicMinInt(S* addr, T val)
#endif // GPUCA_GPUCODE
}

#ifndef GPUCA_GPUCODE
#pragma GCC diagnostic pop
#endif

#undef CHOICE

#if !defined(__OPENCL__) || defined(__OPENCLCPP__)
Expand Down