https://github.com/adurang updated https://github.com/llvm/llvm-project/pull/221275
>From f75b587a40097f8ea428b50ef6f7cdc90d97e4da Mon Sep 17 00:00:00 2001 From: "Duran, Alex" <[email protected]> Date: Thu, 3 Sep 2026 10:55:00 -0700 Subject: [PATCH] [offload][omp] Load plugins through liboffload --- offload/include/PluginManager.h | 3 ++- offload/liboffload/exports | 2 +- offload/liboffload/src/OffloadImpl.cpp | 5 ++++ offload/libompaccsupport/PluginManager.cpp | 29 +++++++++++++--------- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/offload/include/PluginManager.h b/offload/include/PluginManager.h index 6c6fdebe76dff..eea8b62a8c39d 100644 --- a/offload/include/PluginManager.h +++ b/offload/include/PluginManager.h @@ -13,6 +13,7 @@ #ifndef OMPTARGET_PLUGIN_MANAGER_H #define OMPTARGET_PLUGIN_MANAGER_H +#include "OffloadAPI.h" #include "PluginInterface.h" #include "DeviceImage.h" @@ -155,7 +156,7 @@ struct PluginManager { llvm::SmallVector<__tgt_bin_desc *> DelayedBinDesc; // List of all plugins, in use or not. - llvm::SmallVector<std::unique_ptr<GenericPluginTy>> Plugins; + llvm::SmallVector<GenericPluginTy *> Plugins; // Mapping of plugins to the OpenMP device identifier. llvm::DenseMap<std::pair<const GenericPluginTy *, int32_t>, int32_t> diff --git a/offload/liboffload/exports b/offload/liboffload/exports index 5487e16168681..75b1cfd049c82 100644 --- a/offload/liboffload/exports +++ b/offload/liboffload/exports @@ -55,9 +55,9 @@ global: llvm::omp::target::ompt::Initialized; llvm::omp::target::ompt::lookupCallbackByCode; llvm::omp::target::ompt::lookupCallbackByName; - createPlugin_*; # Temporary helpers to help transition of libomptarget to liboffload. __ol_tgt_setInfoFlag; + __ol_tgt_GetPluginFromPlatform; }; local: *; diff --git a/offload/liboffload/src/OffloadImpl.cpp b/offload/liboffload/src/OffloadImpl.cpp index 840dbe06c6a59..f77e7243a106f 100644 --- a/offload/liboffload/src/OffloadImpl.cpp +++ b/offload/liboffload/src/OffloadImpl.cpp @@ -1636,5 +1636,10 @@ extern "C" void __ol_tgt_setInfoFlag(uint32_t NewInfoLevel) { InfoLevel.store(NewInfoLevel); } +extern "C" GenericPluginTy * +__ol_tgt_GetPluginFromPlatform(ol_platform_handle_t Platform) { + return Platform->Plugin.get(); +} + } // namespace offload } // namespace llvm diff --git a/offload/libompaccsupport/PluginManager.cpp b/offload/libompaccsupport/PluginManager.cpp index 41b653a60adfd..b0cb40fb32e8d 100644 --- a/offload/libompaccsupport/PluginManager.cpp +++ b/offload/libompaccsupport/PluginManager.cpp @@ -26,9 +26,8 @@ using namespace llvm::omp::target::debug; PluginManager *PM = nullptr; -// Every plugin exports this method to create an instance of the plugin type. -#define PLUGIN_TARGET(Name) extern "C" GenericPluginTy *createPlugin_##Name(); -#include "Shared/Targets.def" +extern "C" GenericPluginTy * +__ol_tgt_GetPluginFromPlatform(ol_platform_handle_t Platform); void PluginManager::init() { TIMESCOPE(); @@ -38,14 +37,21 @@ void PluginManager::init() { } ODBG(ODT_Init) << "Loading RTLs"; - - // Attempt to create an instance of each supported plugin. -#define PLUGIN_TARGET(Name) \ - do { \ - Plugins.emplace_back( \ - std::unique_ptr<GenericPluginTy>(createPlugin_##Name())); \ - } while (false); -#include "Shared/Targets.def" + if (ol_result_t Res = olInit(nullptr)) + REPORT() << "Failed to initialize liboffload: " << Res->Details; + + + if (ol_result_t Res = olIteratePlatforms( + [](ol_platform_handle_t Platform, void *Data) { + auto *PM = static_cast<PluginManager *>(Data); + auto *Plugin = __ol_tgt_GetPluginFromPlatform(Platform); + ODBG(ODT_Init) << "Adding plugin " << Plugin->getName() + << " from liboffload"; + PM->Plugins.push_back(Plugin); + return true; + }, + this)) + REPORT() << "Failed to iterate platforms: " << Res->Details; ODBG(ODT_Init) << "RTLs loaded!"; } @@ -62,7 +68,6 @@ void PluginManager::deinit() { std::string InfoMsg = toString(std::move(Err)); ODBG(ODT_Deinit) << "Failed to deinit plugin: " << InfoMsg; } - Plugin.release(); } ODBG(ODT_Deinit) << "RTLs unloaded!"; _______________________________________________ llvm-branch-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
