additional replacements of hardcoded strings

Author: iassiour

projects/hip-tests/catch/README.md

@@ -154,7 +154,7 @@ If there arises a condition where certain flag is disabled and due to which a te
   ```cpp
   TEST_CASE("TestOnlyOnXnack") {
     if(!XNACKEnabled) {
-      HipTest::HIP_SKIP_TEST("Test only runs on system with XNACK enabled");
+      HipTest::HIP_SKIP_TEST(HipTest::SkipReason::kGpuXnackNotEnabled);
       return;
     }
     // Rest of test functionality

projects/hip-tests/catch/include/hip_test_checkers.hh

@@ -376,7 +376,7 @@ static bool assemblyFile_Verification(std::string assemfilename, std::string ins
     }
   } else {
     result = true;
-    HipTest::HIP_SKIP_TEST(HipTest::SkipReason::kAssemblyFileMissing);
+    HipTest::HIP_SKIP_TEST("Skipped: expected assembly file not found.");
   }
   return result;
 }

projects/hip-tests/catch/include/hip_test_common.hh

@@ -483,25 +483,43 @@ inline constexpr char const kNotEnoughGpusMaskedTests[] =
     "Skipped: not enough GPUs for masked GPU tests.";
 inline constexpr char const kMipmappedArraysUnsupported[] =
     "Skipped: mipmapped arrays are not supported on this device or configuration.";
-inline constexpr char const kAssemblyFileMissing[] = "Skipped: expected assembly file not found.";
 inline constexpr char const kCooperativeLaunchUnsupported[] =
     "Skipped: cooperative launch is not supported.";
 inline constexpr char const kPcieAtomicUnsupported[] =
     "Skipped: PCIe atomics are not supported on this device.";
 inline constexpr char const kStreamWaitValueUnsupported[] =
     "Skipped: hipStreamWaitValue is not supported on this device.";
+inline constexpr char const kStreamPriorityRangeUnsupported[] =
+    "Skipped: stream priority range is not supported on this device.";
 inline constexpr char const kWarpShuffleUnsupported[] =
     "Skipped: warp shuffle is not supported on this device.";
 inline constexpr char const kWarpVoteUnsupported[] =
     "Skipped: warp vote is not supported on this device.";
-inline constexpr char const kWarpBallotUnsupported[] =
-    "Skipped: warp ballot is not supported on this device.";
 inline constexpr char const kVmmUnsupported[] =
     "Skipped: virtual memory management (VMM) is not supported.";
-inline constexpr char const kLargeBarUnsupported[] =
-    "Skipped: large BAR (resizable BAR) is not supported on this device.";
 inline constexpr char const kFineGrainHwUnsupported[] =
     "Skipped: fine-grained memory / atomic hardware support is not available on this device.";
+inline constexpr char const kTextureImageUnsupported[] =
+    "Skipped: texture/image is not supported on this device.";
+inline constexpr char const kApiUnsupportedOnNvidia[] =
+    "Skipped: API is not supported on NVIDIA; test skipped.";
+inline constexpr char const kTextureGatherUnsupportedAmd[] =
+    "Skipped: texture gather arrays are not supported on AMD backend.";
+inline constexpr char const kGlewInitFailed[] = "Skipped: GLEW initialization failed.";
+inline constexpr char const kAssertionsDisabled[] =
+    "Skipped: assertions are disabled in this build.";
+inline constexpr char const kManagedMemoryOrNumaSetupUnavailable[] =
+    "Skipped: managed-memory-capable device or NUMA setup not available.";
+inline constexpr char const kConcurrentKernelExecutionUnsupported[] =
+    "Skipped: concurrent kernel execution is not supported.";
+inline constexpr char const kManagedAttachScenarioRequiresNoConcurrentAccess[] =
+    "Skipped: test targets devices without concurrent managed access.";
+inline constexpr char const kGpuXnackNotEnabled[] =
+    "Skipped: GPU is not XNACK-enabled.";
+inline constexpr char const kMemcpyPeerSameSrcDstDevice[] =
+    "Skipped: source and destination device are the same.";
+inline constexpr char const kRequiredDeviceCountNotMet[] =
+    "Skipped: required number of devices is not available.";
 }  // namespace SkipReason
 
 /**
@@ -672,7 +690,7 @@ class BlockingContext {
 // is supported on the current device.
 #define CHECK_IMAGE_SUPPORT                                                                        \
   if (!HipTest::isImageSupported()) {                                                              \
-    HipTest::HIP_SKIP_TEST("Texture is not supported on the device. Skipped.");                    \
+    HipTest::HIP_SKIP_TEST(HipTest::SkipReason::kTextureImageUnsupported);                         \
     return;                                                                                        \
   }
 
@@ -694,7 +712,7 @@ class BlockingContext {
 // skip the current test if they are not available.
 #define CHECK_WARP_MATCH_FUNCTIONS_SUPPORT                                                         \
   if (!HipTest::areWarpMatchFunctionsSupported()) {                                                \
-    HipTest::HIP_SKIP_TEST("Warp Match Functions are not supported on the device. Skipped.");      \
+    HipTest::HIP_SKIP_TEST("Skipped: warp match functions are not supported on this device.");      \
     return;                                                                                        \
   }
 

projects/hip-tests/catch/include/memcpy1d_tests_common.hh

@@ -126,9 +126,7 @@ void MemcpyDeviceToDeviceShell(F memcpy_func, const hipStream_t kernel_stream =
     int can_access_peer = 0;
     HIP_CHECK(hipDeviceCanAccessPeer(&can_access_peer, src_device, dst_device));
     if (!can_access_peer) {
-      std::string msg = "Skipped as peer access cannot be enabled between devices " +
-          std::to_string(src_device) + " " + std::to_string(dst_device);
-      HipTest::HIP_SKIP_TEST(msg.c_str());
+      HipTest::HIP_SKIP_TEST(HipTest::SkipReason::kPeerAccessUnavailable);
       return;
     }
     HIP_CHECK(hipDeviceEnablePeerAccess(dst_device, 0));

projects/hip-tests/catch/include/memcpy3d_tests_common.hh

@@ -173,9 +173,7 @@ void Memcpy3DDeviceToDeviceShell(F memcpy_func, hipStream_t kernel_stream = null
     int can_access_peer = 0;
     HIP_CHECK(hipDeviceCanAccessPeer(&can_access_peer, src_device, dst_device));
     if (!can_access_peer) {
-      std::string msg = "Skipped as peer access cannot be enabled between devices " +
-          std::to_string(src_device) + " " + std::to_string(dst_device);
-      HipTest::HIP_SKIP_TEST(msg.c_str());
+      HipTest::HIP_SKIP_TEST(HipTest::SkipReason::kPeerAccessUnavailable);
       if (device_count > 0 && kernel_stream != nullptr && kernel_stream != hipStreamPerThread) {
         HIP_CHECK(hipStreamDestroy(kernel_stream));
       }

projects/hip-tests/catch/multiproc/hipDeviceGetPCIBusIdMproc.cc

@@ -198,7 +198,7 @@ HIP_TEST_CASE(Unit_hipDeviceGetPCIBusId_CheckPciBusIDWithLspci) {
     pclose(fpipe);
 
     if (lspciCheck == nullptr) {
-      WARN("Skipping test as lspci is not found in system");
+      HipTest::HIP_SKIP_TEST("Skipped: lspci is not available on this system.");
       return;
     }
   }

projects/hip-tests/catch/multiproc/hipIpcEventHandle.cc

@@ -235,7 +235,7 @@ HIP_TEST_CASE(Unit_hipIpcEventHandle_Functional) {
   getDevices(shmDevices);
 
   if (shmDevices->count < 2) {
-    WARN("Test requires atleast two GPUs with P2P access. Skipping test.");
+    HipTest::HIP_SKIP_TEST(HipTest::SkipReason::kFewerThanTwoGpus);
     return;
   }
 

projects/hip-tests/catch/multiproc/hipMemCoherencyTstMProc.cc

@@ -109,7 +109,7 @@ HIP_TEST_CASE(Unit_malloc_CoherentTst) {
       REQUIRE(ret);
     }
   } else {
-    HipTest::HIP_SKIP_TEST("GPU is not xnack enabled hence skipping the test...\n");
+    HipTest::HIP_SKIP_TEST(HipTest::SkipReason::kGpuXnackNotEnabled);
   }
 }
 #endif
@@ -142,7 +142,7 @@ HIP_TEST_CASE(Unit_malloc_CoherentTstWthAdvise) {
       free(Ptr);
     }
   } else {
-    HipTest::HIP_SKIP_TEST("GPU is not xnack enabled hence skipping the test...\n");
+    HipTest::HIP_SKIP_TEST(HipTest::SkipReason::kGpuXnackNotEnabled);
   }
 }
 #endif
@@ -176,7 +176,7 @@ HIP_TEST_CASE(Unit_mmap_CoherentTst) {
       REQUIRE(ret);
     }
   } else {
-    HipTest::HIP_SKIP_TEST("GPU is not xnack enabled hence skipping the test...\n");
+    HipTest::HIP_SKIP_TEST(HipTest::SkipReason::kGpuXnackNotEnabled);
   }
 }
 #endif
@@ -220,7 +220,7 @@ HIP_TEST_CASE(Unit_mmap_CoherentTstWthAdvise) {
       HIP_CHECK(hipStreamDestroy(strm));
     }
   } else {
-    HipTest::HIP_SKIP_TEST("GPU is not xnack enabled hence skipping the test...\n");
+    HipTest::HIP_SKIP_TEST(HipTest::SkipReason::kGpuXnackNotEnabled);
   }
 }
 #endif

projects/hip-tests/catch/multiproc/hipSetGetDeviceMproc.cc

@@ -156,8 +156,8 @@ static void testValidDevices(int numDevices, bool useRocrEnv, int* deviceList,
   std::string visibleDeviceString;
 
   if ((NULL == deviceList) || ((deviceListLength < 1) || deviceListLength > numDevices)) {
-    INFO("Invalid argument for number of devices. Skipping current test");
-    REQUIRE(false);
+    HipTest::HIP_SKIP_TEST("Skipped: invalid device list arguments for multiproc test.");
+    return;
   }
 
   for (int i = 0; i < deviceListLength; i++) {

projects/hip-tests/catch/performance/memcpy/memcpy_performance_common.hh

@@ -80,9 +80,7 @@ static std::tuple<int, int> GetDeviceIds(bool enable_peer_access) {
     int can_access_peer = 0;
     HIP_CHECK(hipDeviceCanAccessPeer(&can_access_peer, src_device, dst_device));
     if (!can_access_peer) {
-      std::string msg = "Skipped as peer access cannot be enabled between devices " +
-          std::to_string(src_device) + " " + std::to_string(dst_device);
-      HipTest::HIP_SKIP_TEST(msg.c_str());
+      HipTest::HIP_SKIP_TEST(HipTest::SkipReason::kPeerAccessUnavailable);
       return {-1, -1};
     }
     HIP_CHECK(hipDeviceEnablePeerAccess(dst_device, 0));