make virtual host devices have UIDs different from the initial device

Author: ro-i

offload/liboffload/src/OffloadImpl.cpp

@@ -546,7 +546,7 @@ Error olGetDeviceInfoImplDetailHost(ol_device_handle_t Device,
   case OL_DEVICE_INFO_PRODUCT_NAME:
     return Info.writeString("Virtual Host Device");
   case OL_DEVICE_INFO_UID:
-    return Info.writeString(GenericPluginTy::getHostDeviceUid());
+    return Info.writeString(GenericPluginTy::getInitialDeviceUid());
   case OL_DEVICE_INFO_VENDOR:
     return Info.writeString("Liboffload");
   case OL_DEVICE_INFO_DRIVER_VERSION:

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

@@ -1304,8 +1304,8 @@ struct GenericPluginTy {
     return getDevice(DeviceId).getDeviceUid();
   }
 
-  /// Get the UID for the host device.
-  static constexpr const char *getHostDeviceUid() { return "HOST"; }
+  /// Get the UID for the initial (= host) device.
+  static constexpr const char *getInitialDeviceUid() { return "HOST"; }
 
   /// Get the ELF code to recognize the binary image of this plugin.
   virtual uint16_t getMagicElfBits() const = 0;

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

@@ -148,9 +148,7 @@ struct GenELF64DeviceTy : public GenericDeviceTy {
   /// Create the device with a specific id.
   GenELF64DeviceTy(GenericPluginTy &Plugin, int32_t DeviceId,
                    int32_t NumDevices)
-      : GenericDeviceTy(Plugin, DeviceId, NumDevices, GenELF64GridValues) {
-    DeviceUid = Plugin.getHostDeviceUid();
-  }
+      : GenericDeviceTy(Plugin, DeviceId, NumDevices, GenELF64GridValues) {}
 
   ~GenELF64DeviceTy() {}