Refactor Master -> Masked in the logic layer.

Also regards instrumentation.
MasterOmpLogic -> MaskedOmpLogic
onMaster -> onMasked
reverseMaster -> reverseMasked
MAST -> MASK

Author: jblueh

include/opdi/backend/macro/macros.hpp

@@ -149,10 +149,10 @@
   #define OPDI_MASTER(...) \
     OPDI_PRAGMA(omp master __VA_ARGS__) \
     { \
-      opdi::logic->onMaster(opdi::LogicInterface::ScopeEndpoint::Begin);
+      opdi::logic->onMasked(opdi::LogicInterface::ScopeEndpoint::Begin);
 
   #define OPDI_END_MASTER \
-      opdi::logic->onMaster(opdi::LogicInterface::ScopeEndpoint::End); \
+      opdi::logic->onMasked(opdi::LogicInterface::ScopeEndpoint::End); \
     }
 #else
   #define OPDI_MASTER(...) \

include/opdi/backend/ompt/masterCallbacks.hpp

@@ -54,7 +54,7 @@ namespace opdi {
           endpoint = LogicInterface::ScopeEndpoint::End;
         }
 
-        logic->onMaster(endpoint);
+        logic->onMasked(endpoint);
       }
 
     protected:

include/opdi/logic/logicInterface.hpp

@@ -73,7 +73,7 @@ namespace opdi {
 
       virtual void onWork(WorksharingKind kind, ScopeEndpoint endpoint) = 0;
 
-      virtual void onMaster(ScopeEndpoint endpoint) = 0;
+      virtual void onMasked(ScopeEndpoint endpoint) = 0;
 
       virtual void onSyncRegion(SyncRegionKind kind, ScopeEndpoint endpoint) = 0;
 

include/opdi/logic/omp/instrument/ompLogicInstrumentInterface.hpp

@@ -30,7 +30,7 @@
 
 #include "../../logicInterface.hpp"
 #include "../implicitTaskOmpLogic.hpp"
-#include "../masterOmpLogic.hpp"
+#include "../maskedOmpLogic.hpp"
 #include "../mutexOmpLogic.hpp"
 #include "../parallelOmpLogic.hpp"
 #include "../syncRegionOmpLogic.hpp"
@@ -68,8 +68,8 @@ namespace opdi {
       virtual void reverseWork(WorkOmpLogic::Data* /*data*/) {}
       virtual void onWork(LogicInterface::WorksharingKind /*kind*/, LogicInterface::ScopeEndpoint /*endpoint*/) {}
 
-      virtual void reverseMaster(MasterOmpLogic::Data* /*data*/) {}
-      virtual void onMaster(LogicInterface::ScopeEndpoint /*endpoint*/) {}
+      virtual void reverseMasked(MaskedOmpLogic::Data* /*data*/) {}
+      virtual void onMasked(LogicInterface::ScopeEndpoint /*endpoint*/) {}
 
       virtual void onSetAdjointAccessMode(LogicInterface::AdjointAccessMode /*adjointAccess*/) {}
   };

include/opdi/logic/omp/instrument/ompLogicOutputInstrument.hpp

@@ -194,12 +194,12 @@ namespace opdi {
         TapedOutput::print("F WORK t", omp_get_thread_num(), "kind", kind, "endp", endpoint);
       }
 
-      virtual void reverseMaster(MasterOmpLogic::Data* data) {
-        TapedOutput::print("R MAST t", omp_get_thread_num(), "endp", data->endpoint);
+      virtual void reverseMasked(MaskedOmpLogic::Data* data) {
+        TapedOutput::print("R MASK t", omp_get_thread_num(), "endp", data->endpoint);
       }
 
-      virtual void onMaster(LogicInterface::ScopeEndpoint endpoint) {
-        TapedOutput::print("F MAST t", omp_get_thread_num(), "endp", endpoint);
+      virtual void onMasked(LogicInterface::ScopeEndpoint endpoint) {
+        TapedOutput::print("F MASK t", omp_get_thread_num(), "endp", endpoint);
       }
 
       virtual void onSetAdjointAccessMode(LogicInterface::AdjointAccessMode adjointAccess) {

include/opdi/logic/omp/masterOmpLogic.cpp include/opdi/logic/omp/maskedOmpLogic.cppinclude/opdi/logic/omp/masterOmpLogic.cpp renamed to include/opdi/logic/omp/maskedOmpLogic.cpp

@@ -31,42 +31,42 @@
 
 #include "instrument/ompLogicInstrumentInterface.hpp"
 
-#include "masterOmpLogic.hpp"
+#include "maskedOmpLogic.hpp"
 
-void opdi::MasterOmpLogic::reverseFunc(void *dataPtr) {
+void opdi::MaskedOmpLogic::reverseFunc(void *dataPtr) {
 
   #if OPDI_OMP_LOGIC_INSTRUMENT
     Data* data = static_cast<Data*>(dataPtr);
     for (auto& instrument : ompLogicInstruments) {
-      instrument->reverseMaster(data);
+      instrument->reverseMasked(data);
     }
   #else
     OPDI_UNUSED(dataPtr);
   #endif
 }
 
-void opdi::MasterOmpLogic::deleteFunc(void* dataPtr) {
+void opdi::MaskedOmpLogic::deleteFunc(void* dataPtr) {
 
   Data* data = static_cast<Data*>(dataPtr);
   delete data;
 }
 
-void opdi::MasterOmpLogic::onMaster(ScopeEndpoint endpoint) {
+void opdi::MaskedOmpLogic::onMasked(ScopeEndpoint endpoint) {
 
   #if OPDI_OMP_LOGIC_INSTRUMENT
     if (tool->getThreadLocalTape() != nullptr && tool->isActive(tool->getThreadLocalTape())) {
 
         for (auto& instrument : ompLogicInstruments) {
-          instrument->onMaster(endpoint);
+          instrument->onMasked(endpoint);
         }
 
         Data* data = new Data;
         data->endpoint = endpoint;
 
         Handle* handle = new Handle;
         handle->data = static_cast<void*>(data);
-        handle->reverseFunc = MasterOmpLogic::reverseFunc;
-        handle->deleteFunc = MasterOmpLogic::deleteFunc;
+        handle->reverseFunc = MaskedOmpLogic::reverseFunc;
+        handle->deleteFunc = MaskedOmpLogic::deleteFunc;
         tool->pushExternalFunction(tool->getThreadLocalTape(), handle);
     }
   #else

include/opdi/logic/omp/masterOmpLogic.hpp include/opdi/logic/omp/maskedOmpLogic.hppinclude/opdi/logic/omp/masterOmpLogic.hpp renamed to include/opdi/logic/omp/maskedOmpLogic.hpp

@@ -29,7 +29,7 @@
 
 namespace opdi {
 
-  struct MasterOmpLogic : public virtual LogicInterface {
+  struct MaskedOmpLogic : public virtual LogicInterface {
     public:
 
       using LogicInterface::ScopeEndpoint;
@@ -45,6 +45,6 @@ namespace opdi {
 
     public:
 
-      virtual void onMaster(ScopeEndpoint endpoint);
+      virtual void onMasked(ScopeEndpoint endpoint);
   };
 }

include/opdi/logic/omp/ompLogic.cpp

@@ -38,7 +38,7 @@
 std::list<opdi::OmpLogicInstrumentInterface*> opdi::ompLogicInstruments;
 
 #include "implicitTaskOmpLogic.cpp"
-#include "masterOmpLogic.cpp"
+#include "maskedOmpLogic.cpp"
 #include "mutexOmpLogic.cpp"
 #include "parallelOmpLogic.cpp"
 #include "syncRegionOmpLogic.cpp"

include/opdi/logic/omp/ompLogic.hpp

@@ -34,7 +34,7 @@
 
 #include "flushOmpLogic.hpp"
 #include "implicitTaskOmpLogic.hpp"
-#include "masterOmpLogic.hpp"
+#include "maskedOmpLogic.hpp"
 #include "mutexOmpLogic.hpp"
 #include "parallelOmpLogic.hpp"
 #include "syncRegionOmpLogic.hpp"
@@ -44,7 +44,7 @@ namespace opdi {
 
   struct OmpLogic : public FlushOmpLogic,
                     public ImplicitTaskOmpLogic,
-                    public MasterOmpLogic,
+                    public MaskedOmpLogic,
                     public MutexOmpLogic,
                     public ParallelOmpLogic,
                     public SyncRegionOmpLogic,