Add getOrderedIdentifier to backend layer.

Address of parallel data as wait identifier for ordered construct (macro backend).

Author: jblueh

include/opdi/backend/backendInterface.hpp

@@ -42,6 +42,7 @@ namespace opdi {
       virtual std::size_t getNestLockIdentifier(omp_nest_lock_t* lock) = 0;
       virtual std::size_t getCriticalIdentifier(std::string const& name) = 0;
       virtual std::size_t getReductionIdentifier() = 0;
+      virtual std::size_t getOrderedIdentifier() = 0;
 
       virtual void* getParallelData() = 0;
       virtual void* getTaskData() = 0;

include/opdi/backend/macro/macros.hpp

@@ -181,10 +181,10 @@
 #define OPDI_ORDERED(...) \
   OPDI_PRAGMA(omp ordered __VA_ARGS__) \
   { \
-    opdi::logic->onMutexAcquired(opdi::LogicInterface::MutexKind::Ordered, 0);
+    opdi::logic->onMutexAcquired(opdi::LogicInterface::MutexKind::Ordered, opdi::backend->getOrderedIdentifier());
 
 #define OPDI_END_ORDERED \
-    opdi::logic->onMutexReleased(opdi::LogicInterface::MutexKind::Ordered, 0); \
+    opdi::logic->onMutexReleased(opdi::LogicInterface::MutexKind::Ordered, opdi::backend->getOrderedIdentifier()); \
   }
 
 #define OPDI_SECTION(...) \

include/opdi/backend/macro/mutexIdentifiers.hpp

@@ -49,6 +49,14 @@ namespace opdi {
         omp_destroy_lock(&this->criticalLock);
       }
 
+      std::size_t getLockIdentifier(omp_lock_t* lock) {
+        return reinterpret_cast<std::size_t>(lock);
+      }
+
+      std::size_t getNestLockIdentifier(omp_nest_lock_t* lock) {
+        return reinterpret_cast<std::size_t>(lock);
+      }
+
       std::size_t getCriticalIdentifier(std::string const& name) {
         // unnamed critical region has index 0
         if (name.empty()) {
@@ -69,12 +77,8 @@ namespace opdi {
         return reinterpret_cast<std::size_t>(opdi::backend->getParallelData());
       }
 
-      std::size_t getLockIdentifier(omp_lock_t* lock) {
-        return reinterpret_cast<std::size_t>(lock);
-      }
-
-      std::size_t getNestLockIdentifier(omp_nest_lock_t* lock) {
-        return reinterpret_cast<std::size_t>(lock);
+      std::size_t getOrderedIdentifier() {
+        return reinterpret_cast<std::size_t>(opdi::backend->getParallelData());
       }
   };
 

include/opdi/backend/ompt/omptBackend.hpp

@@ -164,14 +164,19 @@ namespace opdi {
 
       std::size_t getCriticalIdentifier(std::string const& name) {
         OPDI_UNUSED(name);
-        OPDI_ERROR("OMPT backend does not support explicit queries of mutex identifiers of critical regions.");
+        OPDI_ERROR("OMPT backend does not support explicit queries of mutex identifiers of critical constructs.");
         return 0;
       }
 
       std::size_t getReductionIdentifier() {
         return reinterpret_cast<std::size_t>(getParallelData());
       }
 
+      std::size_t getOrderedIdentifier() {
+        OPDI_ERROR("OMPT backend does not support explicit queries of mutex identifiers of ordered constructs.");
+        return 0;
+      }
+
       void* getParallelData() {
         ompt_data_t* parallelData;
         int teamSize;