Move treatment for parallel + firstprivate to the logic layer.

Transfer recordings to active parallel regions only.

Author: jblueh

include/opdi/backend/macro/probes.hpp

@@ -41,48 +41,19 @@ namespace opdi {
 
       void* parallelData;
       void* taskData;
-      void* masterPosition;
       bool needsAction;
 
-      TaskProbe() : parallelData(nullptr), taskData(nullptr), needsAction(false) {
-        this->masterPosition = tool->allocPosition();
-        opdi::tool->getTapePosition(tool->getThreadLocalTape(), this->masterPosition);
-      }
+      TaskProbe() : parallelData(nullptr), taskData(nullptr), needsAction(false) {}
 
-      TaskProbe(void* parallelData) : parallelData(parallelData), taskData(nullptr), needsAction(false) {
-        this->masterPosition = tool->allocPosition();
-        tool->getTapePosition(tool->getThreadLocalTape(), this->masterPosition);
-      }
+      TaskProbe(void* parallelData) : parallelData(parallelData), taskData(nullptr), needsAction(false) {}
 
       TaskProbe(TaskProbe const& other) : parallelData(other.parallelData), needsAction(true) {
 
-        this->masterPosition = tool->allocPosition();
-        if (omp_get_thread_num() == 0) {
-          tool->copyPosition(this->masterPosition, other.masterPosition);
-        }
-        else {
-          tool->getZeroPosition(tool->getThreadLocalTape(), this->masterPosition);
-        }
-
-        void* oldTape = tool->getThreadLocalTape();
-
-        void* currentPosition = tool->allocPosition();
-        tool->getTapePosition(oldTape, currentPosition);
-
         DataTools::pushParallelData(this->parallelData);
         this->taskData = logic->onImplicitTaskBegin(false, omp_get_num_threads(), omp_get_thread_num(),
                                                     this->parallelData);
         DataTools::pushTaskData(this->taskData);
 
-        // check if copy statements have been recorded before the correct tape was set
-        // if so, move them to the correct tape
-        if (tool->comparePosition(currentPosition, masterPosition) > 0) {
-          tool->append(tool->getThreadLocalTape(), oldTape, masterPosition, currentPosition);
-          tool->erase(oldTape, masterPosition, currentPosition);
-        }
-
-        tool->freePosition(currentPosition);
-
         ProbeScopeStatus::beginImplicitTaskProbeScope();
       }
 
@@ -93,8 +64,6 @@ namespace opdi {
           DataTools::popTaskData();
           DataTools::popParallelData();
         }
-
-        tool->freePosition(this->masterPosition);
       }
   };
 

include/opdi/logic/omp/implicitTaskOmpLogic.cpp

@@ -90,6 +90,32 @@ void* opdi::ImplicitTaskOmpLogic::onImplicitTaskBegin(bool isInitialImplicitTask
       implicitTaskData->adjointAccessModes.push_back(parallelData->encounteringTaskAdjointAccessMode);
 
       parallelData->childTaskData[indexInTeam] = implicitTaskData;
+
+      // check for copies due to firstprivate/copyin that were recorded on the wrong tapes
+      // move them to the correct tapes if needed
+
+      void* oldTapePosition = tool->allocPosition();
+      tool->getTapePosition(implicitTaskData->oldTape, oldTapePosition);
+
+      void* referencePosition = tool->allocPosition();
+      if (indexInTeam == 0) {
+        tool->copyPosition(referencePosition, parallelData->encounteringTaskTapePosition);
+      }
+      else {
+        tool->getZeroPosition(implicitTaskData->oldTape, referencePosition);
+      }
+
+      if (tool->comparePosition(oldTapePosition, referencePosition) > 0) {
+        // appending to new tape depends on activity
+        if (parallelData->isActiveParallelRegion) {
+          tool->append(newTape, implicitTaskData->oldTape, referencePosition, oldTapePosition);
+        }
+        // erasing on old tape does not (non-primary threads have active default tapes to not miss such copies)
+        tool->erase(implicitTaskData->oldTape, referencePosition, oldTapePosition);
+      }
+
+      tool->freePosition(referencePosition);
+      tool->freePosition(oldTapePosition);
     }
     else {
       implicitTaskData->oldTape = nullptr;

include/opdi/logic/omp/parallelOmpLogic.cpp

@@ -136,6 +136,8 @@ void opdi::ParallelOmpLogic::deleteFunc(void* parallelDataPtr) {
 
   --ParallelOmpLogic::skipParallelHandling;
 
+  tool->freePosition(parallelData->encounteringTaskTapePosition);
+
   // delete data of the parallel region
   delete parallelData;
 }
@@ -180,6 +182,8 @@ void* opdi::ParallelOmpLogic::onParallelBegin(void* encounteringTaskDataPtr, int
     parallelData->isActiveParallelRegion = tool->isActive(tool->getThreadLocalTape());
     parallelData->encounteringTaskData = encounteringTaskData;
     parallelData->encounteringTaskTape = tool->getThreadLocalTape();
+    parallelData->encounteringTaskTapePosition = tool->allocPosition();
+    tool->getTapePosition(parallelData->encounteringTaskTape, parallelData->encounteringTaskTapePosition);
     parallelData->encounteringTaskAdjointAccessMode = internalGetAdjointAccessMode(encounteringTaskData);
     parallelData->childTaskData.resize(maximumSizeOfTeam);
 

include/opdi/logic/omp/parallelOmpLogic.hpp

@@ -42,6 +42,7 @@ namespace opdi {
       bool isActiveParallelRegion;
       ImplicitTaskData* encounteringTaskData;
       void* encounteringTaskTape;
+      void* encounteringTaskTapePosition;
       LogicInterface::AdjointAccessMode encounteringTaskAdjointAccessMode;
       std::vector<ImplicitTaskData*> childTaskData;
   };