Shared reading optimization for safe global access macros.

Author: jblueh

Common/include/basic_types/ad_structure.hpp

@@ -546,18 +546,6 @@ FORCEINLINE void EndPassive(bool wasActive) {
   if (wasActive) AD::getTape().setActive();
 }
 
-FORCEINLINE bool PausePreaccumulation() {
-  const auto current = PreaccEnabled;
-  if (!current) return false;
-  SU2_OMP_SAFE_GLOBAL_ACCESS(PreaccEnabled = false;)
-  return true;
-}
-
-FORCEINLINE void ResumePreaccumulation(bool wasActive) {
-  if (!wasActive) return;
-  SU2_OMP_SAFE_GLOBAL_ACCESS(PreaccEnabled = true;)
-}
-
 FORCEINLINE void StartNoSharedReading() {
 #ifdef HAVE_OPDI
   opdi::logic->setAdjointAccessMode(opdi::LogicInterface::AdjointAccessMode::Classical);
@@ -571,6 +559,19 @@ FORCEINLINE void EndNoSharedReading() {
   opdi::logic->addReverseBarrier();
 #endif
 }
+
+FORCEINLINE bool PausePreaccumulation() {
+  const auto current = PreaccEnabled;
+  if (!current) return false;
+  SU2_OMP_SAFE_GLOBAL_ACCESS(PreaccEnabled = false;)
+  return true;
+}
+
+FORCEINLINE void ResumePreaccumulation(bool wasActive) {
+  if (!wasActive) return;
+  SU2_OMP_SAFE_GLOBAL_ACCESS(PreaccEnabled = true;)
+}
+
 #endif  // CODI_REVERSE_TYPE
 
 void Initialize();

Common/include/parallelization/omp_structure.hpp

@@ -188,12 +188,16 @@ void omp_finalize();
  * thread, with all threads and memory views synchronized both beforehand and afterwards.
  */
 
-#define BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS \
-  SU2_OMP_BARRIER                        \
+#define BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS  \
+  SU2_OMP_BARRIER                         \
+  if (omp_in_parallel())                  \
+    AD::StartNoSharedReading();           \
   SU2_OMP_MASTER
 
-#define END_SU2_OMP_SAFE_GLOBAL_ACCESS \
-  END_SU2_OMP_MASTER                   \
+#define END_SU2_OMP_SAFE_GLOBAL_ACCESS  \
+  END_SU2_OMP_MASTER                    \
+  if (omp_in_parallel())                \
+    AD::EndNoSharedReading();           \
   SU2_OMP_BARRIER
 
 #define SU2_OMP_SAFE_GLOBAL_ACCESS(...) BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS{__VA_ARGS__} END_SU2_OMP_SAFE_GLOBAL_ACCESS