Simplify treatment of reductions in the macro backend.

Closer to how we treat implicit barriers.
Avoid dependencies on probe order.
ReductionProbe only indicates that clauses are present.
ProbeScopeStatus no longer needed.

Author: jblueh

include/opdi/backend/macro/macroBackend.cpp

@@ -36,16 +36,16 @@ std::stack<bool> opdi::ImplicitBarrierTools::implicitBarrierStack;
 
 omp_lock_t opdi::ReductionTools::globalReducerLock;
 std::list<omp_nest_lock_t*> opdi::ReductionTools::individualReducerLocks;
-std::stack<bool> opdi::ReductionTools::reductionBarrierStack;
+std::stack<bool> opdi::ReductionTools::hasReductions;
+std::stack<bool> opdi::ReductionTools::needsBarrierBeforeReductions;
+std::stack<bool> opdi::ReductionTools::needsBarrierAfterReductions;
 
 template<typename Type, int identifier>
 omp_nest_lock_t opdi::Reducer<Type, identifier>::reduceLock;
 
 template<typename Type, int identifier>
 bool opdi::Reducer<Type, identifier>::isInitialized = false;
 
-std::stack<opdi::ProbeScopeStatus::Status> opdi::ProbeScopeStatus::statusStack;
-
 // global macro backend variables
 
 opdi::LoopProbe opdi::internalLoopProbe(0);

include/opdi/backend/macro/macroBackend.hpp

@@ -45,7 +45,6 @@
 #include "macros.hpp"
 #include "mutexIdentifiers.hpp"
 #include "probes.hpp"
-#include "probeTools.hpp"
 #include "reductionTools.hpp"
 
 namespace opdi {

include/opdi/backend/macro/macros.hpp

@@ -49,16 +49,20 @@
 
 #define OPDI_FOR(...) \
   opdi::ImplicitBarrierTools::beginRegionWithImplicitBarrier(); \
+  opdi::ReductionTools::beginRegionThatSupportsReductions(true); \
   OPDI_PRAGMA(omp for __VA_ARGS__ private(opdi::internalLoopProbe))
 
 #define OPDI_END_FOR \
+  opdi::ReductionTools::endRegionThatSupportsReductions(); \
   opdi::ImplicitBarrierTools::endRegionWithImplicitBarrier();
 
 #define OPDI_SECTIONS(...) \
   opdi::ImplicitBarrierTools::beginRegionWithImplicitBarrier(); \
+  opdi::ReductionTools::beginRegionThatSupportsReductions(true); \
   OPDI_PRAGMA(omp sections private(opdi::internalSectionsProbe) __VA_ARGS__)
 
 #define OPDI_END_SECTIONS \
+  opdi::ReductionTools::endRegionThatSupportsReductions(); \
   opdi::ImplicitBarrierTools::endRegionWithImplicitBarrier();
 
 #define OPDI_SINGLE(...) \

include/opdi/backend/macro/probeTools.hpp

@@ -31,7 +31,6 @@
 
 #include "dataTools.hpp"
 #include "implicitBarrierTools.hpp"
-#include "probeTools.hpp"
 #include "reductionTools.hpp"
 
 namespace opdi {
@@ -54,12 +53,13 @@ namespace opdi {
                                                     this->parallelData);
         DataTools::pushTaskData(this->taskData);
 
-        ProbeScopeStatus::beginImplicitTaskProbeScope();
+        ReductionTools::beginRegionThatSupportsReductions(false);
       }
 
       ~TaskProbe() {
         if (needsAction) {
-          ProbeScopeStatus::endImplicitTaskProbeScope();
+          /* order of TaskProbe and ReductionProbe destructors not relevant */
+          ReductionTools::endRegionThatSupportsReductions();
           logic->onImplicitTaskEnd(this->taskData);
           DataTools::popTaskData();
           DataTools::popParallelData();
@@ -103,22 +103,13 @@ namespace opdi {
   struct ReductionProbe {
     public:
 
-      bool needsAction;
-
-      ReductionProbe(int) : needsAction(false) {}
+      ReductionProbe(int) {}
 
-      ReductionProbe() : needsAction(true) {
-        ProbeScopeStatus::beginReductionProbeScope();
-        ReductionTools::beginRegionWithReduction();
+      ReductionProbe() {
+        ReductionTools::regionHasReductions();
       }
 
-      ~ReductionProbe() {
-        if (needsAction) {
-          ReductionTools::addBarrierIfNeeded();
-          ReductionTools::endRegionWithReduction();
-          ProbeScopeStatus::endReductionProbeScope();
-        }
-      }
+      ~ReductionProbe() {}
   };
 
   extern ReductionProbe internalReductionProbe;