capitalize UUID; use StringRef::ends_with

Author: ro-i

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

@@ -2091,11 +2091,11 @@ 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] = {0};
-    if (auto Err = getDeviceAttr(HSA_AMD_AGENT_INFO_UUID, Uuid))
+    char UUID[24] = {0};
+    if (auto Err = getDeviceAttr(HSA_AMD_AGENT_INFO_UUID, UUID))
       return Err;
-    if (strcmp(Uuid + 3, "-XX") != 0)
-      setDeviceUidFromVendorUid(Uuid);
+    if (!StringRef(UUID).ends_with("-XX"))
+      setDeviceUidFromVendorUid(UUID);
 
     // Get the wavefront size.
     uint32_t WavefrontSize = 0;

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

@@ -294,11 +294,11 @@ struct CUDADeviceTy : public GenericDeviceTy {
     if (auto Err = Plugin::check(Res, "error in cuDeviceGet: %s"))
       return Err;
 
-    CUuuid Uuid = {0};
-    Res = cuDeviceGetUuid(&Uuid, Device);
+    CUuuid UUID = {0};
+    Res = cuDeviceGetUuid(&UUID, Device);
     if (auto Err = Plugin::check(Res, "error in cuDeviceGetUuid: %s"))
       return Err;
-    setDeviceUidFromVendorUid(toHex(Uuid.bytes, true));
+    setDeviceUidFromVendorUid(toHex(UUID.bytes, true));
 
     // Query the current flags of the primary context and set its flags if
     // it is inactive.