[Openmp-commits] [openmp] f52927c - Revert "[OpenMP][FIX] Explicit barriers in SPMD mode are not aligned"

[Jon Chesterfield via Openmp-commits]

Author: Jon Chesterfield
Date: 2022-02-01T14:56:59Z
New Revision: f52927c122edd7d237eb4adafd31eba93342923c

URL: https://github.com/llvm/llvm-project/commit/f52927c122edd7d237eb4adafd31eba93342923c
DIFF: https://github.com/llvm/llvm-project/commit/f52927c122edd7d237eb4adafd31eba93342923c.diff

LOG: Revert "[OpenMP][FIX] Explicit barriers in SPMD mode are not aligned"

This seems to be the root cause of hangs on amdgpu. Reverting while investigating.
This reverts commit 7b9844cc8dd0045f5251450ba2980d6d6ac48ef9.

Added: 
    

Modified: 
    openmp/libomptarget/DeviceRTL/src/Synchronization.cpp

Removed: 
    


################################################################################
diff  --git a/openmp/libomptarget/DeviceRTL/src/Synchronization.cpp b/openmp/libomptarget/DeviceRTL/src/Synchronization.cpp
index 2deee6dfc2e9a..6b4bab0bcbb20 100644
--- a/openmp/libomptarget/DeviceRTL/src/Synchronization.cpp
+++ b/openmp/libomptarget/DeviceRTL/src/Synchronization.cpp
@@ -336,6 +336,9 @@ void __kmpc_barrier(IdentTy *Loc, int32_t TId) {
   if (mapping::isMainThreadInGenericMode())
     return __kmpc_flush(Loc);
 
+  if (mapping::isSPMDMode())
+    return __kmpc_barrier_simple_spmd(Loc, TId);
+
   impl::namedBarrier();
 }