[Openmp-commits] [openmp] [OpenMP][NFC] Rename OmptCallback.cpp into OpenMP/OMPT/Callback.cpp (PR #73813)

[Johannes Doerfert via Openmp-commits]

https://github.com/jdoerfert created https://github.com/llvm/llvm-project/pull/73813

Also revert the ifdef OMPT_SUPPORT order to have the short fallback first and not after 400 lines.

>From 8ce24821be723d6f21455e8e78ddcc67d59b9c9f Mon Sep 17 00:00:00 2001
From: Johannes Doerfert <johannes at jdoerfert.de>
Date: Tue, 28 Nov 2023 15:50:32 -0800
Subject: [PATCH] [OpenMP][NFC] Rename OmptCallback.cpp into
 OpenMP/OMPT/Callback.cpp

Also revert the ifdef OMPT_SUPPORT order to have the short fallback
first and not after 400 lines.
---
 openmp/libomptarget/src/CMakeLists.txt         |  2 +-
 .../OMPT/Callback.cpp}                         | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)
 rename openmp/libomptarget/src/{OmptCallback.cpp => OpenMP/OMPT/Callback.cpp} (99%)

diff --git a/openmp/libomptarget/src/CMakeLists.txt b/openmp/libomptarget/src/CMakeLists.txt
index a83965f59b3eb04..8d85662888090a8 100644
--- a/openmp/libomptarget/src/CMakeLists.txt
+++ b/openmp/libomptarget/src/CMakeLists.txt
@@ -19,10 +19,10 @@ add_llvm_library(omptarget
   device.cpp
   interface.cpp
   omptarget.cpp
-  OmptCallback.cpp
   rtl.cpp
   LegacyAPI.cpp
   OpenMP/InteropAPI.cpp
+  OpenMP/OMPT/Callback.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${LIBOMPTARGET_INCLUDE_DIR}
diff --git a/openmp/libomptarget/src/OmptCallback.cpp b/openmp/libomptarget/src/OpenMP/OMPT/Callback.cpp
similarity index 99%
rename from openmp/libomptarget/src/OmptCallback.cpp
rename to openmp/libomptarget/src/OpenMP/OMPT/Callback.cpp
index a45d1a0f282ac02..f1a8ad0e3cafb7b 100644
--- a/openmp/libomptarget/src/OmptCallback.cpp
+++ b/openmp/libomptarget/src/OpenMP/OMPT/Callback.cpp
@@ -1,4 +1,4 @@
-//===-- OmptCallback.cpp - Target independent OpenMP target RTL --- C++ -*-===//
+//===-- OpenMP/OMPT/Callback.cpp - OpenMP Tooling Callback implementation -===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -10,9 +10,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifdef OMPT_SUPPORT
+#ifndef OMPT_SUPPORT
 
-#include "llvm/Support/DynamicLibrary.h"
+extern "C" {
+/// Dummy definition when OMPT is disabled
+void ompt_libomptarget_connect() {}
+}
+
+#else // OMPT_SUPPORT is set
 
 #include <cstdlib>
 #include <cstring>
@@ -24,6 +29,8 @@
 #include "OpenMP/OMPT/Connector.h"
 #include "OpenMP/OMPT/Interface.h"
 
+#include "llvm/Support/DynamicLibrary.h"
+
 #undef DEBUG_PREFIX
 #define DEBUG_PREFIX "OMPT"
 
@@ -491,9 +498,4 @@ void ompt_libomptarget_connect(ompt_start_tool_result_t *result) {
   DP("Leave ompt_libomptarget_connect\n");
 }
 }
-#else
-extern "C" {
-/// Dummy definition when OMPT is disabled
-void ompt_libomptarget_connect() {}
-}
 #endif // OMPT_SUPPORT