Configure sync region endpoints that produce reverse barriers.

Check range of enumeration-like configuration options.

Merge branch 'feature/configurableSyncRegions' into develop

Author: jblueh

include/opdi/config.hpp

@@ -35,6 +35,10 @@
 #define OPDI_ADJOINT_ACCESS_ATOMIC 1
 #define OPDI_ADJOINT_ACCESS_CLASSICAL 2
 
+#define OPDI_SCOPE_ENDPOINT_BEGIN 1
+#define OPDI_SCOPE_ENDPOINT_END 2
+#define OPDI_SCOPE_ENDPOINT_BOTH 3
+
 /* ------------------ configuration ------------------ */
 
 /* logic options */
@@ -51,6 +55,46 @@
   #define OPDI_DEFAULT_ADJOINT_ACCESS_MODE OPDI_ADJOINT_ACCESS_ATOMIC
 #endif
 
+static_assert(0 < OPDI_DEFAULT_ADJOINT_ACCESS_MODE);
+static_assert(OPDI_DEFAULT_ADJOINT_ACCESS_MODE <= 2);
+
+/* sync region behaviour */
+
+#ifndef OPDI_SYNC_REGION_BARRIER_BEHAVIOUR
+  #define OPDI_SYNC_REGION_BARRIER_BEHAVIOUR OPDI_SCOPE_ENDPOINT_BEGIN
+#endif
+
+static_assert(0 < OPDI_SYNC_REGION_BARRIER_BEHAVIOUR);
+static_assert(OPDI_SYNC_REGION_BARRIER_BEHAVIOUR <= 3);
+
+#ifndef OPDI_SYNC_REGION_BARRIER_IMPLICIT_BEHAVIOUR
+  #define OPDI_SYNC_REGION_BARRIER_IMPLICIT_BEHAVIOUR OPDI_SCOPE_ENDPOINT_BEGIN
+#endif
+
+static_assert(0 < OPDI_SYNC_REGION_BARRIER_IMPLICIT_BEHAVIOUR);
+static_assert(OPDI_SYNC_REGION_BARRIER_IMPLICIT_BEHAVIOUR <= 3);
+
+#ifndef OPDI_SYNC_REGION_BARRIER_EXPLICIT_BEHAVIOUR
+  #define OPDI_SYNC_REGION_BARRIER_EXPLICIT_BEHAVIOUR OPDI_SCOPE_ENDPOINT_BEGIN
+#endif
+
+static_assert(0 < OPDI_SYNC_REGION_BARRIER_EXPLICIT_BEHAVIOUR);
+static_assert(OPDI_SYNC_REGION_BARRIER_EXPLICIT_BEHAVIOUR <= 3);
+
+#ifndef OPDI_SYNC_REGION_BARRIER_IMPLEMENTATION_BEHAVIOUR
+  #define OPDI_SYNC_REGION_BARRIER_IMPLEMENTATION_BEHAVIOUR OPDI_SCOPE_ENDPOINT_BOTH
+#endif
+
+static_assert(0 < OPDI_SYNC_REGION_BARRIER_IMPLEMENTATION_BEHAVIOUR);
+static_assert(OPDI_SYNC_REGION_BARRIER_IMPLEMENTATION_BEHAVIOUR <= 3);
+
+#ifndef OPDI_SYNC_REGION_BARRIER_REVERSE_BEHAVIOUR
+  #define OPDI_SYNC_REGION_BARRIER_REVERSE_BEHAVIOUR OPDI_SCOPE_ENDPOINT_BEGIN
+#endif
+
+static_assert(0 < OPDI_SYNC_REGION_BARRIER_REVERSE_BEHAVIOUR);
+static_assert(OPDI_SYNC_REGION_BARRIER_REVERSE_BEHAVIOUR <= 3);
+
 /* error handling options */
 
 #ifndef OPDI_ENABLE_WARNINGS

include/opdi/logic/logicInterface.hpp

@@ -34,17 +34,17 @@ namespace opdi {
     public:
 
       enum MutexKind : std::size_t {
-        Critical, Lock, NestedLock, Ordered, Reduction
+        Critical = 0, Lock, NestedLock, Ordered, Reduction
       };
 
       static constexpr std::size_t nMutexKind = 5;
 
-      enum ScopeEndpoint {
-        Begin, End, BeginEnd
+      enum ScopeEndpoint : std::size_t {
+        Begin = 1, End, BeginEnd
       };
 
-      enum SyncRegionKind {
-        Barrier, BarrierImplicit, BarrierExplicit, BarrierImplementation, BarrierReverse
+      enum SyncRegionKind : std::size_t {
+        Barrier = 1, BarrierImplicit, BarrierExplicit, BarrierImplementation, BarrierReverse
       };
 
       enum WorksharingKind {

include/opdi/logic/omp/syncRegionOmpLogic.cpp

@@ -64,6 +64,22 @@ void opdi::SyncRegionOmpLogic::internalPushHandle(SyncRegionKind kind, ScopeEndp
   tool->pushExternalFunction(tool->getThreadLocalTape(), handle);
 }
 
+bool opdi::SyncRegionOmpLogic::requiresReverseBarrier(SyncRegionKind kind, ScopeEndpoint endpoint) {
+
+  static std::size_t constexpr syncRegionBehaviour[] = {
+      OPDI_SYNC_REGION_BARRIER_BEHAVIOUR,
+      OPDI_SYNC_REGION_BARRIER_IMPLICIT_BEHAVIOUR,
+      OPDI_SYNC_REGION_BARRIER_EXPLICIT_BEHAVIOUR,
+      OPDI_SYNC_REGION_BARRIER_IMPLEMENTATION_BEHAVIOUR,
+      OPDI_SYNC_REGION_BARRIER_REVERSE_BEHAVIOUR
+  };
+
+  assert(1 <= kind && kind <= 5);
+  assert(1 == endpoint || 2 == endpoint);
+
+  return syncRegionBehaviour[kind - 1] & endpoint;
+}
+
 void opdi::SyncRegionOmpLogic::onSyncRegion(SyncRegionKind kind, ScopeEndpoint endpoint) {
 
   #if OPDI_OMP_LOGIC_INSTRUMENT
@@ -73,8 +89,9 @@ void opdi::SyncRegionOmpLogic::onSyncRegion(SyncRegionKind kind, ScopeEndpoint e
   #endif
 
   if (tool->getThreadLocalTape() != nullptr && tool->isActive(tool->getThreadLocalTape())) {
-
-    internalPushHandle(kind, endpoint);
+    if (requiresReverseBarrier(kind, endpoint)) {
+      internalPushHandle(kind, endpoint);
+    }
   }
 }
 

include/opdi/logic/omp/syncRegionOmpLogic.hpp

@@ -25,6 +25,8 @@
 
 #pragma once
 
+#include "../../config.hpp"
+
 #include "../logicInterface.hpp"
 
 namespace opdi {
@@ -41,6 +43,8 @@ namespace opdi {
           ScopeEndpoint endpoint;
       };
 
+      bool requiresReverseBarrier(SyncRegionKind kind, ScopeEndpoint endpoint);
+
     private:
 
       static void reverseFunc(void* dataPtr);