Revert "Revert plugin changes"

This reverts commit 44122e1.

Author: callumfare

offload/plugins-nextgen/common/include/GlobalHandler.h

@@ -131,8 +131,9 @@ class GenericGlobalHandlerTy {
 
   /// Get the address and size of a global in the image. Address and size are
   /// return in \p ImageGlobal, the global name is passed in \p ImageGlobal.
-  Error getGlobalMetadataFromImage(GenericDeviceTy &Device,
-                                   DeviceImageTy &Image, GlobalTy &ImageGlobal);
+  virtual Error getGlobalMetadataFromImage(GenericDeviceTy &Device,
+                                           DeviceImageTy &Image,
+                                           GlobalTy &ImageGlobal);
 
   /// Read the memory associated with a global from the image and store it on
   /// the host. The name, size, and destination are defined by \p HostGlobal.

offload/plugins-nextgen/cuda/src/rtl.cpp

@@ -1327,6 +1327,34 @@ class CUDAGlobalHandlerTy final : public GenericGlobalHandlerTy {
     DeviceGlobal.setPtr(reinterpret_cast<void *>(CUPtr));
     return Plugin::success();
   }
+
+  Error getGlobalMetadataFromImage(GenericDeviceTy &Device,
+                                   DeviceImageTy &Image,
+                                   GlobalTy &ImageGlobal) override {
+    // If the image is an ELF we can use the generic path, otherwise fall back
+    // and use cuModuleGetGlobal to query the image.
+    if (utils::elf::isELF(Image.getMemoryBuffer().getBuffer())) {
+      return GenericGlobalHandlerTy::getGlobalMetadataFromImage(Device, Image,
+                                                                ImageGlobal);
+    }
+
+    CUDADeviceImageTy &CUDAImage = static_cast<CUDADeviceImageTy &>(Image);
+
+    const char *GlobalName = ImageGlobal.getName().data();
+
+    size_t CUSize;
+    CUdeviceptr CUPtr;
+    CUresult Res =
+        cuModuleGetGlobal(&CUPtr, &CUSize, CUDAImage.getModule(), GlobalName);
+    if (auto Err = Plugin::check(Res, "Error in cuModuleGetGlobal for '%s': %s",
+                                 GlobalName))
+      return Err;
+
+    // Setup the global symbol's address and size.
+    ImageGlobal.setPtr(reinterpret_cast<void *>(CUPtr));
+    ImageGlobal.setSize(CUSize);
+    return Plugin::success();
+  }
 };
 
 /// Class implementing the CUDA-specific functionalities of the plugin.

offload/plugins-nextgen/host/src/rtl.cpp

@@ -289,7 +289,7 @@ struct GenELF64DeviceTy : public GenericDeviceTy {
 
   /// This plugin does not support interoperability, do nothing
   Error initAsyncInfoImpl(AsyncInfoWrapperTy &AsyncInfoWrapper) override {
-    return Plugin::error("initAsyncInfoImpl not supported");
+    return Plugin::success();
   }
 
   /// This plugin does not support interoperability