From 9726351ae8d73262d67514776bbe989d3c34e94c Mon Sep 17 00:00:00 2001
From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com>
Date: Wed, 31 May 2023 00:55:47 +0530
Subject: [PATCH 1/2] SWDEV-387508 - do not treat uuid as a string (#253)

Change-Id: Ic093384947637fe9242c5840349f6d71aea28e69
---
 catch/unit/device/hipDeviceGetUuid.cc | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/catch/unit/device/hipDeviceGetUuid.cc b/catch/unit/device/hipDeviceGetUuid.cc
index 47a9bd2c4f..d7557527ea 100644
--- a/catch/unit/device/hipDeviceGetUuid.cc
+++ b/catch/unit/device/hipDeviceGetUuid.cc
@@ -36,14 +36,24 @@ Unit_hipDeviceGetUuid_Negative - Test unsuccessful execution of hipDeviceGetUuid
  */
 TEST_CASE("Unit_hipDeviceGetUuid_Positive") {
   hipDevice_t device;
-  hipUUID uuid;
+  hipUUID uuid{0};
+  bool uuidValid = false;
 
   const int deviceId = GENERATE(range(0, HipTest::getDeviceCount()));
   HIP_CHECK(hipDeviceGet(&device, deviceId));
 
   // Scenario 1
   HIP_CHECK(hipDeviceGetUuid(&uuid, device));
-  REQUIRE(strcmp(uuid.bytes, "") != 0);
+
+  // Atleast one non zero value
+  size_t uuidSize = sizeof(uuid.bytes) / sizeof(uuid.bytes[0]);
+  for (int i = 0; i < uuidSize; i++) {
+    if (uuid.bytes[i] != 0) {
+      uuidValid = true;
+      break;
+    }
+  }
+  REQUIRE(uuidValid == true);
 }
 
 /**

From 7d7b4ab0750bc55668a0a7cfb3fec8f94362eeb8 Mon Sep 17 00:00:00 2001
From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com>
Date: Wed, 31 May 2023 00:56:15 +0530
Subject: [PATCH 2/2] SWDEV-394336 - Pass CMAKE_PREFIX_PATH. (#265)

Change-Id: I0d3f7c140559559283e362b728b0f8082d8716b8
---
 samples/2_Cookbook/22_cmake_hip_lang/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/2_Cookbook/22_cmake_hip_lang/README.md b/samples/2_Cookbook/22_cmake_hip_lang/README.md
index c770d75f63..7f7ac025b1 100644
--- a/samples/2_Cookbook/22_cmake_hip_lang/README.md
+++ b/samples/2_Cookbook/22_cmake_hip_lang/README.md
@@ -1,7 +1,7 @@
 ### This will test HIP language support in upstream CMake
 I. Build
 mkdir -p build; cd build
-rm -rf *; cmake ..
+rm -rf *; cmake -DCMAKE_PREFIX_PATH=/opt/rocm/ ..
 make
 
 II. Test