From f52927c122edd7d237eb4adafd31eba93342923c Mon Sep 17 00:00:00 2001
From: Jon Chesterfield <jonathanchesterfield@gmail.com>
Date: Tue, 1 Feb 2022 14:56:14 +0000
Subject: [PATCH] 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.
---
 openmp/libomptarget/DeviceRTL/src/Synchronization.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/openmp/libomptarget/DeviceRTL/src/Synchronization.cpp b/openmp/libomptarget/DeviceRTL/src/Synchronization.cpp
index 2deee6dfc2e9..6b4bab0bcbb2 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();
 }