From a55ff53480e65781574f79ec08e4dde94c0bb27e Mon Sep 17 00:00:00 2001
From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com>
Date: Fri, 27 Jan 2023 20:46:54 +0530
Subject: [PATCH 1/2] SWDEV-327563 - enable hipMemset skipped test cases (#135)

* SWDEV-327563 - enable hipMemset skipped test cases

Change-Id: I29393c9d690eb3777d7e9f0e599a87ead4a00482
---
 catch/unit/memory/hipMemsetAsync.cc | 9 +--------
 catch/unit/memory/hipMemsetSync.cc  | 8 ++++----
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/catch/unit/memory/hipMemsetAsync.cc b/catch/unit/memory/hipMemsetAsync.cc
index b0752e3694..10391be428 100644
--- a/catch/unit/memory/hipMemsetAsync.cc
+++ b/catch/unit/memory/hipMemsetAsync.cc
@@ -80,10 +80,7 @@ static void doMemsetTest(allocType mallocType, memType memset_type, MultiDData d
  */
 
 TEST_CASE("Unit_hipMemsetASyncMulti") {
-#if HT_AMD
-  HipTest::HIP_SKIP_TEST("EXSWCPHIPT-127");
-  return;
-#endif
+
   allocType mallocType = GENERATE(allocType::hostMalloc, allocType::deviceMalloc,
                                   allocType::hostRegisted, allocType::devRegistered);
   memType mem_type = memType::hipMemsetD8;
@@ -101,10 +98,6 @@ TEST_CASE("Unit_hipMemsetASyncMulti") {
  * test 2 async hipMemsetD[8,16,32]'s on the same memory at different offsets
  */
 TEMPLATE_TEST_CASE("Unit_hipMemsetDASyncMulti", "", int8_t, int16_t, uint32_t) {
-#if HT_AMD
-  HipTest::HIP_SKIP_TEST("EXSWCPHIPT-127");
-  return;
-#endif
   allocType mallocType = GENERATE(allocType::hostRegisted, allocType::deviceMalloc,
                                   allocType::hostMalloc, allocType::devRegistered);
   memType memset_type;
diff --git a/catch/unit/memory/hipMemsetSync.cc b/catch/unit/memory/hipMemsetSync.cc
index 2a55a2a0a3..f3de97e02f 100644
--- a/catch/unit/memory/hipMemsetSync.cc
+++ b/catch/unit/memory/hipMemsetSync.cc
@@ -439,7 +439,7 @@ static void doMemsetTest(allocType mallocType, memSetType memset_type, MultiDDat
 }
 
 TEST_CASE("Unit_hipMemsetSync") {
-#if HT_AMD || HT_NVIDIA
+#if HT_NVIDIA
   HipTest::HIP_SKIP_TEST("EXSWCPHIPT-86");
   return;
 #endif
@@ -452,7 +452,7 @@ TEST_CASE("Unit_hipMemsetSync") {
 }
 
 TEMPLATE_TEST_CASE("Unit_hipMemsetDSync", "", int8_t, int16_t, uint32_t) {
-#if HT_AMD || HT_NVIDIA
+#if HT_NVIDIA
   HipTest::HIP_SKIP_TEST("EXSWCPHIPT-86");
   return;
 #endif
@@ -474,7 +474,7 @@ TEMPLATE_TEST_CASE("Unit_hipMemsetDSync", "", int8_t, int16_t, uint32_t) {
 }
 
 TEST_CASE("Unit_hipMemset2DSync") {
-#if HT_AMD || HT_NVIDIA
+#if HT_NVIDIA
   HipTest::HIP_SKIP_TEST("EXSWCPHIPT-86");
   return;
 #endif
@@ -489,7 +489,7 @@ TEST_CASE("Unit_hipMemset2DSync") {
 }
 
 TEST_CASE("Unit_hipMemset3DSync") {
-#if HT_AMD || HT_NVIDIA
+#if HT_NVIDIA
   HipTest::HIP_SKIP_TEST("EXSWCPHIPT-86");
   return;
 #endif

From ce9eb703461b757a981d24fbe5a1772aded9bd88 Mon Sep 17 00:00:00 2001
From: ROCm CI Service Account <66695075+rocm-ci@users.noreply.github.com>
Date: Fri, 27 Jan 2023 20:53:50 +0530
Subject: [PATCH 2/2] SWDEV-370743 - Adding 'accelerator' keyword in lspci grep
 for AMD supported devices. (#134)

Change-Id: I9daed025e86654fc7d936ef86f2d069d41c393f2
---
 catch/multiproc/hipDeviceGetPCIBusIdMproc.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catch/multiproc/hipDeviceGetPCIBusIdMproc.cc b/catch/multiproc/hipDeviceGetPCIBusIdMproc.cc
index 5accbe20ed..86e8e95578 100644
--- a/catch/multiproc/hipDeviceGetPCIBusIdMproc.cc
+++ b/catch/multiproc/hipDeviceGetPCIBusIdMproc.cc
@@ -217,7 +217,7 @@ TEST_CASE("Unit_hipDeviceGetPCIBusId_CheckPciBusIDWithLspci") {
     command = "lspci -D | grep controller | grep NVIDIA | "
               "cut -d ' ' -f 1";
   } else {
-    command = "lspci -D | grep controller | grep AMD/ATI | "
+    command = "lspci -D | grep -e controller -e accelerator | grep AMD/ATI | "
               "cut -d ' ' -f 1";
   }
   fpipe = popen(command, "r");