Merge pull request #1690 from hdelan/add-uuid-to-device-name

aarongreig · web-flow · commit c015f892fe76 · 2024-05-31T09:54:05.000+01:00
[Test] Add UUID to device name
diff --git a/test/conformance/testing/include/uur/utils.h b/test/conformance/testing/include/uur/utils.h
@@ -189,9 +189,13 @@ inline std::string GetPlatformName(ur_platform_handle_t hPlatform) {
 }
 
 inline std::string GetDeviceName(ur_device_handle_t device) {
-    std::string device_name;
+    std::string device_name, device_uuid;
     GetDeviceInfo<std::string>(device, UR_DEVICE_INFO_NAME, device_name);
-    return GTestSanitizeString(device_name);
+    GetDeviceInfo<std::string>(device, UR_DEVICE_INFO_UUID, device_uuid);
+    if (!device_uuid.empty()) {
+        device_uuid += "____";
+    }
+    return GTestSanitizeString(device_name + device_uuid);
 }
 
 inline std::string GetPlatformAndDeviceName(ur_device_handle_t device) {

Original file line number	Diff line number	Diff line change
`@@ -189,9 +189,13 @@ inline std::string GetPlatformName(ur_platform_handle_t hPlatform) {`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`inline std::string GetDeviceName(ur_device_handle_t device) {`
`192`		`- std::string device_name;`
	`192`	`+ std::string device_name, device_uuid;`
`193`	`193`	`GetDeviceInfo<std::string>(device, UR_DEVICE_INFO_NAME, device_name);`
`194`		`- return GTestSanitizeString(device_name);`
	`194`	`+ GetDeviceInfo<std::string>(device, UR_DEVICE_INFO_UUID, device_uuid);`
	`195`	`+ if (!device_uuid.empty()) {`
	`196`	`+ device_uuid += "____";`
	`197`	`+ }`
	`198`	`+ return GTestSanitizeString(device_name + device_uuid);`
`195`	`199`	`}`
`196`	`200`
`197`	`201`	`inline std::string GetPlatformAndDeviceName(ur_device_handle_t device) {`