From b215381bbefcd316acf2bf1d2157c5a5169afa64 Mon Sep 17 00:00:00 2001 From: "Manocha, Rahul" Date: Thu, 19 Jun 2025 08:41:54 -0700 Subject: [PATCH] SWDEV-538600 - Fix error code checks in some tests (#305) --- catch/hipTestMain/config/config_amd_linux | 3 ++ catch/unit/errorHandling/hipGetLastError.cc | 2 +- .../unit/errorHandling/hipPeekAtLastError.cc | 2 +- catch/unit/memory/hipPointerGetAttributes.cc | 6 ---- catch/unit/module/hipDrvLaunchKernelEx.cc | 2 +- catch/unit/texture/hipBindTexture.cc | 5 --- catch/unit/texture/hipBindTexture2D.cc | 20 +---------- .../texture/hipGetTextureAlignmentOffset.cc | 6 +--- catch/unit/texture/hipTexObjectCreate.cc | 33 +++++-------------- catch/unit/texture/hipTexRefSetAddress.cc | 6 ---- 10 files changed, 17 insertions(+), 68 deletions(-) diff --git a/catch/hipTestMain/config/config_amd_linux b/catch/hipTestMain/config/config_amd_linux index 7e1f72bb9f..6991123a23 100644 --- a/catch/hipTestMain/config/config_amd_linux +++ b/catch/hipTestMain/config/config_amd_linux @@ -737,6 +737,9 @@ "Unit_hipGraphAddMemAllocNode_Negative_Free_Alloc_Memory_Again", "=== SWDEV-530762 : This test fails in Linux PSDB ===", "Unit_hipDeviceGetGraphMemAttribute_Positive_DoubleMemory", + "=== SWDEV-538600 : This test fails in Linux PSDB ===", + "Unit_hipMemPoolMaxAlloc", + "Unit_hipStreamPerThread_ChildProc", #endif #if defined gfx90a || defined gfx942 || defined gfx950 "=== SWDEV-443630 : Below test failed in stress test on 19/01/24 ===", diff --git a/catch/unit/errorHandling/hipGetLastError.cc b/catch/unit/errorHandling/hipGetLastError.cc index 525593939a..dd7f9573ee 100644 --- a/catch/unit/errorHandling/hipGetLastError.cc +++ b/catch/unit/errorHandling/hipGetLastError.cc @@ -1219,7 +1219,7 @@ TEST_CASE("Unit_hipGetLastError_With_EnvVar_Kernel_Invalid_Config") { int *A_d; HIP_CHECK(hipMalloc(&A_d, 1024)); ret = hipGetLastError(); - REQUIRE(ret == hipErrorInvalidValue); + REQUIRE(ret == hipErrorInvalidConfiguration); HIP_CHECK_ERROR(hipGetLastError(), hipSuccess); HIP_CHECK(hipFree(A_d)); unsetenv("DEBUG_HIP_7_PREVIEW"); diff --git a/catch/unit/errorHandling/hipPeekAtLastError.cc b/catch/unit/errorHandling/hipPeekAtLastError.cc index 27f6f74963..269a773a9f 100644 --- a/catch/unit/errorHandling/hipPeekAtLastError.cc +++ b/catch/unit/errorHandling/hipPeekAtLastError.cc @@ -355,7 +355,7 @@ TEST_CASE("Unit_hipPeekAtLastError_With_EnvVar_Kernel_Invalid_Config") { int *A_d; HIP_CHECK(hipMalloc(&A_d, 1024)); ret = hipPeekAtLastError(); - REQUIRE(ret == hipErrorInvalidValue); + REQUIRE(ret == hipErrorInvalidConfiguration); HIP_CHECK(hipFree(A_d)); unsetenv("DEBUG_HIP_7_PREVIEW"); } diff --git a/catch/unit/memory/hipPointerGetAttributes.cc b/catch/unit/memory/hipPointerGetAttributes.cc index 2cf9846df9..61d7eeb7f5 100644 --- a/catch/unit/memory/hipPointerGetAttributes.cc +++ b/catch/unit/memory/hipPointerGetAttributes.cc @@ -387,12 +387,6 @@ TEST_CASE("Unit_hipPointerGetAttributes_Negative") { HIP_CHECK(hipFree(dPtr)); } #endif - - SECTION("Invalid Device Pointer") { - hipPointerAttribute_t attributes{}; - HIP_CHECK_ERROR(hipPointerGetAttributes(&attributes, nullptr), - hipErrorInvalidValue); - } } /** diff --git a/catch/unit/module/hipDrvLaunchKernelEx.cc b/catch/unit/module/hipDrvLaunchKernelEx.cc index bf82a7a443..9b630c4ed8 100644 --- a/catch/unit/module/hipDrvLaunchKernelEx.cc +++ b/catch/unit/module/hipDrvLaunchKernelEx.cc @@ -124,7 +124,7 @@ TEST_CASE("Unit_hipDrvLaunchKernelEx_NegTsts") { SECTION("Invalid Kernel config") { HIP_CHECK_ERROR( hipDrvLaunchKernelEx(&invalidConfig, function, kernelParams, NULL), - hipErrorInvalidValue); + hipErrorInvalidConfiguration); } } diff --git a/catch/unit/texture/hipBindTexture.cc b/catch/unit/texture/hipBindTexture.cc index e61f0c141d..161efd89d1 100644 --- a/catch/unit/texture/hipBindTexture.cc +++ b/catch/unit/texture/hipBindTexture.cc @@ -130,13 +130,8 @@ TEST_CASE("Unit_hipBindTexture_Negative") { } SECTION("Device memory is nullptr") { -#if HT_AMD - HIP_CHECK_ERROR(hipBindTexture(&offset, tex_ref, nullptr, channel_desc, N * sizeof(float)), - hipErrorInvalidValue); -#else HIP_CHECK_ERROR(hipBindTexture(&offset, tex_ref, nullptr, channel_desc, N * sizeof(float)), hipErrorNotFound); -#endif } SECTION("Invalid hipChannelFormatDesc") { diff --git a/catch/unit/texture/hipBindTexture2D.cc b/catch/unit/texture/hipBindTexture2D.cc index db26642222..266325d3fd 100644 --- a/catch/unit/texture/hipBindTexture2D.cc +++ b/catch/unit/texture/hipBindTexture2D.cc @@ -103,7 +103,7 @@ TEST_CASE("Unit_hipBindTexture2D_Negative") { #if HT_AMD HIP_CHECK_ERROR(hipBindTexture2D(&texture_offset, nullptr, device_ptr, &tex.channelDesc, SIZE_W, SIZE_H, device_pitch), - hipErrorInvalidSymbol); + hipErrorUnknown); #else HIP_CHECK_ERROR(hipBindTexture2D(&texture_offset, nullptr, device_ptr, &tex.channelDesc, SIZE_W, SIZE_H, device_pitch), @@ -112,27 +112,9 @@ TEST_CASE("Unit_hipBindTexture2D_Negative") { } SECTION("Device ptr is nullptr") { -#if HT_AMD - HIP_CHECK_ERROR(hipBindTexture2D(&texture_offset, &tex, nullptr, &tex.channelDesc, SIZE_W, - SIZE_H, device_pitch), - hipErrorInvalidValue); -#else HIP_CHECK_ERROR(hipBindTexture2D(&texture_offset, &tex, nullptr, &tex.channelDesc, SIZE_W, SIZE_H, device_pitch), hipErrorNotFound); -#endif - } - - SECTION("Width is 0") { - HIP_CHECK_ERROR(hipBindTexture2D(&texture_offset, &tex, device_ptr, &tex.channelDesc, 0, SIZE_H, - device_pitch), - hipErrorInvalidValue); - } - - SECTION("Height is 0") { - HIP_CHECK_ERROR(hipBindTexture2D(&texture_offset, &tex, device_ptr, &tex.channelDesc, SIZE_W, 0, - device_pitch), - hipErrorInvalidValue); } SECTION("Pitch is 0") { diff --git a/catch/unit/texture/hipGetTextureAlignmentOffset.cc b/catch/unit/texture/hipGetTextureAlignmentOffset.cc index fc13816e7f..e11cbb1ff5 100644 --- a/catch/unit/texture/hipGetTextureAlignmentOffset.cc +++ b/catch/unit/texture/hipGetTextureAlignmentOffset.cc @@ -80,11 +80,7 @@ TEST_CASE("Unit_hipGetTextureAlignmentOffset_Negative") { } SECTION("texture is nullptr") { -#if HT_AMD - HIP_CHECK_ERROR(hipGetTextureAlignmentOffset(&offset, nullptr), hipErrorInvalidValue); -#else - HIP_CHECK_ERROR(hipGetTextureAlignmentOffset(&offset, nullptr), hipErrorInvalidTexture); -#endif + HIP_CHECK_ERROR(hipGetTextureAlignmentOffset(&offset, nullptr), hipErrorInvalidTexture); } HIP_CHECK(hipFree(tex_buf)); diff --git a/catch/unit/texture/hipTexObjectCreate.cc b/catch/unit/texture/hipTexObjectCreate.cc index 23db8d385f..b7da3afb51 100644 --- a/catch/unit/texture/hipTexObjectCreate.cc +++ b/catch/unit/texture/hipTexObjectCreate.cc @@ -78,12 +78,7 @@ TEST_CASE("Unit_TexObjectCreate_TypeLinear") { SECTION("size_in_bytes set to 0") { res_desc.res.linear.sizeInBytes = 0; -#if HT_AMD - HIP_CHECK_ERROR(hipTexObjectCreate(&tex_object, &res_desc, &tex_desc, nullptr), - hipErrorInvalidValue); -#else HIP_CHECK(hipTexObjectCreate(&tex_object, &res_desc, &tex_desc, nullptr)); -#endif } HIP_CHECK(hipTexObjectDestroy(tex_object)); @@ -115,25 +110,25 @@ TEST_CASE("Unit_TexObjectCreate_TypeLinear_IncompleteInit") { SECTION("Only devPtr initialized") { res_desc.res.linear.devPtr = reinterpret_cast(tex_buffer); HIP_CHECK_ERROR(hipTexObjectCreate(&tex_object, &res_desc, &tex_desc, nullptr), - hipErrorInvalidValue); + hipErrorInvalidChannelDescriptor); } SECTION("Only format initialized") { res_desc.res.linear.format = formats; HIP_CHECK_ERROR(hipTexObjectCreate(&tex_object, &res_desc, &tex_desc, nullptr), - hipErrorInvalidValue); + hipErrorInvalidChannelDescriptor); } SECTION("Only num channels initialized") { res_desc.res.linear.numChannels = num_channels; HIP_CHECK_ERROR(hipTexObjectCreate(&tex_object, &res_desc, &tex_desc, nullptr), - hipErrorInvalidValue); + hipErrorInvalidChannelDescriptor); } SECTION("Only size in bytes initialized") { res_desc.res.linear.sizeInBytes = array_size; HIP_CHECK_ERROR(hipTexObjectCreate(&tex_object, &res_desc, &tex_desc, nullptr), - hipErrorInvalidValue); + hipErrorInvalidChannelDescriptor); } SECTION("Missing devPtr") { @@ -141,7 +136,7 @@ TEST_CASE("Unit_TexObjectCreate_TypeLinear_IncompleteInit") { res_desc.res.linear.numChannels = num_channels; res_desc.res.linear.sizeInBytes = array_size; HIP_CHECK_ERROR(hipTexObjectCreate(&tex_object, &res_desc, &tex_desc, nullptr), - hipErrorInvalidValue); + hipErrorInvalidChannelDescriptor); } SECTION("Missing format") { @@ -149,7 +144,7 @@ TEST_CASE("Unit_TexObjectCreate_TypeLinear_IncompleteInit") { res_desc.res.linear.numChannels = num_channels; res_desc.res.linear.sizeInBytes = array_size; HIP_CHECK_ERROR(hipTexObjectCreate(&tex_object, &res_desc, &tex_desc, nullptr), - hipErrorInvalidValue); + hipErrorInvalidChannelDescriptor); } SECTION("Missing num channels") { @@ -157,7 +152,7 @@ TEST_CASE("Unit_TexObjectCreate_TypeLinear_IncompleteInit") { res_desc.res.linear.format = formats; res_desc.res.linear.sizeInBytes = array_size; HIP_CHECK_ERROR(hipTexObjectCreate(&tex_object, &res_desc, &tex_desc, nullptr), - hipErrorInvalidValue); + hipErrorInvalidChannelDescriptor); } HIP_CHECK(hipFree(tex_buffer)); @@ -191,14 +186,14 @@ TEST_CASE("Unit_TexObjectCreate_TypeLinear_EdgeCases") { SECTION("Invalid number of channels") { res_desc.res.linear.numChannels = 8; HIP_CHECK_ERROR(hipTexObjectCreate(&tex_object, &res_desc, &tex_desc, nullptr), - hipErrorInvalidValue); + hipErrorInvalidChannelDescriptor); } SECTION("Providing fake device pointer") { char handle; res_desc.res.linear.devPtr = reinterpret_cast(&handle); HIP_CHECK_ERROR(hipTexObjectCreate(&tex_object, &res_desc, &tex_desc, nullptr), - hipErrorInvalidValue); + hipErrorInvalidChannelDescriptor); } HIP_CHECK(hipFree(tex_buffer)); @@ -347,22 +342,12 @@ TEST_CASE("Unit_TexObjectCreate_TypePitch2D") { SECTION("width set to 0") { res_desc.res.pitch2D.width = 0; -#if HT_AMD - HIP_CHECK_ERROR(hipTexObjectCreate(&tex_object, &res_desc, &tex_desc, nullptr), - hipErrorInvalidValue); -#else HIP_CHECK(hipTexObjectCreate(&tex_object, &res_desc, &tex_desc, nullptr)); -#endif } SECTION("height set to 0") { res_desc.res.pitch2D.height = 0; -#if HT_AMD - HIP_CHECK_ERROR(hipTexObjectCreate(&tex_object, &res_desc, &tex_desc, nullptr), - hipErrorInvalidValue); -#else HIP_CHECK(hipTexObjectCreate(&tex_object, &res_desc, &tex_desc, nullptr)); -#endif } HIP_CHECK(hipTexObjectDestroy(tex_object)); diff --git a/catch/unit/texture/hipTexRefSetAddress.cc b/catch/unit/texture/hipTexRefSetAddress.cc index 19d5d27de1..e2f406e3ad 100644 --- a/catch/unit/texture/hipTexRefSetAddress.cc +++ b/catch/unit/texture/hipTexRefSetAddress.cc @@ -65,14 +65,8 @@ TEST_CASE("Unit_hipTexRefSetAddress_Positive") { } SECTION("size is 0") { -#if HT_AMD - HIP_CHECK_ERROR( - hipTexRefSetAddress(&offset, tex_ref, reinterpret_cast(tex_buffer), 0), - hipErrorInvalidValue); -#else HIP_CHECK( hipTexRefSetAddress(&offset, tex_ref, reinterpret_cast(tex_buffer), 0)); -#endif } }