[OpenMP] [OMPT] Fix build failure with target OMPT disabled.

If any of the macros from OmptCommonDefs.h is used, the source must
either guard it with OMPT_SUPPORT defined or include the common defs
header file unconditionally. Otherwise, the macros may not resolve
correctly, leading to build failures.

Change-Id: I878b4cc60d0586654340392ca257032f4738e6e2

Author: dhruvachak

offload/include/OmptTracingBuffer.h

@@ -13,6 +13,8 @@
 #ifndef OPENMP_LIBOMPTARGET_OMPTTRACINGBUFFER_H
 #define OPENMP_LIBOMPTARGET_OMPTTRACINGBUFFER_H
 
+#ifdef OMPT_SUPPORT
+
 #include <atomic>
 #include <cassert>
 #include <condition_variable>
@@ -38,15 +40,6 @@
 // thread-wait-tracker is 32 bits in length.
 #define OMPT_NUM_HELPER_THREADS 1
 
-#ifdef OMPT_SUPPORT
-#define OMPT_TRACING_IF_ENABLED(stmts)                                         \
-  do {                                                                         \
-    stmts                                                                      \
-  } while (0)
-#else
-#define OMPT_TRACING_IF_ENABLED(stmts)
-#endif
-
 /*
  * Buffer manager for trace records generated by OpenMP master and
  * worker threads. During device init, a tool may register a
@@ -397,4 +390,6 @@ class OmptTracingBufferMgr {
   int flushAllBuffers(int DeviceId);
 };
 
+#endif // OMPT_SUPPORT
+
 #endif // OPENMP_LIBOMPTARGET_OMPTTRACINGBUFFER_H

offload/plugins-nextgen/amdgpu/src/rtl.cpp

@@ -21,6 +21,8 @@
 #include <unistd.h>
 #include <unordered_map>
 
+#include "OmptCommonDefs.h"
+
 #include "Shared/Debug.h"
 #include "Shared/Environment.h"
 #include "Shared/Utils.h"
@@ -3121,7 +3123,7 @@ struct AMDGPUDeviceTy : public GenericDeviceTy, AMDGenericDeviceTy {
 
     // For large transfers use synchronous behavior.
     // If OMPT is enabled or synchronous behavior is explicitly requested:
-    if (ompt::TracingActive || OMPX_ForceSyncRegions ||
+    if (OMPT_IF_BUILT(ompt::TracingActive ||) OMPX_ForceSyncRegions ||
         Size >= OMPX_MaxAsyncCopyBytes) {
       if (AsyncInfoWrapper.hasQueue())
         if (auto Err = synchronize(AsyncInfoWrapper))
@@ -3194,7 +3196,7 @@ struct AMDGPUDeviceTy : public GenericDeviceTy, AMDGenericDeviceTy {
 
     // For large transfers use synchronous behavior.
     // If OMPT is enabled or synchronous behavior is explicitly requested:
-    if (ompt::TracingActive || OMPX_ForceSyncRegions ||
+    if (OMPT_IF_BUILT(ompt::TracingActive ||) OMPX_ForceSyncRegions ||
         Size >= OMPX_MaxAsyncCopyBytes) {
       if (AsyncInfoWrapper.hasQueue())
         if (auto Err = synchronize(AsyncInfoWrapper))
@@ -3249,7 +3251,7 @@ struct AMDGPUDeviceTy : public GenericDeviceTy, AMDGenericDeviceTy {
 
     // For large transfers use synchronous behavior.
     // If OMPT is enabled or synchronous behavior is explicitly requested:
-    if (ompt::TracingActive || OMPX_ForceSyncRegions ||
+    if (OMPT_IF_BUILT(ompt::TracingActive ||) OMPX_ForceSyncRegions ||
         Size >= OMPX_MaxAsyncCopyBytes) {
       if (AsyncInfoWrapper.hasQueue())
         if (auto Err = synchronize(AsyncInfoWrapper))

offload/plugins-nextgen/common/src/PluginInterface.cpp

@@ -9,6 +9,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "PluginInterface.h"
+#include "OmptCommonDefs.h"
 
 #include "Shared/APITypes.h"
 #include "Shared/Debug.h"

offload/src/LegacyAPI.cpp

@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "OmptCommonDefs.h"
 #include "OpenMP/OMPT/Interface.h"
 #include "omptarget.h"
 #include "private.h"

offload/src/OmptTracingBuffer.cpp

@@ -10,6 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+#ifdef OMPT_SUPPORT
+
 #include "Shared/Debug.h"
 #include "OmptTracing.h"
 #include "OmptTracingBuffer.h"
@@ -742,3 +744,4 @@ OmptTracingBufferMgr::OmptTracingBufferMgr() {
   // no need to hold locks for init() since object is getting constructed here
   init();
 }
+#endif

offload/src/OpenMP/API.cpp

@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "OmptCommonDefs.h"
 #include "PluginManager.h"
 #include "device.h"
 #include "omptarget.h"

offload/src/OpenMP/OMPT/Callback.cpp

@@ -12,11 +12,6 @@
 
 #ifndef OMPT_SUPPORT
 
-#include "Shared/Debug.h"
-#include "omp-tools.h"
-#include "private.h"
-
-#include "llvm/Support/DynamicLibrary.h"
 extern "C" {
 /// Dummy definition when OMPT is disabled
 void ompt_libomptarget_connect() {}

offload/src/PluginManager.cpp

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "PluginManager.h"
+#include "OmptCommonDefs.h"
 #include "OmptTracing.h"
 #include "OpenMP/OMPT/Callback.h"
 #include "Shared/Debug.h"
@@ -260,7 +261,7 @@ void PluginManager::unregisterLib(__tgt_bin_desc *Desc) {
 
   // Flush in-process OMPT trace records and shut down helper threads
   // before unloading the library.
-  OMPT_TRACING_IF_ENABLED(llvm::omp::target::ompt::TraceRecordManager
+  OMPT_IF_TRACING_ENABLED(llvm::omp::target::ompt::TraceRecordManager
                               .flushAndShutdownHelperThreads(););
 
   PM->RTLsMtx.lock();

offload/src/device.cpp

@@ -12,6 +12,7 @@
 
 #include "device.h"
 #include "OffloadEntry.h"
+#include "OmptCommonDefs.h"
 #include "OmptTracing.h"
 #include "OpenMP/Mapping.h"
 #include "OpenMP/OMPT/Callback.h"

offload/src/interface.cpp

@@ -12,6 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "OpenMP/OMPT/Interface.h"
+#include "OmptCommonDefs.h"
 #include "OpenMP/OMPT/Callback.h"
 #include "PluginManager.h"
 #include "private.h"