From 673c93e96e41c23d5bba28d75569c8215926b942 Mon Sep 17 00:00:00 2001 From: "systems-assistant[bot]" <221163467+systems-assistant[bot]@users.noreply.github.com> Date: Wed, 3 Sep 2025 20:34:38 +0530 Subject: [PATCH] SWDEV-545482 - Refactor the error handling test cases (#544) Co-authored-by: Satyanvesh Dittakavi --- .../catch/unit/errorHandling/CMakeLists.txt | 3 +- .../unit/errorHandling/hipGetLastError.cc | 131 +++--------------- .../unit/errorHandling/hipPeekAtLastError.cc | 109 +++------------ 3 files changed, 42 insertions(+), 201 deletions(-) diff --git a/projects/hip-tests/catch/unit/errorHandling/CMakeLists.txt b/projects/hip-tests/catch/unit/errorHandling/CMakeLists.txt index 2365905d97..c932a8d357 100644 --- a/projects/hip-tests/catch/unit/errorHandling/CMakeLists.txt +++ b/projects/hip-tests/catch/unit/errorHandling/CMakeLists.txt @@ -28,4 +28,5 @@ hip_add_exe_to_target(NAME ErrorHandlingTest TEST_TARGET_NAME build_tests COMPILE_OPTIONS -std=c++17) -add_dependencies(build_tests hipGetLastErrorEnv_Exe hipPeekAtLastErrorEnv_Exe) +add_dependencies(ErrorHandlingTest hipGetLastErrorEnv_Exe hipPeekAtLastErrorEnv_Exe) +set_property(GLOBAL APPEND PROPERTY G_INSTALL_EXE_TARGETS hipGetLastErrorEnv_Exe hipPeekAtLastErrorEnv_Exe) diff --git a/projects/hip-tests/catch/unit/errorHandling/hipGetLastError.cc b/projects/hip-tests/catch/unit/errorHandling/hipGetLastError.cc index 4a5b7ba674..0b7dfa6d95 100644 --- a/projects/hip-tests/catch/unit/errorHandling/hipGetLastError.cc +++ b/projects/hip-tests/catch/unit/errorHandling/hipGetLastError.cc @@ -26,12 +26,6 @@ THE SOFTWARE. #include //NOLINT #include //NOLINT -#ifdef _WIN64 -#include -#define setenv(x, y, z) _putenv_s(x, y) -#define unsetenv(x) _putenv(x) -#endif - static constexpr size_t WIDTH = 1024; static constexpr size_t HEIGHT = 1024; static constexpr size_t N = 1024 * 1024; @@ -935,17 +929,11 @@ TEST_CASE("Unit_hipGetLastError_with_Kernel_Invalid_Configuration") { HIP_CHECK(hipStreamDestroy(stream)); } #endif -/* -New environment variable DEBUG_HIP_7_PREVIEW is added. -This is used for enabling the backward incompatible changes before the next -major ROCm release 7.0. This will be removed after the ROCm release 7.0. -*/ /** * Test Description * ------------------------ - *  - With Env Var DEBUG_HIP_7_PREVIEW, Verify hipGetLastError status - * with hipMalloc api invalid arg call. - * Status should be last Error reported in the thread/Runtime. + * - Verify hipGetLastError status with an Error - Success calls + * Each time status should return the corresponding Error when it called. * Test source * ------------------------ *  - unit/errorHandling/hipGetLastError.cc @@ -953,35 +941,7 @@ major ROCm release 7.0. This will be removed after the ROCm release 7.0. * ------------------------ *  - HIP_VERSION >= 6.4 */ -TEST_CASE("Unit_hipGetLastError_With_EnvVar_Positive_Basic") { - if (setenv("DEBUG_HIP_7_PREVIEW", "1", 1) == 0) { - HIP_CHECK_ERROR(hipMalloc(nullptr, 1), hipErrorInvalidValue); - int* A_d; - HIP_CHECK(hipMalloc(&A_d, 1024)); - HIP_CHECK_ERROR(hipGetLastError(), hipErrorInvalidValue); - HIP_CHECK_ERROR(hipGetLastError(), hipSuccess); - HIP_CHECK(hipFree(A_d)); - HIP_CHECK_ERROR(hipGetLastError(), hipSuccess); - unsetenv("DEBUG_HIP_7_PREVIEW"); - } else { - INFO("Env Not set"); - } -} -/** - * Test Description - * ------------------------ - *  - With Env Var DEBUG_HIP_7_PREVIEW, Verify hipGetLastError status - * with an Error - Success calls - * Each time status should return the corresponding Error when it called. - * Test source - * ------------------------ - *  - unit/errorHandling/hipGetLastError.cc - * Test requirements - * ------------------------ - *  - HIP_VERSION >= 6.4 - */ -TEST_CASE("Unit_hipGetLastError_With_EnvVar_Chk_Updated_Status") { - if (setenv("DEBUG_HIP_7_PREVIEW", "1", 1) == 0) { +TEST_CASE("Unit_hipGetLastError_With_Chk_Updated_Status") { hipGraph_t graph; HIP_CHECK_ERROR(hipGraphCreate(&graph, 1), hipErrorInvalidValue); HIP_CHECK_ERROR(hipGetLastError(), hipErrorInvalidValue); @@ -989,16 +949,11 @@ TEST_CASE("Unit_hipGetLastError_With_EnvVar_Chk_Updated_Status") { HIP_CHECK(hipMalloc(&C_d, 1024)); HIP_CHECK_ERROR(hipGetLastError(), hipSuccess); HIP_CHECK(hipFree(C_d)); - unsetenv("DEBUG_HIP_7_PREVIEW"); - } else { - INFO("Env Not set"); - } } /** * Test Description * ------------------------ - *  - With Env Var DEBUG_HIP_7_PREVIEW, Verify hipGetLastError status - * along with hipPeekAtLastError. + *  - Verify hipGetLastError status along with hipPeekAtLastError. * Test source * ------------------------ *  - unit/errorHandling/hipGetLastError.cc @@ -1006,8 +961,7 @@ TEST_CASE("Unit_hipGetLastError_With_EnvVar_Chk_Updated_Status") { * ------------------------ *  - HIP_VERSION >= 6.4 */ -TEST_CASE("Unit_hipGetLastError_With_EnvVar_Chk_Along_hipPeekAtLastError") { - if (setenv("DEBUG_HIP_7_PREVIEW", "1", 1) == 0) { +TEST_CASE("Unit_hipGetLastError_Chk_Along_hipPeekAtLastError") { hipGraph_t graph; HIP_CHECK_ERROR(hipGraphCreate(&graph, 1), hipErrorInvalidValue); HIP_CHECK_ERROR(hipPeekAtLastError(), hipErrorInvalidValue); @@ -1016,15 +970,11 @@ TEST_CASE("Unit_hipGetLastError_With_EnvVar_Chk_Along_hipPeekAtLastError") { HIP_CHECK(hipFree(C_d)); HIP_CHECK_ERROR(hipGetLastError(), hipErrorInvalidValue); HIP_CHECK_ERROR(hipGetLastError(), hipSuccess); - unsetenv("DEBUG_HIP_7_PREVIEW"); - } else { - INFO("Env Not set"); - } } /** * Test Description * ------------------------ - *  - With Env Var DEBUG_HIP_7_PREVIEW, Verify hipGetLastError status + *  - Verify hipGetLastError status * with different Error and Success combinations. * Each time status should return the corresponding Error when it called. * Test source @@ -1034,24 +984,18 @@ TEST_CASE("Unit_hipGetLastError_With_EnvVar_Chk_Along_hipPeekAtLastError") { * ------------------------ *  - HIP_VERSION >= 6.4 */ -TEST_CASE("Unit_hipGetLastError_With_EnvVar_Error_Combinations") { +TEST_CASE("Unit_hipGetLastError_Error_Combinations") { int value = 0; hipGraph_t graph; SECTION("A case with Error-Error") { - if (setenv("DEBUG_HIP_7_PREVIEW", "1", 1) == 0) { HIP_CHECK(hipGetLastError()); HIP_CHECK_ERROR(hipGraphCreate(&graph, 1), hipErrorInvalidValue); HIP_CHECK_ERROR(hipDeviceGetGraphMemAttribute(-1, hipGraphMemAttrUsedMemCurrent, &value), hipErrorInvalidDevice); HIP_CHECK_ERROR(hipGetLastError(), hipErrorInvalidDevice); HIP_CHECK_ERROR(hipGetLastError(), hipSuccess); - unsetenv("DEBUG_HIP_7_PREVIEW"); - } else { - INFO("Env Not set"); - } } SECTION("A case with Error-Success-Error-Success") { - if (setenv("DEBUG_HIP_7_PREVIEW", "1", 1) == 0) { HIP_CHECK_ERROR(hipGraphCreate(&graph, 1), hipErrorInvalidValue); int* A_d; HIP_CHECK(hipMalloc(&A_d, 1024)); @@ -1060,14 +1004,9 @@ TEST_CASE("Unit_hipGetLastError_With_EnvVar_Error_Combinations") { HIP_CHECK(hipFree(A_d)); HIP_CHECK_ERROR(hipGetLastError(), hipErrorInvalidDevice); HIP_CHECK_ERROR(hipGetLastError(), hipSuccess); - unsetenv("DEBUG_HIP_7_PREVIEW"); - } else { - INFO("Env Not set"); - } } SECTION("A case with Success-Error-Error-Success") { - if (setenv("DEBUG_HIP_7_PREVIEW", "1", 1) == 0) { - int* A_d; + int *A_d; HIP_CHECK(hipMalloc(&A_d, 1024)); HIP_CHECK_ERROR(hipGraphCreate(&graph, 1), hipErrorInvalidValue); HIP_CHECK_ERROR(hipDeviceGetGraphMemAttribute(-1, hipGraphMemAttrUsedMemCurrent, &value), @@ -1075,14 +1014,9 @@ TEST_CASE("Unit_hipGetLastError_With_EnvVar_Error_Combinations") { HIP_CHECK(hipFree(A_d)); HIP_CHECK_ERROR(hipGetLastError(), hipErrorInvalidDevice); HIP_CHECK_ERROR(hipGetLastError(), hipSuccess); - unsetenv("DEBUG_HIP_7_PREVIEW"); - } else { - INFO("Env Not set"); - } } SECTION("A Case with Success-Error-Success-Error") { - if (setenv("DEBUG_HIP_7_PREVIEW", "1", 1) == 0) { - int* A_d; + int *A_d; HIP_CHECK(hipMalloc(&A_d, 1024)); HIP_CHECK_ERROR(hipGraphCreate(&graph, 1), hipErrorInvalidValue); HIP_CHECK(hipFree(A_d)); @@ -1090,10 +1024,6 @@ TEST_CASE("Unit_hipGetLastError_With_EnvVar_Error_Combinations") { hipErrorInvalidDevice); HIP_CHECK_ERROR(hipGetLastError(), hipErrorInvalidDevice); HIP_CHECK_ERROR(hipGetLastError(), hipSuccess); - unsetenv("DEBUG_HIP_7_PREVIEW"); - } else { - INFO("Env Not set"); - } } } @@ -1106,8 +1036,7 @@ static void thread_func() { /** * Test Description * ------------------------ - *  - With Env Var DEBUG_HIP_7_PREVIEW, Verify hipGetLastError status with a - * runtime api invalid arg call. + *  - Verify hipGetLastError status with a runtime api invalid arg call. * Check in other thread this error should not report by hipGetLastError() * Test source * ------------------------ @@ -1116,10 +1045,9 @@ static void thread_func() { * ------------------------ *  - HIP_VERSION >= 6.4 */ -TEST_CASE("Unit_hipGetLastError_With_EnvVar_With_Thread") { +TEST_CASE("Unit_hipGetLastError_With_Thread") { hipGraph_t graph; - if (setenv("DEBUG_HIP_7_PREVIEW", "1", 1) == 0) { - int* A_d; + int *A_d; HIP_CHECK(hipMalloc(&A_d, 1024)); HIP_CHECK_ERROR(hipGraphCreate(&graph, 1), hipErrorInvalidValue); std::thread t(thread_func); @@ -1127,16 +1055,11 @@ TEST_CASE("Unit_hipGetLastError_With_EnvVar_With_Thread") { HIP_CHECK(hipFree(A_d)); HIP_CHECK_ERROR(hipGetLastError(), hipErrorInvalidValue); HIP_CHECK_ERROR(hipGetLastError(), hipSuccess); - unsetenv("DEBUG_HIP_7_PREVIEW"); - } else { - INFO("Env Not set"); - } } /** * Test Description * ------------------------ - *  - With Env Var DEBUG_HIP_7_PREVIEW, Verify hipGetLastError status - * in the multiple processes. + *  - Verify hipGetLastError status in the multiple processes. * Test source * ------------------------ *  - unit/errorHandling/hipGetLastError.cc @@ -1144,32 +1067,23 @@ TEST_CASE("Unit_hipGetLastError_With_EnvVar_With_Thread") { * ------------------------ *  - HIP_VERSION >= 6.4 */ -// Disabled due to test failure -#if 0 -TEST_CASE("Unit_hipGetLastError_With_EnvVar_MultiProcess") { +TEST_CASE("Unit_hipGetLastError_MultiProcess") { hipGraph_t graph; - if (setenv("DEBUG_HIP_7_PREVIEW", "1", 1) == 0) { - /*int *A_d; + int *A_d; HIP_CHECK(hipMalloc(&A_d, 1024)); - HIP_CHECK_ERROR(hipGraphCreate(&graph, 1), hipErrorInvalidValue);*/ + HIP_CHECK_ERROR(hipGraphCreate(&graph, 1), hipErrorInvalidValue); hip::SpawnProc proc("hipGetLastErrorEnv_Exe", true); HIP_CHECK_ERROR(hipGraphCreate(&graph, 1), hipErrorInvalidValue); REQUIRE(proc.run() == 1); - //HIP_CHECK(hipFree(A_d)); + HIP_CHECK(hipFree(A_d)); HIP_CHECK_ERROR(hipGetLastError(), hipErrorInvalidValue); HIP_CHECK_ERROR(hipGetLastError(), hipSuccess); - unsetenv("DEBUG_HIP_7_PREVIEW"); - } else { - INFO("Env Not set"); - } } -#endif -static void __global__ emptyKernl() {} +static void __global__ emptyKernl() { } /** * Test Description * ------------------------ - *  - With Env Var DEBUG_HIP_7_PREVIEW, Verify hipGetLastError status - * with Invalid Configuration in kernel call. + *  - Verify hipGetLastError status with Invalid Configuration in kernel call. * Kernel call invalid configuration- blocks=0 & threadsPerBlock=0 * Test source * ------------------------ @@ -1182,9 +1096,8 @@ static void __global__ emptyKernl() {} // Below test failed on NVIDIA due to error mismatch produced by the Invalid Kernel config. // For more details please check the ticket SWDEV-501851 comments. #if HT_AMD -TEST_CASE("Unit_hipGetLastError_With_EnvVar_Kernel_Invalid_Config") { +TEST_CASE("Unit_hipGetLastError_Kernel_Invalid_Config") { hipError_t ret; - if (setenv("DEBUG_HIP_7_PREVIEW", "1", 1) == 0) { hipLaunchKernelGGL(emptyKernl, dim3(0), dim3(0), 0, 0); int* A_d; HIP_CHECK(hipMalloc(&A_d, 1024)); @@ -1192,10 +1105,6 @@ TEST_CASE("Unit_hipGetLastError_With_EnvVar_Kernel_Invalid_Config") { REQUIRE(ret == hipErrorInvalidConfiguration); HIP_CHECK_ERROR(hipGetLastError(), hipSuccess); HIP_CHECK(hipFree(A_d)); - unsetenv("DEBUG_HIP_7_PREVIEW"); - } else { - INFO("Env Not set"); - } } #endif /** diff --git a/projects/hip-tests/catch/unit/errorHandling/hipPeekAtLastError.cc b/projects/hip-tests/catch/unit/errorHandling/hipPeekAtLastError.cc index 8e168e6ba0..cb2b56ac0c 100644 --- a/projects/hip-tests/catch/unit/errorHandling/hipPeekAtLastError.cc +++ b/projects/hip-tests/catch/unit/errorHandling/hipPeekAtLastError.cc @@ -21,12 +21,6 @@ THE SOFTWARE. #include #include -#ifdef _WIN64 -#include -#define setenv(x, y, z) _putenv_s(x, y) -#define unsetenv(x) _putenv(x) -#endif - /** * @addtogroup hipPeekAtLastError hipPeekAtLastError * @{ @@ -85,17 +79,10 @@ TEST_CASE("Unit_hipPeekAtLastError_Positive_Threaded") { HipPeekAtLastErrorTest test; test.run(); } -/* - * New environment variable DEBUG_HIP_7_PREVIEW is added. - * This is used for enabling the backward incompatible changes before the next - * major ROCm release 7.0. - * This will be removed after the ROCm release 7.0. - */ /** * Test Description * ------------------------ - *  - With Env Var DEBUG_HIP_7_PREVIEW, Verify hipPeekAtLastError status - * with hipMalloc api invalid arg call. + *  - Verify hipPeekAtLastError status with hipMalloc api invalid arg call. * Status should be last Error reported in the thread/Runtime. * Test source * ------------------------ @@ -104,8 +91,7 @@ TEST_CASE("Unit_hipPeekAtLastError_Positive_Threaded") { * ------------------------ *  - HIP_VERSION >= 6.4 */ -TEST_CASE("Unit_hipPeekAtLastError_With_EnvVar_Positive_Basic") { - if (setenv("DEBUG_HIP_7_PREVIEW", "1", 1) == 0) { +TEST_CASE("Unit_hipPeekAtLastError_Positive") { HIP_CHECK_ERROR(hipMalloc(nullptr, 1), hipErrorInvalidValue); int* A_d; HIP_CHECK(hipMalloc(&A_d, 1024)); @@ -113,16 +99,11 @@ TEST_CASE("Unit_hipPeekAtLastError_With_EnvVar_Positive_Basic") { HIP_CHECK(hipFree(A_d)); HIP_CHECK_ERROR(hipPeekAtLastError(), hipErrorInvalidValue); HIP_CHECK_ERROR(hipPeekAtLastError(), hipErrorInvalidValue); - unsetenv("DEBUG_HIP_7_PREVIEW"); - } else { - INFO("Env Not set"); - } } /** * Test Description * ------------------------ - *  - With Env Var DEBUG_HIP_7_PREVIEW, Verify hipPeekAtLastError status - * with an Error - Success calls + *  - Verify hipPeekAtLastError status with an Error - Success calls * Each time status should return the corresponding Error when it called. * Test source * ------------------------ @@ -131,8 +112,7 @@ TEST_CASE("Unit_hipPeekAtLastError_With_EnvVar_Positive_Basic") { * ------------------------ *  - HIP_VERSION >= 6.4 */ -TEST_CASE("Unit_hipPeekAtLastError_With_EnvVar_Chk_Updated_Status") { - if (setenv("DEBUG_HIP_7_PREVIEW", "1", 1) == 0) { +TEST_CASE("Unit_hipPeekAtLastError_Chk_Updated_Status") { hipGraph_t graph; int value = 0; HIP_CHECK_ERROR(hipGraphCreate(&graph, 1), hipErrorInvalidValue); @@ -143,16 +123,11 @@ TEST_CASE("Unit_hipPeekAtLastError_With_EnvVar_Chk_Updated_Status") { hipErrorInvalidDevice); HIP_CHECK(hipFree(C_d)); HIP_CHECK_ERROR(hipPeekAtLastError(), hipErrorInvalidDevice); - unsetenv("DEBUG_HIP_7_PREVIEW"); - } else { - INFO("Env Not set"); - } } /** * Test Description * ------------------------ - *  - With Env Var DEBUG_HIP_7_PREVIEW, Verify hipPeekAtLastError status - * along with the hipGetLastError API call. + *  - Verify hipPeekAtLastError status along with the hipGetLastError API call. * Test source * ------------------------ *  - unit/errorHandling/hipPeekAtLastError.cc @@ -160,8 +135,7 @@ TEST_CASE("Unit_hipPeekAtLastError_With_EnvVar_Chk_Updated_Status") { * ------------------------ *  - HIP_VERSION >= 6.4 */ -TEST_CASE("Unit_hipPeekAtLastError_With_EnvVar_Chk_Along_hipGetLastError") { - if (setenv("DEBUG_HIP_7_PREVIEW", "1", 1) == 0) { +TEST_CASE("Unit_hipPeekAtLastError_Chk_Along_hipGetLastError") { hipGraph_t graph; HIP_CHECK_ERROR(hipGraphCreate(&graph, 1), hipErrorInvalidValue); HIP_CHECK_ERROR(hipGetLastError(), hipErrorInvalidValue); @@ -171,16 +145,12 @@ TEST_CASE("Unit_hipPeekAtLastError_With_EnvVar_Chk_Along_hipGetLastError") { HIP_CHECK(hipMalloc(&C_d, 1024)); HIP_CHECK(hipFree(C_d)); HIP_CHECK_ERROR(hipPeekAtLastError(), hipSuccess); - unsetenv("DEBUG_HIP_7_PREVIEW"); - } else { - INFO("Env Not set"); - } } /** * Test Description * ------------------------ - *  - With Env Var DEBUG_HIP_7_PREVIEW, Verify hipPeekAtLastError status + *  - Verify hipPeekAtLastError status * with different Error and Success combinations. * Each time status should return the corresponding Error when it called. * Test source @@ -190,11 +160,10 @@ TEST_CASE("Unit_hipPeekAtLastError_With_EnvVar_Chk_Along_hipGetLastError") { * ------------------------ *  - HIP_VERSION >= 6.4 */ -TEST_CASE("Unit_hipPeekAtLastError_With_EnvVar_Error_Combinations") { +TEST_CASE("Unit_hipPeekAtLastError_Error_Combinations") { int value = 0; hipGraph_t graph; SECTION("A case with Error-Error-Success-Success") { - if (setenv("DEBUG_HIP_7_PREVIEW", "1", 1) == 0) { HIP_CHECK(hipPeekAtLastError()); HIP_CHECK_ERROR(hipGraphCreate(&graph, 1), hipErrorInvalidValue); HIP_CHECK_ERROR(hipDeviceGetGraphMemAttribute(-1, hipGraphMemAttrUsedMemCurrent, &value), @@ -204,13 +173,8 @@ TEST_CASE("Unit_hipPeekAtLastError_With_EnvVar_Error_Combinations") { HIP_CHECK(hipMalloc(&A_d, 1024)); HIP_CHECK(hipFree(A_d)); HIP_CHECK_ERROR(hipPeekAtLastError(), hipErrorInvalidDevice); - unsetenv("DEBUG_HIP_7_PREVIEW"); - } else { - INFO("Env Not set"); - } } SECTION("A case with Error-Success-Error-Success") { - if (setenv("DEBUG_HIP_7_PREVIEW", "1", 1) == 0) { HIP_CHECK_ERROR(hipGraphCreate(&graph, 1), hipErrorInvalidValue); int* A_d; HIP_CHECK(hipMalloc(&A_d, 1024)); @@ -218,38 +182,24 @@ TEST_CASE("Unit_hipPeekAtLastError_With_EnvVar_Error_Combinations") { hipErrorInvalidDevice); HIP_CHECK(hipFree(A_d)); HIP_CHECK_ERROR(hipPeekAtLastError(), hipErrorInvalidDevice); - unsetenv("DEBUG_HIP_7_PREVIEW"); - } else { - INFO("Env Not set"); - } } SECTION("A case with Success-Error-Error-Success") { - if (setenv("DEBUG_HIP_7_PREVIEW", "1", 1) == 0) { - int* A_d; + int *A_d; HIP_CHECK(hipMalloc(&A_d, 1024)); HIP_CHECK_ERROR(hipGraphCreate(&graph, 1), hipErrorInvalidValue); HIP_CHECK_ERROR(hipDeviceGetGraphMemAttribute(-1, hipGraphMemAttrUsedMemCurrent, &value), hipErrorInvalidDevice); HIP_CHECK(hipFree(A_d)); HIP_CHECK_ERROR(hipPeekAtLastError(), hipErrorInvalidDevice); - unsetenv("DEBUG_HIP_7_PREVIEW"); - } else { - INFO("Env Not set"); - } } SECTION("A Case with Success-Error-Success-Error") { - if (setenv("DEBUG_HIP_7_PREVIEW", "1", 1) == 0) { - int* A_d; + int *A_d; HIP_CHECK(hipMalloc(&A_d, 1024)); HIP_CHECK_ERROR(hipGraphCreate(&graph, 1), hipErrorInvalidValue); HIP_CHECK(hipFree(A_d)); HIP_CHECK_ERROR(hipDeviceGetGraphMemAttribute(-1, hipGraphMemAttrUsedMemCurrent, &value), hipErrorInvalidDevice); HIP_CHECK_ERROR(hipPeekAtLastError(), hipErrorInvalidDevice); - unsetenv("DEBUG_HIP_7_PREVIEW"); - } else { - INFO("Env Not set"); - } } } @@ -264,8 +214,7 @@ static void thread_func() { /** * Test Description * ------------------------ - *  - With Env Var DEBUG_HIP_7_PREVIEW, Verify hipPeekAtLastError status with a - * runtime api invalid arg call. + *  - Verify hipPeekAtLastError status with a runtime api invalid arg call. * Check in other thread this error should not report by hipPeekAtLastError() * Test source * ------------------------ @@ -274,26 +223,20 @@ static void thread_func() { * ------------------------ *  - HIP_VERSION >= 6.4 */ -TEST_CASE("Unit_hipPeekAtLastError_With_EnvVar_With_Thread") { +TEST_CASE("Unit_hipPeekAtLastError_With_Thread") { hipGraph_t graph; - if (setenv("DEBUG_HIP_7_PREVIEW", "1", 1) == 0) { - int* A_d; + int *A_d; HIP_CHECK(hipMalloc(&A_d, 1024)); HIP_CHECK_ERROR(hipGraphCreate(&graph, 1), hipErrorInvalidValue); std::thread t(thread_func); t.join(); HIP_CHECK(hipFree(A_d)); HIP_CHECK_ERROR(hipPeekAtLastError(), hipErrorInvalidValue); - unsetenv("DEBUG_HIP_7_PREVIEW"); - } else { - INFO("Env Not set"); - } } /** * Test Description * ------------------------ - *  - With Env Var DEBUG_HIP_7_PREVIEW, Verify hipPeekAtLastError status - * in the multiple processes. + *  - Verify hipPeekAtLastError status in the multiple processes. * Test source * ------------------------ *  - unit/errorHandling/hipPeekAtLastError.cc @@ -301,32 +244,23 @@ TEST_CASE("Unit_hipPeekAtLastError_With_EnvVar_With_Thread") { * ------------------------ *  - HIP_VERSION >= 6.4 */ -// Disabled due to test failure -#if 0 -TEST_CASE("Unit_hipPeekAtLastError_With_EnvVar_MultiProcess") { +TEST_CASE("Unit_hipPeekAtLastError_MultiProcess") { hipGraph_t graph; - if (setenv("DEBUG_HIP_7_PREVIEW", "1", 1) == 0) { - /*int *A_d; + int *A_d; HIP_CHECK(hipMalloc(&A_d, 1024)); - HIP_CHECK_ERROR(hipGraphCreate(&graph, 1), hipErrorInvalidValue);*/ + HIP_CHECK_ERROR(hipGraphCreate(&graph, 1), hipErrorInvalidValue); hip::SpawnProc proc("hipPeekAtLastErrorEnv_Exe", true); HIP_CHECK_ERROR(hipGraphCreate(&graph, 1), hipErrorInvalidValue); HIP_CHECK_ERROR(hipPeekAtLastError(), hipErrorInvalidValue); REQUIRE(proc.run() == 1); - //HIP_CHECK(hipFree(A_d)); + HIP_CHECK(hipFree(A_d)); HIP_CHECK_ERROR(hipPeekAtLastError(), hipErrorInvalidValue); - unsetenv("DEBUG_HIP_7_PREVIEW"); - } else { - INFO("Env Not set"); - } } -#endif static void __global__ emptyKernl() {} /** * Test Description * ------------------------ - *  - With Env Var DEBUG_HIP_7_PREVIEW, Verify hipPeekAtLastError status - * with Invalid Configuration in kernel call. + *  - Verify hipPeekAtLastError status with Invalid Configuration in kernel call. * Kernel call invalid configuration- blocks=0 & threadsPerBlock=0 * Test source * ------------------------ @@ -338,17 +272,14 @@ static void __global__ emptyKernl() {} // Below test failed on NVIDIA due to error mismatch produced by the Invalid Kernel config. // For more details please check the ticket SWDEV-501896 comments. #if HT_AMD -TEST_CASE("Unit_hipPeekAtLastError_With_EnvVar_Kernel_Invalid_Config") { +TEST_CASE("Unit_hipPeekAtLastError_Kernel_Invalid_Config") { hipError_t ret; - if (setenv("DEBUG_HIP_7_PREVIEW", "1", 1) == 0) { hipLaunchKernelGGL(emptyKernl, dim3(0), dim3(0), 0, 0); int* A_d; HIP_CHECK(hipMalloc(&A_d, 1024)); ret = hipPeekAtLastError(); REQUIRE(ret == hipErrorInvalidConfiguration); HIP_CHECK(hipFree(A_d)); - unsetenv("DEBUG_HIP_7_PREVIEW"); - } } #endif /**