diff options
author | Johannes Doerfert <johannes@jdoerfert.de> | 2023-11-29 08:29:41 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-29 08:29:41 -0800 |
commit | e2299e8d9d99ed1e5315b767a8dd5790967ef485 (patch) | |
tree | 58b303ad5c8ff39ad6c89120906099a5929c7f3b /openmp | |
parent | 859338a695169d2804d6999f44e1e94bedf6ddd7 (diff) | |
download | llvm-e2299e8d9d99ed1e5315b767a8dd5790967ef485.zip llvm-e2299e8d9d99ed1e5315b767a8dd5790967ef485.tar.gz llvm-e2299e8d9d99ed1e5315b767a8dd5790967ef485.tar.bz2 |
[OpenMP][NFC] Move OMPT headers into OpenMP/OMPT (#73718)
Diffstat (limited to 'openmp')
-rw-r--r-- | openmp/libomptarget/include/OpenMP/OMPT/Callback.h (renamed from openmp/libomptarget/include/OmptCallback.h) | 8 | ||||
-rw-r--r-- | openmp/libomptarget/include/OpenMP/OMPT/Connector.h (renamed from openmp/libomptarget/include/OmptConnector.h) | 8 | ||||
-rw-r--r-- | openmp/libomptarget/include/OpenMP/OMPT/Interface.h (renamed from openmp/libomptarget/src/OmptInterface.h) | 6 | ||||
-rw-r--r-- | openmp/libomptarget/plugins-nextgen/amdgpu/src/rtl.cpp | 2 | ||||
-rw-r--r-- | openmp/libomptarget/plugins-nextgen/common/OMPT/OmptCallback.cpp | 4 | ||||
-rw-r--r-- | openmp/libomptarget/plugins-nextgen/common/src/PluginInterface.cpp | 2 | ||||
-rw-r--r-- | openmp/libomptarget/plugins-nextgen/cuda/src/rtl.cpp | 2 | ||||
-rw-r--r-- | openmp/libomptarget/plugins-nextgen/generic-elf-64bit/src/rtl.cpp | 2 | ||||
-rw-r--r-- | openmp/libomptarget/src/OmptCallback.cpp | 6 | ||||
-rw-r--r-- | openmp/libomptarget/src/device.cpp | 4 | ||||
-rw-r--r-- | openmp/libomptarget/src/interface.cpp | 4 | ||||
-rw-r--r-- | openmp/libomptarget/src/omptarget.cpp | 4 | ||||
-rw-r--r-- | openmp/libomptarget/src/rtl.cpp | 2 |
13 files changed, 27 insertions, 27 deletions
diff --git a/openmp/libomptarget/include/OmptCallback.h b/openmp/libomptarget/include/OpenMP/OMPT/Callback.h index ca4e736..89c5731 100644 --- a/openmp/libomptarget/include/OmptCallback.h +++ b/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 diff --git a/openmp/libomptarget/include/OmptConnector.h b/openmp/libomptarget/include/OpenMP/OMPT/Connector.h index 3f48cab..c7b3774 100644 --- a/openmp/libomptarget/include/OmptConnector.h +++ b/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 @@ private: #pragma pop_macro("DEBUG_PREFIX") -#endif // _OMPTCONNECTOR_H +#endif // OMPTARGET_OPENMP_OMPT_CONNECTOR_H diff --git a/openmp/libomptarget/src/OmptInterface.h b/openmp/libomptarget/include/OpenMP/OMPT/Interface.h index 178ceda..8c3ef10 100644 --- a/openmp/libomptarget/src/OmptInterface.h +++ b/openmp/libomptarget/include/OpenMP/OMPT/Interface.h @@ -1,4 +1,4 @@ -//===-------- 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. @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // -// 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" diff --git a/openmp/libomptarget/plugins-nextgen/amdgpu/src/rtl.cpp b/openmp/libomptarget/plugins-nextgen/amdgpu/src/rtl.cpp index 4b8ac2f..69acfa5 100644 --- a/openmp/libomptarget/plugins-nextgen/amdgpu/src/rtl.cpp +++ b/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" diff --git a/openmp/libomptarget/plugins-nextgen/common/OMPT/OmptCallback.cpp b/openmp/libomptarget/plugins-nextgen/common/OMPT/OmptCallback.cpp index b778b72..fb8a156 100644 --- a/openmp/libomptarget/plugins-nextgen/common/OMPT/OmptCallback.cpp +++ b/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; diff --git a/openmp/libomptarget/plugins-nextgen/common/src/PluginInterface.cpp b/openmp/libomptarget/plugins-nextgen/common/src/PluginInterface.cpp index 3b0b7de..477e0ca 100644 --- a/openmp/libomptarget/plugins-nextgen/common/src/PluginInterface.cpp +++ b/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 diff --git a/openmp/libomptarget/plugins-nextgen/cuda/src/rtl.cpp b/openmp/libomptarget/plugins-nextgen/cuda/src/rtl.cpp index 97e49ad..6985171 100644 --- a/openmp/libomptarget/plugins-nextgen/cuda/src/rtl.cpp +++ b/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" diff --git a/openmp/libomptarget/plugins-nextgen/generic-elf-64bit/src/rtl.cpp b/openmp/libomptarget/plugins-nextgen/generic-elf-64bit/src/rtl.cpp index c0107c1..e1706cf 100644 --- a/openmp/libomptarget/plugins-nextgen/generic-elf-64bit/src/rtl.cpp +++ b/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" diff --git a/openmp/libomptarget/src/OmptCallback.cpp b/openmp/libomptarget/src/OmptCallback.cpp index 9839390..a45d1a0f 100644 --- a/openmp/libomptarget/src/OmptCallback.cpp +++ b/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" diff --git a/openmp/libomptarget/src/device.cpp b/openmp/libomptarget/src/device.cpp index 87ee480..742ab15 100644 --- a/openmp/libomptarget/src/device.cpp +++ b/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" diff --git a/openmp/libomptarget/src/interface.cpp b/openmp/libomptarget/src/interface.cpp index 8a1dcf5..73b8738 100644 --- a/openmp/libomptarget/src/interface.cpp +++ b/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" diff --git a/openmp/libomptarget/src/omptarget.cpp b/openmp/libomptarget/src/omptarget.cpp index f4b244a..96c27e4 100644 --- a/openmp/libomptarget/src/omptarget.cpp +++ b/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" diff --git a/openmp/libomptarget/src/rtl.cpp b/openmp/libomptarget/src/rtl.cpp index 6e012ba..2a89eeb 100644 --- a/openmp/libomptarget/src/rtl.cpp +++ b/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" |