[Offload] [OMPT] Moved OMPT related files to OMPT folders.

Change-Id: I2b5c57b258d21311e4a496e78197ca4bea562d21

Author: dhruvachak

offload/include/OmptCommonDefs.h renamed to offload/include/OpenMP/OMPT/OmptCommonDefs.h

@@ -82,15 +82,15 @@ class OmptTracingBufferMgr {
    * this 2nd set of locations need to be atomic or synchronized.
    */
   struct Buffer {
-    uint64_t Id;           // Unique identifier of the buffer
-    int64_t DeviceId;      // Device for which this buffer is allocated
-    void *Start;           // Start of allocated space for trace records
-    size_t TotalBytes;     // Total number of bytes in the allocated space
-    size_t RemainingBytes; // Total number of unused bytes
-                           // corresponding to Cursor
+    uint64_t Id;                // Unique identifier of the buffer
+    int64_t DeviceId;           // Device for which this buffer is allocated
+    void *Start;                // Start of allocated space for trace records
+    size_t TotalBytes;          // Total number of bytes in the allocated space
+    size_t RemainingBytes;      // Total number of unused bytes
+                                // corresponding to Cursor
     std::atomic<void *> Cursor; // Address of the last trace record carved out
     std::atomic<bool> isFull;   // true if no more trace records can be
-                              // accomodated, otherwise false
+                                // accomodated, otherwise false
     Buffer(uint64_t BufId, int64_t DevId, void *S, size_t Bytes, size_t Rem,
            void *C, bool F)
         : Id(BufId), DeviceId(DevId), Start(S), TotalBytes(Bytes),

offload/include/OmptTracing.h renamed to offload/include/OpenMP/OMPT/OmptTracing.h

@@ -13,7 +13,7 @@
 #ifndef OMPTARGET_PLUGIN_MANAGER_H
 #define OMPTARGET_PLUGIN_MANAGER_H
 
-#include "OmptTracingBuffer.h"
+#include "OpenMP/OMPT/OmptTracingBuffer.h"
 #include "PluginInterface.h"
 
 #include "DeviceImage.h"

offload/include/OmptTracingBuffer.h renamed to offload/include/OpenMP/OMPT/OmptTracingBuffer.h

@@ -26,10 +26,9 @@
 #include <unordered_map>
 #include <variant>
 
-#include "OmptCommonDefs.h"
-
-#include "OpenMP/OMPT/Interface.h"
 #include "ErrorReporting.h"
+#include "OpenMP/OMPT/Interface.h"
+#include "OpenMP/OMPT/OmptCommonDefs.h"
 #include "Shared/APITypes.h"
 #include "Shared/Debug.h"
 #include "Shared/Environment.h"

offload/include/PluginManager.h

@@ -16,7 +16,7 @@
 
 #ifdef OMPT_SUPPORT
 
-#include "OmptCommonDefs.h"
+#include "OpenMP/OMPT/OmptCommonDefs.h"
 
 #include "llvm/Support/DynamicLibrary.h"
 

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

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

offload/plugins-nextgen/common/OMPT/OmptDeviceTracing.h

@@ -12,8 +12,6 @@ add_llvm_library(omptarget
   device.cpp
   interface.cpp
   omptarget.cpp
-  OmptTracing.cpp
-  OmptTracingBuffer.cpp
   OffloadRTL.cpp
   LegacyAPI.cpp
   PluginManager.cpp
@@ -23,6 +21,8 @@ add_llvm_library(omptarget
   OpenMP/Mapping.cpp
   OpenMP/InteropAPI.cpp
   OpenMP/OMPT/Callback.cpp
+  OpenMP/OMPT/OmptTracing.cpp
+  OpenMP/OMPT/OmptTracingBuffer.cpp
 
   KernelLanguage/API.cpp
 

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

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

offload/src/CMakeLists.txt

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