Wait identifier for ordered construct (macro backend).

Address of parallel data object serves as wait identifier.
Add getOrderedIdentifier to backend layer.
Further tests for the ordered construct.

Merge branch 'revisit/orderedMacroBackend' into develop

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;

tests/Makefile

@@ -79,7 +79,7 @@ DRIVER_FILES = $(wildcard $(DRIVER_DIR)/Driver**.hpp)
 DRIVERS ?= $(patsubst $(DRIVER_DIR)/Driver%.hpp,%,$(DRIVER_FILES))
 
 # without surrounding parallel directives, privatized variables are not recognized as shared and sections are considered orphaned; hence, they need to be filtered out
-getDriverTests = $(if $(filter FirstOrderReverseNoParallel, $1), $(filter-out ParallelSections ForReduction ForReductionNowait ForReductionMultiple ForFirstprivate ForLastprivate SectionsReduction SectionsReductionMultiple SectionsFirstprivate SectionsLastprivate ReductionNested SingleFirstprivate, $(TESTS)), $(TESTS))
+getDriverTests = $(if $(filter FirstOrderReverseNoParallel, $1), $(filter-out ParallelSections ForReduction ForReductionNowait ForReductionMultiple ForFirstprivate ForLastprivate OrderedReduction SectionsReduction SectionsReductionMultiple SectionsFirstprivate SectionsLastprivate ReductionNested SingleFirstprivate, $(TESTS)), $(TESTS))
 
 DRIVER_TESTS =
 

tests/results/FirstOrderReverseNestedParallelOrderedMultiple.ref

@@ -0,0 +1,18 @@
+Point 0 :
+1122.95
+1131.29
+921.237
+27082.9
+7009.4
+Point 1 :
+1092.78
+25136.7
+11568.7
+-5241.95
+4100.76
+Point 2 :
+584.44
+9331.68
+25714.4
+22086.6
+259415

tests/results/FirstOrderReverseNestedParallelOrderedNowait.ref

@@ -0,0 +1,18 @@
+Point 0 :
+595.487
+177.011
+392.217
+13697.3
+3466.68
+Point 1 :
+579.603
+12167.2
+5538.64
+-2783.46
+1269.94
+Point 2 :
+309.709
+4216.91
+13059.9
+11645.2
+135468

tests/results/FirstOrderReverseNestedParallelOrderedReduction.ref

@@ -0,0 +1,18 @@
+Point 0 :
+284.648
+67.4236
+2287.84
+1024.19
+1103.57
+Point 1 :
+281.379
+10683.2
+8105.08
+1775.5
+2889.52
+Point 2 :
+271.24
+3300.12
+7635.88
+7563.86
+111812

tests/results/FirstOrderReverseNoOpenMPOrderedMultiple.ref

@@ -0,0 +1,18 @@
+Point 0 :
+1122.95
+1131.29
+921.237
+27082.9
+7009.4
+Point 1 :
+1092.78
+25136.7
+11568.7
+-5241.95
+4100.76
+Point 2 :
+584.44
+9331.68
+25714.4
+22086.6
+259415

tests/results/FirstOrderReverseNoOpenMPOrderedNowait.ref

@@ -0,0 +1,18 @@
+Point 0 :
+595.487
+177.011
+392.217
+13697.3
+3466.68
+Point 1 :
+579.603
+12167.2
+5538.64
+-2783.46
+1269.94
+Point 2 :
+309.709
+4216.91
+13059.9
+11645.2
+135468