[llvm] [offload][nfc] Extract libomptarget infrastructure into libompaccsupport (PR #213784)

[Ivan R. Ivanov via llvm-commits]

https://github.com/ivanradanov updated https://github.com/llvm/llvm-project/pull/213784

>From 73320a2ada350593ef1ee9436b45d9fbef2af292 Mon Sep 17 00:00:00 2001
From: Ivan Radanov Ivanov <iivanov at nvidia.com>
Date: Mon, 3 Aug 2026 15:27:00 -0700
Subject: [PATCH 1/2] [offload][nfc] Extract libomptarget infrastructure into
 libompaccsupport

libompaccsupport will become the support library for both OpenMP and OpenACC.
This patch extracts the files that will become part of it. Currently it only
moves the files and the build configuration is unchanged.

Next patches will start refactoring libompaccsupport to flesh out the subset of
the infrastructure that will be shared between OpenMP and OpenACC in small
verifiable chunks while maintaining libomptarget's existing behaviour.

Gradually adding the libacctarget implementation that uses libompaccsupport
will also follow.
---
 .../DeviceImage.cpp                                |  0
 .../OpenMP => libompaccsupport}/Mapping.cpp        |  0
 .../OpenMP => libompaccsupport}/OMPT/Callback.cpp  |  0
 .../OffloadRTL.cpp                                 |  0
 .../PluginManager.cpp                              |  0
 .../{libomptarget => libompaccsupport}/device.cpp  |  1 -
 offload/libomptarget/CMakeLists.txt                | 14 ++++++++------
 7 files changed, 8 insertions(+), 7 deletions(-)
 rename offload/{libomptarget => libompaccsupport}/DeviceImage.cpp (100%)
 rename offload/{libomptarget/OpenMP => libompaccsupport}/Mapping.cpp (100%)
 rename offload/{libomptarget/OpenMP => libompaccsupport}/OMPT/Callback.cpp (100%)
 rename offload/{libomptarget => libompaccsupport}/OffloadRTL.cpp (100%)
 rename offload/{libomptarget => libompaccsupport}/PluginManager.cpp (100%)
 rename offload/{libomptarget => libompaccsupport}/device.cpp (99%)

diff --git a/offload/libomptarget/DeviceImage.cpp b/offload/libompaccsupport/DeviceImage.cpp
similarity index 100%
rename from offload/libomptarget/DeviceImage.cpp
rename to offload/libompaccsupport/DeviceImage.cpp
diff --git a/offload/libomptarget/OpenMP/Mapping.cpp b/offload/libompaccsupport/Mapping.cpp
similarity index 100%
rename from offload/libomptarget/OpenMP/Mapping.cpp
rename to offload/libompaccsupport/Mapping.cpp
diff --git a/offload/libomptarget/OpenMP/OMPT/Callback.cpp b/offload/libompaccsupport/OMPT/Callback.cpp
similarity index 100%
rename from offload/libomptarget/OpenMP/OMPT/Callback.cpp
rename to offload/libompaccsupport/OMPT/Callback.cpp
diff --git a/offload/libomptarget/OffloadRTL.cpp b/offload/libompaccsupport/OffloadRTL.cpp
similarity index 100%
rename from offload/libomptarget/OffloadRTL.cpp
rename to offload/libompaccsupport/OffloadRTL.cpp
diff --git a/offload/libomptarget/PluginManager.cpp b/offload/libompaccsupport/PluginManager.cpp
similarity index 100%
rename from offload/libomptarget/PluginManager.cpp
rename to offload/libompaccsupport/PluginManager.cpp
diff --git a/offload/libomptarget/device.cpp b/offload/libompaccsupport/device.cpp
similarity index 99%
rename from offload/libomptarget/device.cpp
rename to offload/libompaccsupport/device.cpp
index 18339e9afe975..612941200b031 100644
--- a/offload/libomptarget/device.cpp
+++ b/offload/libompaccsupport/device.cpp
@@ -19,7 +19,6 @@
 #include "Shared/APITypes.h"
 #include "Shared/Debug.h"
 #include "omptarget.h"
-#include "private.h"
 #include "rtl.h"
 
 #include "Shared/EnvironmentVar.h"
diff --git a/offload/libomptarget/CMakeLists.txt b/offload/libomptarget/CMakeLists.txt
index 8e6314b2a6eae..5602b716dbafb 100644
--- a/offload/libomptarget/CMakeLists.txt
+++ b/offload/libomptarget/CMakeLists.txt
@@ -5,18 +5,20 @@ if(NOT TARGET "omp")
 endif()
 
 add_library(omptarget SHARED
-  device.cpp
   interface.cpp
   omptarget.cpp
-  OffloadRTL.cpp
   LegacyAPI.cpp
-  PluginManager.cpp
-  DeviceImage.cpp
 
   OpenMP/API.cpp
-  OpenMP/Mapping.cpp
   OpenMP/InteropAPI.cpp
-  OpenMP/OMPT/Callback.cpp
+
+  ../libompaccsupport/device.cpp
+  ../libompaccsupport/PluginManager.cpp
+  ../libompaccsupport/DeviceImage.cpp
+  ../libompaccsupport/OffloadRTL.cpp
+
+  ../libompaccsupport/Mapping.cpp
+  ../libompaccsupport/OMPT/Callback.cpp
 
   KernelLanguage/API.cpp
 )

>From 6caf1944abdc31e2a264257327a14e084848cdfd Mon Sep 17 00:00:00 2001
From: Ivan Radanov Ivanov <iivanov at nvidia.com>
Date: Wed, 5 Aug 2026 05:28:24 -0700
Subject: [PATCH 2/2] Move OMPT/Callback.cpp back to libomptarget

---
 offload/libomptarget/CMakeLists.txt                            | 3 +--
 .../OpenMP}/OMPT/Callback.cpp                                  | 0
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename offload/{libompaccsupport => libomptarget/OpenMP}/OMPT/Callback.cpp (100%)

diff --git a/offload/libomptarget/CMakeLists.txt b/offload/libomptarget/CMakeLists.txt
index 5602b716dbafb..85b90d534cd58 100644
--- a/offload/libomptarget/CMakeLists.txt
+++ b/offload/libomptarget/CMakeLists.txt
@@ -11,14 +11,13 @@ add_library(omptarget SHARED
 
   OpenMP/API.cpp
   OpenMP/InteropAPI.cpp
+  OpenMP/OMPT/Callback.cpp
 
   ../libompaccsupport/device.cpp
   ../libompaccsupport/PluginManager.cpp
   ../libompaccsupport/DeviceImage.cpp
   ../libompaccsupport/OffloadRTL.cpp
-
   ../libompaccsupport/Mapping.cpp
-  ../libompaccsupport/OMPT/Callback.cpp
 
   KernelLanguage/API.cpp
 )
diff --git a/offload/libompaccsupport/OMPT/Callback.cpp b/offload/libomptarget/OpenMP/OMPT/Callback.cpp
similarity index 100%
rename from offload/libompaccsupport/OMPT/Callback.cpp
rename to offload/libomptarget/OpenMP/OMPT/Callback.cpp