[OpenMP][NFC] Move OMPT headers into OpenMP/OMPT

openmp/libomptarget/include/OmptCallback.h → openmp/libomptarget/include/OpenMP/OMPT/Callback.h

@@ -1,4 +1,4 @@
-//===---- OmptCallback.h - Target independent OMPT callbacks --*- C++ -*---===//
+//===-- OpenMP/OMPT/Callback.h - OpenMP Tooling callbacks -------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _OMPTCALLBACK_H
-#define _OMPTCALLBACK_H
+#ifndef OMPTARGET_OPENMP_OMPT_CALLBACK_H
+#define OMPTARGET_OPENMP_OMPT_CALLBACK_H
 
 #ifdef OMPT_SUPPORT
 
@@ -102,4 +102,4 @@ extern bool Initialized;
 #define performIfOmptInitialized(stmt)
 #endif // OMPT_SUPPORT
 
-#endif // _OMPTCALLBACK_H
+#endif // OMPTARGET_OPENMP_OMPT_CALLBACK_H

openmp/libomptarget/include/OmptConnector.h → openmp/libomptarget/include/OpenMP/OMPT/Connector.h

@@ -1,4 +1,4 @@
-//===- OmptConnector.h - Target independent OpenMP target RTL -- C++ ------===//
+//===-- OpenMP/OMPT/Connector.h - OpenMP Tooling lib connector -*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _OMPTCONNECTOR_H
-#define _OMPTCONNECTOR_H
+#ifndef OMPTARGET_OPENMP_OMPT_CONNECTOR_H
+#define OMPTARGET_OPENMP_OMPT_CONNECTOR_H
 
 #ifdef OMPT_SUPPORT
 
@@ -106,4 +106,4 @@ class OmptLibraryConnectorTy {
 
 #pragma pop_macro("DEBUG_PREFIX")
 
-#endif // _OMPTCONNECTOR_H
+#endif // OMPTARGET_OPENMP_OMPT_CONNECTOR_H

openmp/libomptarget/src/OmptInterface.h → openmp/libomptarget/include/OpenMP/OMPT/Interface.h

@@ -1,12 +1,12 @@
-//===-------- OmptInterface.h - Target independent OpenMP target RTL ------===//
+//===-- OpenMP/OMPT/Interface.h - OpenMP Tooling interfaces ----*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
-// Declarations for OpenMP Tool callback dispatchers
+// Declarations for OpenMP Tool callback dispatchers.
 //
 //===----------------------------------------------------------------------===//
 
@@ -18,7 +18,7 @@
 #include <functional>
 #include <tuple>
 
-#include "OmptCallback.h"
+#include "Callback.h"
 #include "omp-tools.h"
 
 #include "llvm/Support/ErrorHandling.h"

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

@@ -25,7 +25,7 @@
 #include "Shared/Utils.h"
 
 #include "GlobalHandler.h"
-#include "OmptCallback.h"
+#include "OpenMP/OMPT/Callback.h"
 #include "PluginInterface.h"
 #include "UtilitiesRTL.h"
 #include "omptarget.h"

openmp/libomptarget/plugins-nextgen/common/OMPT/OmptCallback.cpp

@@ -20,8 +20,8 @@
 
 #include "Shared/Debug.h"
 
-#include "OmptCallback.h"
-#include "OmptConnector.h"
+#include "OpenMP/OMPT/Callback.h"
+#include "OpenMP/OMPT/Connector.h"
 
 using namespace llvm::omp::target::ompt;
 

openmp/libomptarget/plugins-nextgen/common/src/PluginInterface.cpp

@@ -20,7 +20,7 @@
 #include "omptargetplugin.h"
 
 #ifdef OMPT_SUPPORT
-#include "OmptCallback.h"
+#include "OpenMP/OMPT/Callback.h"
 #include "omp-tools.h"
 #endif
 

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

@@ -20,7 +20,7 @@
 #include "Shared/Environment.h"
 
 #include "GlobalHandler.h"
-#include "OmptCallback.h"
+#include "OpenMP/OMPT/Callback.h"
 #include "PluginInterface.h"
 
 #include "llvm/BinaryFormat/ELF.h"

openmp/libomptarget/plugins-nextgen/generic-elf-64bit/src/rtl.cpp

@@ -20,7 +20,7 @@
 #include "Shared/Environment.h"
 
 #include "GlobalHandler.h"
-#include "OmptCallback.h"
+#include "OpenMP/OMPT/Callback.h"
 #include "PluginInterface.h"
 #include "omptarget.h"
 

openmp/libomptarget/src/OmptCallback.cpp

@@ -20,9 +20,9 @@
 
 #include "Shared/Debug.h"
 
-#include "OmptCallback.h"
-#include "OmptConnector.h"
-#include "OmptInterface.h"
+#include "OpenMP/OMPT/Callback.h"
+#include "OpenMP/OMPT/Connector.h"
+#include "OpenMP/OMPT/Interface.h"
 
 #undef DEBUG_PREFIX
 #define DEBUG_PREFIX "OMPT"

openmp/libomptarget/src/device.cpp

@@ -11,8 +11,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "device.h"
-#include "OmptCallback.h"
-#include "OmptInterface.h"
+#include "OpenMP/OMPT/Callback.h"
+#include "OpenMP/OMPT/Interface.h"
 #include "omptarget.h"
 #include "private.h"
 #include "rtl.h"

openmp/libomptarget/src/interface.cpp

@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "OmptCallback.h"
-#include "OmptInterface.h"
+#include "OpenMP/OMPT/Interface.h"
+#include "OpenMP/OMPT/Callback.h"
 #include "device.h"
 #include "omptarget.h"
 #include "private.h"

openmp/libomptarget/src/omptarget.cpp

@@ -12,8 +12,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "omptarget.h"
-#include "OmptCallback.h"
-#include "OmptInterface.h"
+#include "OpenMP/OMPT/Callback.h"
+#include "OpenMP/OMPT/Interface.h"
 #include "device.h"
 #include "private.h"
 #include "rtl.h"

openmp/libomptarget/src/rtl.cpp

@@ -12,7 +12,7 @@
 
 #include "llvm/Object/OffloadBinary.h"
 
-#include "OmptCallback.h"
+#include "OpenMP/OMPT/Callback.h"
 #include "device.h"
 #include "private.h"
 #include "rtl.h"