fix cuda plugin UID

Author: ro-i

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

@@ -2091,7 +2091,7 @@ struct AMDGPUDeviceTy : public GenericDeviceTy, AMDGenericDeviceTy {
     //
     // Agents that do not support UUID will return the string "GPU-XX" or
     // "CPU-XX" or "DSP-XX" depending on their device type.
-    char Uuid[24];
+    char Uuid[24] = {0};
     if (auto Err = getDeviceAttr(HSA_AMD_AGENT_INFO_UUID, Uuid))
       return Err;
     if (strcmp(Uuid + 3, "-XX") != 0)

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

@@ -1216,7 +1216,7 @@ struct GenericDeviceTy : public DeviceAllocatorTy {
   /// between different plugins.
   std::string DeviceUid;
   /// Construct the device UID from the vendor (U)UID.
-  void setDeviceUidFromVendorUid(const char *VendorUid);
+  void setDeviceUidFromVendorUid(StringRef VendorUid);
 
   /// The default grid values used for this device.
   llvm::omp::GV GridValues;

offload/plugins-nextgen/common/src/PluginInterface.cpp

@@ -1613,7 +1613,7 @@ Expected<bool> GenericDeviceTy::isAccessiblePtr(const void *Ptr, size_t Size) {
   return isAccessiblePtrImpl(Ptr, Size);
 }
 
-void GenericDeviceTy::setDeviceUidFromVendorUid(const char *VendorUid) {
+void GenericDeviceTy::setDeviceUidFromVendorUid(StringRef VendorUid) {
   DeviceUid = std::string(Plugin.getName()) + "-" + std::string(VendorUid);
 }
 

offload/plugins-nextgen/cuda/dynamic_cuda/cuda.h

@@ -33,7 +33,9 @@ typedef struct CUfunc_st *CUfunction;
 typedef void (*CUhostFn)(void *userData);
 typedef struct CUstream_st *CUstream;
 typedef struct CUevent_st *CUevent;
-typedef struct CUuuid_st *CUuuid;
+typedef struct CUuuid_st {
+  char bytes[16];
+} CUuuid;
 
 #define CU_DEVICE_INVALID ((CUdevice)(-2))
 

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

@@ -25,6 +25,7 @@
 #include "PluginInterface.h"
 #include "Utils/ELF.h"
 
+#include "llvm/ADT/StringExtras.h"
 #include "llvm/BinaryFormat/ELF.h"
 #include "llvm/Frontend/OpenMP/OMPConstants.h"
 #include "llvm/Frontend/OpenMP/OMPGridValues.h"
@@ -293,11 +294,11 @@ struct CUDADeviceTy : public GenericDeviceTy {
     if (auto Err = Plugin::check(Res, "error in cuDeviceGet: %s"))
       return Err;
 
-    char Uuid[16];
-    Res = cuDeviceGetUuid(Uuid, Device);
+    CUuuid Uuid = {0};
+    Res = cuDeviceGetUuid(&Uuid, Device);
     if (auto Err = Plugin::check(Res, "error in cuDeviceGetUuid: %s"))
       return Err;
-    setDeviceUidFromVendorUid(Uuid);
+    setDeviceUidFromVendorUid(toHex(Uuid.bytes, true));
 
     // Query the current flags of the primary context and set its flags if
     // it is inactive.