Introduce dedicated OPDI_SINGLE_COPYPRIVATE and OPDI_SINGLE_COPYPRIVATE_NOWAIT macros.

Additions to syntax file.
Adapt tests.

Author: jblueh

include/opdi/backend/macro/macros.hpp

@@ -64,6 +64,35 @@
 #define OPDI_SINGLE(...) \
   { \
     bool constexpr opdiInternalBarrierIndicator = true; \
+    bool constexpr opdiInternalBroadcastIndicator = false; \
+    void* opdiInternalTapePosition1;  /* for consistency with the end macro */ \
+    void* opdiInternalTapePosition2; \
+    OPDI_UNUSED(opdiInternalTapePosition1); \
+    OPDI_UNUSED(opdiInternalTapePosition2); \
+    opdi::ImplicitBarrierTools::beginRegionWithImplicitBarrier(); \
+    { \
+      opdi::SingleProbe localSingleProbe;  /* worksharing events */ \
+      OPDI_PRAGMA(omp single __VA_ARGS__) \
+      {
+
+#define OPDI_SINGLE_NOWAIT(...) \
+  { \
+    bool constexpr opdiInternalBarrierIndicator = false; \
+    bool constexpr opdiInternalBroadcastIndicator = false; \
+    void* opdiInternalTapePosition1;  /* for consistency with the end macro */ \
+    void* opdiInternalTapePosition2; \
+    OPDI_UNUSED(opdiInternalTapePosition1); \
+    OPDI_UNUSED(opdiInternalTapePosition2); \
+    opdi::ImplicitBarrierTools::beginRegionWithImplicitBarrier(); \
+    { \
+      opdi::SingleProbe localSingleProbe;  /* worksharing events */ \
+      OPDI_PRAGMA(omp single nowait __VA_ARGS__) \
+      {
+
+#define OPDI_SINGLE_COPYPRIVATE(...) \
+  { \
+    bool constexpr opdiInternalBarrierIndicator = true; \
+    bool constexpr opdiInternalBroadcastIndicator = true; \
     void* opdiInternalTapePosition1 = opdi::tool->allocPosition(); \
     opdi::tool->getTapePosition(opdi::tool->getThreadLocalTape(), opdiInternalTapePosition1); \
     /* broadcast-related barrier */ \
@@ -81,9 +110,10 @@
         /* delay broadcast-related barrier for executor */ \
         opdi::tool->erase(opdi::tool->getThreadLocalTape(), opdiInternalTapePosition1, opdiInternalTapePosition2);
 
-#define OPDI_SINGLE_NOWAIT(...) \
+#define OPDI_SINGLE_COPYPRIVATE_NOWAIT(...) \
   { \
     bool constexpr opdiInternalBarrierIndicator = false; \
+    bool constexpr opdiInternalBroadcastIndicator = true; \
     void* opdiInternalTapePosition1 = opdi::tool->allocPosition(); \
     opdi::tool->getTapePosition(opdi::tool->getThreadLocalTape(), opdiInternalTapePosition1); \
     /* broadcast-related barrier */ \
@@ -103,14 +133,18 @@
 
 #define OPDI_END_SINGLE \
         /* broadcast-related barrier */ \
-        opdi::logic->onSyncRegion(opdi::LogicInterface::SyncRegionKind::BarrierImplementation, \
-                                  opdi::LogicInterface::ScopeEndpoint::Begin); \
-        opdi::logic->onSyncRegion(opdi::LogicInterface::SyncRegionKind::BarrierImplementation, \
-                                  opdi::LogicInterface::ScopeEndpoint::End); \
+        if (opdiInternalBroadcastIndicator) { \
+          opdi::logic->onSyncRegion(opdi::LogicInterface::SyncRegionKind::BarrierImplementation, \
+                                    opdi::LogicInterface::ScopeEndpoint::Begin); \
+          opdi::logic->onSyncRegion(opdi::LogicInterface::SyncRegionKind::BarrierImplementation, \
+                                    opdi::LogicInterface::ScopeEndpoint::End); \
+        } \
       } \
     } \
-    opdi::tool->freePosition(opdiInternalTapePosition1); \
-    opdi::tool->freePosition(opdiInternalTapePosition2); \
+    if (opdiInternalBroadcastIndicator) { \
+      opdi::tool->freePosition(opdiInternalTapePosition1); \
+      opdi::tool->freePosition(opdiInternalTapePosition2); \
+    } \
     /* implicit barrier */ \
     opdi::ImplicitBarrierTools::implicitBarrierStack.top() = opdiInternalBarrierIndicator; \
     opdi::ImplicitBarrierTools::endRegionWithImplicitBarrier(); \

include/opdi/backend/ompt/macros.hpp

@@ -48,6 +48,12 @@
 #define OPDI_SINGLE_NOWAIT(...) \
   OPDI_PRAGMA(omp single nowait __VA_ARGS__)
 
+#define OPDI_SINGLE_COPYPRIVATE(...) \
+  OPDI_PRAGMA(omp single __VA_ARGS__)
+
+#define OPDI_SINGLE_COPYPRIVATE_NOWAIT(...) \
+  OPDI_PRAGMA(omp single nowait __VA_ARGS__)
+
 #define OPDI_END_SINGLE
 
 #define OPDI_NOWAIT nowait

include/opdi/helpers/emptyMacros.hpp

@@ -36,6 +36,8 @@
 
 #define OPDI_SINGLE(...)
 #define OPDI_SINGLE_NOWAIT(...)
+#define OPDI_SINGLE_COPYPRIVATE(...)
+#define OPDI_SINGLE_COPYPRIVATE_NOWAIT(...)
 #define OPDI_END_SINGLE
 
 #define OPDI_NOWAIT

include/opdi/helpers/undefineMacros.hpp

@@ -34,6 +34,8 @@
 
 #undef OPDI_SINGLE
 #undef OPDI_SINGLE_NOWAIT
+#undef OPDI_SINGLE_COPYPRIVATE
+#undef OPDI_SINGLE_COPYPRIVATE_NOWAIT
 #undef OPDI_END_SINGLE
 
 #undef OPDI_NOWAIT

syntax/opdi.syntax.json

@@ -6,8 +6,11 @@
     "OPDI_SECTIONS": "OPDI_END_SECTIONS",
     "OPDI_SINGLE": "OPDI_END_SINGLE",
     "OPDI_SINGLE_NOWAIT": "OPDI_END_SINGLE",
+    "OPDI_SINGLE_COPYPRIVATE": "OPDI_END_SINGLE",
+    "OPDI_SINGLE_COPYPRIVATE_NOWAIT": "OPDI_END_SINGLE",
     "OPDI_CRITICAL": "OPDI_END_CRITICAL",
     "OPDI_CRITICAL_NAME": "OPDI_END_CRITICAL",
+    "OPDI_CRITICAL_NAME_ARGS": "OPDI_END_CRITICAL",
     "OPDI_ORDERED": "OPDI_END_ORDERED",
     "OPDI_SECTION": "OPDI_END_SECTION",
     "OPDI_MASTER": "OPDI_END_MASTER",

tests/tests/TestSingleCopyprivate.hpp

@@ -53,7 +53,7 @@ struct TestSingleCopyprivate : public TestBase<4, 1, 3, TestSingleCopyprivate<_C
 
         OPDI_BARRIER()
 
-        OPDI_SINGLE(copyprivate(helper))
+        OPDI_SINGLE_COPYPRIVATE(copyprivate(helper))
         {
           for (int i = 0; i < N; ++i) {
             helper = sin(jobResults[i]);