From 06cb9ea006f530188442cc42f6ece78817c66ade Mon Sep 17 00:00:00 2001 From: Alex Duran Date: Thu, 9 Oct 2025 15:08:04 +0200 Subject: [PATCH] [OFFLOAD] Remove unused init_device_info plugin interface This was used for the old interop code. It's dead code after #143491 --- offload/plugins-nextgen/amdgpu/src/rtl.cpp | 12 +---------- .../common/include/PluginInterface.h | 10 +-------- .../common/src/PluginInterface.cpp | 21 ------------------- offload/plugins-nextgen/cuda/src/rtl.cpp | 17 --------------- offload/plugins-nextgen/host/src/rtl.cpp | 6 ------ 5 files changed, 2 insertions(+), 64 deletions(-) diff --git a/offload/plugins-nextgen/amdgpu/src/rtl.cpp b/offload/plugins-nextgen/amdgpu/src/rtl.cpp index 8d2f9755e0351..a7723b8598815 100644 --- a/offload/plugins-nextgen/amdgpu/src/rtl.cpp +++ b/offload/plugins-nextgen/amdgpu/src/rtl.cpp @@ -2696,22 +2696,12 @@ struct AMDGPUDeviceTy : public GenericDeviceTy, AMDGenericDeviceTy { Size / PatternSize); } - /// Initialize the async info for interoperability purposes. + /// Initialize the async info Error initAsyncInfoImpl(AsyncInfoWrapperTy &AsyncInfoWrapper) override { // TODO: Implement this function. return Plugin::success(); } - /// Initialize the device info for interoperability purposes. - Error initDeviceInfoImpl(__tgt_device_info *DeviceInfo) override { - DeviceInfo->Context = nullptr; - - if (!DeviceInfo->Device) - DeviceInfo->Device = reinterpret_cast(Agent.handle); - - return Plugin::success(); - } - interop_spec_t selectInteropPreference(int32_t InteropType, int32_t NumPrefers, interop_spec_t *Prefers) override { diff --git a/offload/plugins-nextgen/common/include/PluginInterface.h b/offload/plugins-nextgen/common/include/PluginInterface.h index 5620437716b31..8c530bba3882c 100644 --- a/offload/plugins-nextgen/common/include/PluginInterface.h +++ b/offload/plugins-nextgen/common/include/PluginInterface.h @@ -951,14 +951,10 @@ struct GenericDeviceTy : public DeviceAllocatorTy { Error launchKernel(void *EntryPtr, void **ArgPtrs, ptrdiff_t *ArgOffsets, KernelArgsTy &KernelArgs, __tgt_async_info *AsyncInfo); - /// Initialize a __tgt_async_info structure. Related to interop features. + /// Initialize a __tgt_async_info structure. Error initAsyncInfo(__tgt_async_info **AsyncInfoPtr); virtual Error initAsyncInfoImpl(AsyncInfoWrapperTy &AsyncInfoWrapper) = 0; - /// Initialize a __tgt_device_info structure. Related to interop features. - Error initDeviceInfo(__tgt_device_info *DeviceInfo); - virtual Error initDeviceInfoImpl(__tgt_device_info *DeviceInfo) = 0; - /// Enqueue a host call to AsyncInfo Error enqueueHostCall(void (*Callback)(void *), void *UserData, __tgt_async_info *AsyncInfo); @@ -1490,10 +1486,6 @@ struct GenericPluginTy { /// Creates an asynchronous queue for the given plugin. int32_t init_async_info(int32_t DeviceId, __tgt_async_info **AsyncInfoPtr); - /// Creates device information to be used for diagnostics. - int32_t init_device_info(int32_t DeviceId, __tgt_device_info *DeviceInfo, - const char **ErrStr); - /// Sets the offset into the devices for use by OMPT. int32_t set_device_identifier(int32_t UserId, int32_t DeviceId); diff --git a/offload/plugins-nextgen/common/src/PluginInterface.cpp b/offload/plugins-nextgen/common/src/PluginInterface.cpp index 15b6b9866e5a2..db43cbe49cc2b 100644 --- a/offload/plugins-nextgen/common/src/PluginInterface.cpp +++ b/offload/plugins-nextgen/common/src/PluginInterface.cpp @@ -1524,12 +1524,6 @@ Error GenericDeviceTy::enqueueHostCall(void (*Callback)(void *), void *UserData, return Err; } -Error GenericDeviceTy::initDeviceInfo(__tgt_device_info *DeviceInfo) { - assert(DeviceInfo && "Invalid device info"); - - return initDeviceInfoImpl(DeviceInfo); -} - Error GenericDeviceTy::printInfo() { auto Info = obtainInfoImpl(); @@ -2128,21 +2122,6 @@ int32_t GenericPluginTy::init_async_info(int32_t DeviceId, return OFFLOAD_SUCCESS; } -int32_t GenericPluginTy::init_device_info(int32_t DeviceId, - __tgt_device_info *DeviceInfo, - const char **ErrStr) { - *ErrStr = ""; - - auto Err = getDevice(DeviceId).initDeviceInfo(DeviceInfo); - if (Err) { - REPORT("Failure to initialize device info at " DPxMOD " on device %d: %s\n", - DPxPTR(DeviceInfo), DeviceId, toString(std::move(Err)).data()); - return OFFLOAD_FAIL; - } - - return OFFLOAD_SUCCESS; -} - int32_t GenericPluginTy::set_device_identifier(int32_t UserId, int32_t DeviceId) { UserDeviceIds[DeviceId] = UserId; diff --git a/offload/plugins-nextgen/cuda/src/rtl.cpp b/offload/plugins-nextgen/cuda/src/rtl.cpp index e5c4a1bfa9853..db94f7f2dd995 100644 --- a/offload/plugins-nextgen/cuda/src/rtl.cpp +++ b/offload/plugins-nextgen/cuda/src/rtl.cpp @@ -900,23 +900,6 @@ struct CUDADeviceTy : public GenericDeviceTy { return Plugin::success(); } - /// Initialize the device info for interoperability purposes. - Error initDeviceInfoImpl(__tgt_device_info *DeviceInfo) override { - assert(Context && "Context is null"); - assert(Device != CU_DEVICE_INVALID && "Invalid CUDA device"); - - if (auto Err = setContext()) - return Err; - - if (!DeviceInfo->Context) - DeviceInfo->Context = Context; - - if (!DeviceInfo->Device) - DeviceInfo->Device = reinterpret_cast(Device); - - return Plugin::success(); - } - interop_spec_t selectInteropPreference(int32_t InteropType, int32_t NumPrefers, interop_spec_t *Prefers) override { diff --git a/offload/plugins-nextgen/host/src/rtl.cpp b/offload/plugins-nextgen/host/src/rtl.cpp index 0845032d0aae2..eb4ecac9907a1 100644 --- a/offload/plugins-nextgen/host/src/rtl.cpp +++ b/offload/plugins-nextgen/host/src/rtl.cpp @@ -344,12 +344,6 @@ struct GenELF64DeviceTy : public GenericDeviceTy { "initAsyncInfoImpl not supported"); } - /// This plugin does not support interoperability - Error initDeviceInfoImpl(__tgt_device_info *DeviceInfo) override { - return Plugin::error(ErrorCode::UNSUPPORTED, - "initDeviceInfoImpl not supported"); - } - Error enqueueHostCallImpl(void (*Callback)(void *), void *UserData, AsyncInfoWrapperTy &AsyncInfo) override { Callback(UserData);