Revert "Revert "Merge branch 'amd-master-next' into amd-npi-next""

This reverts commit 28b17d3dbd.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I92ceb171e31026ed1864704cef2fc1497b883ef9


[ROCm/hip commit: ad2d55c144]

projects/hip/tests/src/test_common.h

@@ -41,7 +41,6 @@ THE SOFTWARE.
 
 #define HC __attribute__((hc))
 
-
 #define KNRM "\x1B[0m"
 #define KRED "\x1B[31m"
 #define KGRN "\x1B[32m"
@@ -51,6 +50,19 @@ THE SOFTWARE.
 #define KCYN "\x1B[36m"
 #define KWHT "\x1B[37m"
 
+  // HIP Skip Return code set at cmake
+#define HIP_SKIP_RETURN_CODE 127
+#define HIP_ENABLE_SKIP_TESTS 0
+
+inline bool hip_skip_tests_enabled() {
+  return HIP_ENABLE_SKIP_TESTS;
+}
+
+inline int hip_skip_retcode() {
+  // HIP Skip Return code set at cmake
+  return HIP_SKIP_RETURN_CODE;
+}
+
 #define passed()                                                                                   \
     printf("%sPASSED!%s\n", KGRN, KNRM);                                                           \
     exit(0);