AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SWDEV-538600 - Fix error code checks in some tests (#305)

Browse Source
This commit is contained in:
Manocha, Rahul
2025-06-19 08:41:54 -07:00
committed by GitHub
parent 6c60fcafd8
commit b215381bbe
10 changed files with 17 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
catch/hipTestMain/config/config_amd_linux
+3
View File
@@ -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 ===",
catch/unit/errorHandling/hipGetLastError.cc
+1 -1
View File
@@ -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");
catch/unit/errorHandling/hipPeekAtLastError.cc
+1 -1
View File
@@ -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");
}
catch/unit/memory/hipPointerGetAttributes.cc
-6
View File
@@ -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);
}
}
/**
catch/unit/module/hipDrvLaunchKernelEx.cc
+1 -1
View File
@@ -124,7 +124,7 @@ TEST_CASE("Unit_hipDrvLaunchKernelEx_NegTsts") {
SECTION("Invalid Kernel config") {
HIP_CHECK_ERROR(
hipDrvLaunchKernelEx(&invalidConfig, function, kernelParams, NULL),
hipErrorInvalidValue);
hipErrorInvalidConfiguration);
}
}
catch/unit/texture/hipBindTexture.cc
-5
View File
@@ -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") {
catch/unit/texture/hipBindTexture2D.cc
+1 -19
View File
@@ -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") {
catch/unit/texture/hipGetTextureAlignmentOffset.cc
+1 -5
View File
@@ -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));
catch/unit/texture/hipTexObjectCreate.cc
+9 -24
View File
@@ -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<hipDeviceptr_t>(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<hipDeviceptr_t>(&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));
catch/unit/texture/hipTexRefSetAddress.cc
-6
View File
@@ -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<hipDeviceptr_t>(tex_buffer), 0),
hipErrorInvalidValue);
#else
HIP_CHECK(
hipTexRefSetAddress(&offset, tex_ref, reinterpret_cast<hipDeviceptr_t>(tex_buffer), 0));
#endif
}
}