Merge 'develop' into 'amd-staging'

Change-Id: I8ce41cabe7e54a4ea9b57ada53d83f7e1d65f354

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");

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;

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