Track adjoint access mode entirely via task data.

Author: jblueh

include/opdi/logic/omp/adjointAccessControl.hpp

@@ -80,7 +80,6 @@ void* opdi::ImplicitTaskOmpLogic::onImplicitTaskBegin(bool initialImplicitTask,
 
       tool->setThreadLocalTape(newTape);
 
-      AdjointAccessControl::pushMode(parallelData->parentAdjointAccessMode);
       data->adjointAccessModes.push_back(parallelData->parentAdjointAccessMode);
 
       parallelData->childTasks[index] = data;
@@ -116,10 +115,6 @@ void opdi::ImplicitTaskOmpLogic::onImplicitTaskEnd(void* dataPtr) {
       }
     #endif
 
-    AdjointAccessMode lastAccessMode = AdjointAccessControl::currentMode();
-    AdjointAccessControl::popMode();
-    AdjointAccessControl::currentMode() = lastAccessMode;
-
     if (!data->initialImplicitTask) {
       tool->setThreadLocalTape(data->oldTape);
 

include/opdi/logic/omp/implicitTaskOmpLogic.cpp

@@ -24,18 +24,11 @@
  */
 
 #include "instrument/ompLogicInstrumentInterface.hpp"
-#include "adjointAccessControl.hpp"
 
 #if OPDI_DEFAULT_ADJOINT_ACCESS_MODE == OPDI_ADJOINT_ACCESS_ATOMIC
-  opdi::LogicInterface::AdjointAccessMode opdi::InitialImplicitTaskAdjointAccessControl::currentAdjointAccess =
-                                                                    opdi::LogicInterface::AdjointAccessMode::Atomic;
-
   opdi::LogicInterface::AdjointAccessMode const opdi::ImplicitTaskOmpLogic::defaultAdjointAccessMode
       = opdi::LogicInterface::AdjointAccessMode::Atomic;
 #elif OPDI_DEFAULT_ADJOINT_ACCESS_MODE == OPDI_ADJOINT_ACCESS_CLASSICAL
-  opdi::LogicInterface::AdjointAccessMode opdi::InitialImplicitTaskAdjointAccessControl::currentAdjointAccess
-      = opdi::LogicInterface::AdjointAccessMode::Classical;
-
   opdi::LogicInterface::AdjointAccessMode const opdi::ImplicitTaskOmpLogic::defaultAdjointAccessMode
       = opdi::LogicInterface::AdjointAccessMode::Classical;
 #else

include/opdi/logic/omp/ompLogic.cpp

@@ -133,24 +133,17 @@ void opdi::ParallelOmpLogic::deleteFunc(void* dataPtr) {
 }
 
 opdi::LogicInterface::AdjointAccessMode opdi::ParallelOmpLogic::internalGetAdjointAccessMode(void* taskDataPtr) const {
-  if (taskDataPtr == nullptr) {  // initial implicit task
-    return InitialImplicitTaskAdjointAccessControl::currentMode();
-  }
-  else {
-    ImplicitTaskOmpLogic::Data* taskData = reinterpret_cast<ImplicitTaskOmpLogic::Data*>(taskDataPtr);
-
-    return taskData->adjointAccessModes.back();
-  }
+  ImplicitTaskOmpLogic::Data* taskData = reinterpret_cast<ImplicitTaskOmpLogic::Data*>(taskDataPtr);
+  return taskData->adjointAccessModes.back();
 }
 
 void opdi::ParallelOmpLogic::internalSetAdjointAccessMode(void* taskDataPtr, AdjointAccessMode mode) {
+  ImplicitTaskOmpLogic::Data* taskData = reinterpret_cast<ImplicitTaskOmpLogic::Data*>(taskDataPtr);
 
-  if (taskDataPtr == nullptr) {  // initial implicit task
-    InitialImplicitTaskAdjointAccessControl::currentMode() = mode;
+  if (taskData->initialImplicitTask) {
+    taskData->adjointAccessModes.back() = mode;
   }
   else {
-    ImplicitTaskOmpLogic::Data* taskData = reinterpret_cast<ImplicitTaskOmpLogic::Data*>(taskDataPtr);
-
     taskData->adjointAccessModes.push_back(mode);
     taskData->positions.push_back(tool->allocPosition());
     tool->getTapePosition(taskData->tape, taskData->positions.back());
@@ -245,31 +238,15 @@ void opdi::ParallelOmpLogic::setAdjointAccessMode(opdi::LogicInterface::AdjointA
       }
     #endif
 
-    void* parallelDataPtr = backend->getParallelData();
-    void* taskDataPtr = nullptr;
-
-    if (parallelDataPtr != nullptr) {  // not initial implicit task
-      Data* parallelData = reinterpret_cast<Data*>(parallelDataPtr);
-      taskDataPtr = parallelData->childTasks[omp_get_thread_num()];
-    }
-
-    assert(taskDataPtr == nullptr || ((ImplicitTaskOmpLogic::Data*)taskDataPtr)->tape == tool->getThreadLocalTape());
-
+    void* taskDataPtr = backend->getTaskData();
+    assert(taskDataPtr != nullptr);
     internalSetAdjointAccessMode(taskDataPtr, mode);
   #endif
 }
 
 opdi::LogicInterface::AdjointAccessMode opdi::ParallelOmpLogic::getAdjointAccessMode() const {
-  void* parallelDataPtr = backend->getParallelData();
-  void* taskDataPtr = nullptr;
-
-  if (parallelDataPtr != nullptr) {  // not initial implicit task
-    Data* parallelData = reinterpret_cast<Data*>(parallelDataPtr);
-    taskDataPtr = parallelData->childTasks[omp_get_thread_num()];
-  }
-
-  assert(taskDataPtr == nullptr || ((ImplicitTaskOmpLogic::Data*)taskDataPtr)->tape == tool->getThreadLocalTape());
-
+  void* taskDataPtr = backend->getTaskData();
+  assert(taskDataPtr != nullptr);
   return internalGetAdjointAccessMode(taskDataPtr);
 }
 

include/opdi/logic/omp/parallelOmpLogic.cpp

@@ -31,12 +31,9 @@
 
 #include "../logicInterface.hpp"
 
-#include "adjointAccessControl.hpp"
-
 namespace opdi {
 
-  struct ParallelOmpLogic : public InitialImplicitTaskAdjointAccessControl,
-                            public virtual LogicInterface,
+  struct ParallelOmpLogic : public virtual LogicInterface,
                             public virtual TapePool {
     public: