[OpenMP] [OMPT] Use asynchrnous data transfer mode if only callbacks are activated (without tracing).

Change-Id: Ic3497768afefa9fa1c98b4defcfc7fd7a6dfdd7f

Author: dhruvachak

openmp/libomptarget/plugins-nextgen/amdgpu/src/rtl.cpp

@@ -3070,7 +3070,7 @@ struct AMDGPUDeviceTy : public GenericDeviceTy, AMDGenericDeviceTy {
 
     // For large transfers use synchronous behavior.
     // If OMPT is enabled or synchronous behavior is explicitly requested:
-    if (ompt::CallbacksInitialized || OMPX_ForceSyncRegions ||
+    if (ompt::TracingActive || OMPX_ForceSyncRegions ||
         Size >= OMPX_MaxAsyncCopyBytes) {
       if (AsyncInfoWrapper.hasQueue())
         if (auto Err = synchronize(AsyncInfoWrapper))
@@ -3134,7 +3134,7 @@ struct AMDGPUDeviceTy : public GenericDeviceTy, AMDGenericDeviceTy {
 
     // For large transfers use synchronous behavior.
     // If OMPT is enabled or synchronous behavior is explicitly requested:
-    if (ompt::CallbacksInitialized || OMPX_ForceSyncRegions ||
+    if (ompt::TracingActive || OMPX_ForceSyncRegions ||
         Size >= OMPX_MaxAsyncCopyBytes) {
       if (AsyncInfoWrapper.hasQueue())
         if (auto Err = synchronize(AsyncInfoWrapper))
@@ -3189,7 +3189,7 @@ struct AMDGPUDeviceTy : public GenericDeviceTy, AMDGenericDeviceTy {
 
     // For large transfers use synchronous behavior.
     // If OMPT is enabled or synchronous behavior is explicitly requested:
-    if (ompt::CallbacksInitialized || OMPX_ForceSyncRegions ||
+    if (ompt::TracingActive || OMPX_ForceSyncRegions ||
         Size >= OMPX_MaxAsyncCopyBytes) {
       if (AsyncInfoWrapper.hasQueue())
         if (auto Err = synchronize(AsyncInfoWrapper))

openmp/libomptarget/src/device.cpp

@@ -12,6 +12,7 @@
 
 #include "device.h"
 #include "OffloadEntry.h"
+#include "OmptTracing.h"
 #include "OpenMP/Mapping.h"
 #include "OpenMP/OMPT/Callback.h"
 #include "OpenMP/OMPT/Interface.h"
@@ -174,7 +175,7 @@ int32_t DeviceTy::submitData(void *TgtPtrBegin, void *HstPtrBegin, int64_t Size,
           /*CodePtr=*/OMPT_GET_RETURN_ADDRESS);)
 
 #ifdef OMPT_SUPPORT
-  if (ForceSynchronousTargetRegions || !AsyncInfo || ompt::CallbacksInitialized)
+  if (ForceSynchronousTargetRegions || !AsyncInfo || ompt::TracingActive)
 #else
   if (ForceSynchronousTargetRegions || !AsyncInfo)
 #endif
@@ -206,7 +207,7 @@ int32_t DeviceTy::retrieveData(void *HstPtrBegin, void *TgtPtrBegin,
           /*CodePtr=*/OMPT_GET_RETURN_ADDRESS);)
 
 #ifdef OMPT_SUPPORT
-  if (ForceSynchronousTargetRegions || ompt::CallbacksInitialized)
+  if (ForceSynchronousTargetRegions || ompt::TracingActive)
 #else
   if (ForceSynchronousTargetRegions)
 #endif
@@ -237,8 +238,7 @@ int32_t DeviceTy::dataExchange(void *SrcPtr, DeviceTy &DstDev, void *DstPtr,
           /*CodePtr=*/OMPT_GET_RETURN_ADDRESS);)
 
 #ifdef OMPT_SUPPORT
-  if (ForceSynchronousTargetRegions || !AsyncInfo ||
-      ompt::CallbacksInitialized) {
+  if (ForceSynchronousTargetRegions || !AsyncInfo || ompt::TracingActive) {
 #else
   if (ForceSynchronousTargetRegions || !AsyncInfo) {
 #endif
@@ -277,7 +277,7 @@ int32_t DeviceTy::launchKernel(void *TgtEntryPtr, void **TgtVarsPtr,
                                AsyncInfoTy &AsyncInfo) {
   if (ForceSynchronousTargetRegions || !RTL->launch_kernel ||
 #ifdef OMPT_SUPPORT
-      ompt::CallbacksInitialized ||
+      ompt::TracingActive ||
 #endif
       !RTL->synchronize)
     return RTL->launch_kernel_sync(RTLDeviceID, TgtEntryPtr, TgtVarsPtr,