Assign proper tapes also in passive parallel regions.

Author: jblueh

include/opdi/logic/omp/implicitTaskOmpLogic.cpp

@@ -55,7 +55,10 @@ void* opdi::ImplicitTaskOmpLogic::onImplicitTaskBegin(int actualParallelism, int
     data->parallelData = parallelData;
 
     void* newTape = this->tapePool.getTape(parallelData->masterTape, index);
-    tool->setActive(newTape, true);
+
+    if (parallelData->activeParallelRegion) {
+      tool->setActive(newTape, true);
+    }
 
     data->parallelData->tapes[index] = newTape;
 
@@ -102,7 +105,7 @@ void opdi::ImplicitTaskOmpLogic::onImplicitTaskEnd(void* dataPtr) {
 
     tool->setActive(data->parallelData->tapes[data->index], false);
 
-    if (data->oldTape == data->parallelData->masterTape) {
+    if (data->oldTape == data->parallelData->masterTape && data->parallelData->activeParallelRegion) {
       tool->setActive(data->oldTape, true);
     }
 

include/opdi/logic/omp/parallelOmpLogic.cpp

@@ -114,11 +114,12 @@ void opdi::ParallelOmpLogic::deleteFunc(void* dataPtr) {
 
 void* opdi::ParallelOmpLogic::onParallelBegin(int maxThreads) {
 
-  if (tool->getThreadLocalTape() != nullptr && tool->isActive(tool->getThreadLocalTape())) {
+  if (tool->getThreadLocalTape() != nullptr) {
 
     Data* data = new Data;
 
     data->maxThreads = maxThreads;
+    data->activeParallelRegion = tool->isActive(tool->getThreadLocalTape());
     data->masterTape = tool->getThreadLocalTape();
     data->tapes = new void*[maxThreads]();
     data->positions.resize(maxThreads);
@@ -155,14 +156,19 @@ void opdi::ParallelOmpLogic::onParallelEnd(void* dataPtr) {
       }
     #endif
 
-    Handle* handle = new Handle;
-    handle->data = (void*) data;
-    handle->reverseFunc = ParallelOmpLogic::reverseFunc;
-    handle->deleteFunc = ParallelOmpLogic::deleteFunc;
+    if (data->activeParallelRegion) {
 
-    tool->pushExternalFunction(data->masterTape, handle);
+      Handle* handle = new Handle;
+      handle->data = (void*) data;
+      handle->reverseFunc = ParallelOmpLogic::reverseFunc;
+      handle->deleteFunc = ParallelOmpLogic::deleteFunc;
 
-    // do not delete data, it is deleted with the handle
+      tool->pushExternalFunction(data->masterTape, handle);
+
+      // do not delete data, it is deleted with the handle
+    } else {
+      delete data;
+    }
   }
   #if OPDI_OMP_LOGIC_INSTRUMENT
   else {

include/opdi/logic/omp/parallelOmpLogic.hpp

@@ -47,6 +47,7 @@ namespace opdi {
         public:
           int maxThreads;
           int actualThreads;
+          bool activeParallelRegion;
           void* masterTape;
           void** tapes;
           std::vector<std::deque<void*>> positions;