AI/rocm-systems
2
0
Fork 0
Koodi Ongelmat Pull-pyynnöt Actions Paketit Projektit Julkaisut Wiki Toiminta

SWDEV-478472 - Fix tests to return hipErrorInvalidChannelDescriptor instead of hipErrorUnknown

Selaa lähdekoodia 
Change-Id: I1dc3af072aed813173cc12e9976a34ddf8c7d6a8
This commit is contained in:
Vladana Stojiljkovic
2024-08-09 15:41:00 +02:00
committed by Rakesh Roy
vanhempi 7aff6567b7
commit 5fa9900949
5 muutettua tiedostoa jossa 16 lisäystä ja 46 poistoa
Download Patch File Download Diff File Expand all files Collapse all files
catch/hipTestMain/config/config_nvidia_linux.json
+1 -20
Näytä tiedosto
@@ -225,25 +225,6 @@
"Unit_Assert_Positive_Basic_KernelFail",
"=== Below tests fail in external CI for PR https://github.com/ROCm-Developer-Tools/hip-tests/pull/210 ===",
"Unit_hipMemImportFromShareableHandle_Positive_MultiProc",
"Unit_hipMemMapArrayAsync_Positive_Basic",
"=== SWDEV-475987 : Disable tests to merge hipother change 12/08/2024 ===",
"Unit_hipMalloc3DArray_Negative_InvalidFormat",
"Unit_hipMalloc3DArray_Negative_BadChannelLayout",
"Unit_hipMalloc3DArray_Negative_8BitFloat",
"Unit_hipMalloc3DArray_Negative_DifferentChannelSizes",
"Unit_hipMalloc3DArray_Negative_BadChannelSize",
"Unit_hipMallocMipmappedArray_Negative_InvalidFormat",
"Unit_hipMallocMipmappedArray_Negative_BadChannelLayout",
"Unit_hipMallocMipmappedArray_Negative_8BitFloat",
"Unit_hipMallocMipmappedArray_Negative_DifferentChannelSizes",
"Unit_hipMallocMipmappedArray_Negative_BadChannelSize",
"Unit_hipMallocArray_Negative_DifferentChannelSizes",
"Unit_hipMallocArray_Negative_8bitFloat - float",
"Unit_hipMallocArray_Negative_8bitFloat - float2",
"Unit_hipMallocArray_Negative_8bitFloat - float4",
"Unit_hipMallocArray_Negative_BadNumberOfBits",
"Unit_hipMallocArray_Negative_3ChannelElement",
"Unit_hipMallocArray_Negative_ChannelAfterZeroChannel",
"Unit_hipMallocArray_Negative_InvalidChannelFormat"
"Unit_hipMemMapArrayAsync_Positive_Basic"
]
}
catch/hipTestMain/config/config_nvidia_windows.json
+1 -18
Näytä tiedosto
@@ -39,23 +39,6 @@
"Performance_hipMemsetD32Async",
"Unit_hipMemcpyParam2D_Positive_Synchronization_Behavior",
"Unit_hipMemcpy_Positive_Synchronization_Behavior",
"Unit_hipMemMapArrayAsync_Positive_Basic",
"=== SWDEV-475987 : Disable tests to merge hipother change 12/08/2024 ===",
"Unit_hipMalloc3DArray_Negative_InvalidFormat",
"Unit_hipMalloc3DArray_Negative_BadChannelLayout",
"Unit_hipMalloc3DArray_Negative_8BitFloat",
"Unit_hipMalloc3DArray_Negative_DifferentChannelSizes",
"Unit_hipMalloc3DArray_Negative_BadChannelSize",
"Unit_hipMallocMipmappedArray_Negative_InvalidFormat",
"Unit_hipMallocMipmappedArray_Negative_BadChannelLayout",
"Unit_hipMallocMipmappedArray_Negative_8BitFloat",
"Unit_hipMallocMipmappedArray_Negative_DifferentChannelSizes",
"Unit_hipMallocMipmappedArray_Negative_BadChannelSize",
"Unit_hipMallocArray_Negative_DifferentChannelSizes",
"Unit_hipMallocArray_Negative_8bitFloat",
"Unit_hipMallocArray_Negative_BadNumberOfBits",
"Unit_hipMallocArray_Negative_3ChannelElement",
"Unit_hipMallocArray_Negative_ChannelAfterZeroChannel",
"Unit_hipMallocArray_Negative_InvalidChannelFormat"
"Unit_hipMemMapArrayAsync_Positive_Basic"
]
}
catch/unit/memory/hipMalloc3DArray.cc
+1 -1
Näytä tiedosto
@@ -333,7 +333,7 @@ void testInvalidDescription(hipChannelFormatDesc desc) {
hipArray_t array;
#if HT_NVIDIA
hipError_t expectedError = hipErrorUnknown;
hipError_t expectedError = hipErrorInvalidChannelDescriptor;
#else
hipError_t expectedError = hipErrorInvalidValue;
#endif
catch/unit/memory/hipMallocArray.cc
+12 -6
Näytä tiedosto
@@ -523,7 +523,8 @@ TEST_CASE("Unit_hipMallocArray_Negative_DifferentChannelSizes") {
HIP_CHECK_ERROR(hipMallocArray(&arrayPtr, &desc, width, height, flag), hipErrorInvalidValue);
#else
unsigned int flag = GENERATE(hipArrayDefault, hipArraySurfaceLoadStore, hipArrayTextureGather);
HIP_CHECK_ERROR(hipMallocArray(&arrayPtr, &desc, width, height, flag), hipErrorUnknown);
HIP_CHECK_ERROR(hipMallocArray(&arrayPtr, &desc, width, height, flag),
hipErrorInvalidChannelDescriptor);
#endif
}
@@ -605,7 +606,8 @@ TEMPLATE_TEST_CASE("Unit_hipMallocArray_Negative_8bitFloat", "", float, float2,
HIP_CHECK_ERROR(hipMallocArray(&arrayPtr, &desc, 1024, 1024, flags), hipErrorInvalidValue);
#else
unsigned int flags = GENERATE(hipArrayDefault, hipArraySurfaceLoadStore, hipArrayTextureGather);
HIP_CHECK_ERROR(hipMallocArray(&arrayPtr, &desc, 1024, 1024, flags), hipErrorUnknown);
HIP_CHECK_ERROR(hipMallocArray(&arrayPtr, &desc, 1024, 1024, flags),
hipErrorInvalidChannelDescriptor);
#endif
}
@@ -633,7 +635,8 @@ TEST_CASE("Unit_hipMallocArray_Negative_BadNumberOfBits") {
#else
unsigned int flag = GENERATE(hipArrayDefault, hipArraySurfaceLoadStore, hipArrayTextureGather);
INFO("flag: " << flag);
HIP_CHECK_ERROR(hipMallocArray(&arrayPtr, &desc, 1024, 1024, flag), hipErrorUnknown);
HIP_CHECK_ERROR(hipMallocArray(&arrayPtr, &desc, 1024, 1024, flag),
hipErrorInvalidChannelDescriptor);
#endif
}
@@ -661,7 +664,8 @@ TEST_CASE("Unit_hipMallocArray_Negative_3ChannelElement") {
HIP_CHECK_ERROR(hipMallocArray(&arrayPtr, &desc, 1024, 1024, flag), hipErrorInvalidValue);
#else
unsigned int flag = GENERATE(hipArrayDefault, hipArraySurfaceLoadStore, hipArrayTextureGather);
HIP_CHECK_ERROR(hipMallocArray(&arrayPtr, &desc, 1024, 1024, flag), hipErrorUnknown);
HIP_CHECK_ERROR(hipMallocArray(&arrayPtr, &desc, 1024, 1024, flag),
hipErrorInvalidChannelDescriptor);
#endif
}
@@ -690,7 +694,8 @@ TEST_CASE("Unit_hipMallocArray_Negative_ChannelAfterZeroChannel") {
HIP_CHECK_ERROR(hipMallocArray(&arrayPtr, &desc, 1024, 1024, flag), hipErrorInvalidValue);
#else
unsigned int flag = GENERATE(hipArrayDefault, hipArraySurfaceLoadStore, hipArrayTextureGather);
HIP_CHECK_ERROR(hipMallocArray(&arrayPtr, &desc, 1024, 1024, flag), hipErrorUnknown);
HIP_CHECK_ERROR(hipMallocArray(&arrayPtr, &desc, 1024, 1024, flag),
hipErrorInvalidChannelDescriptor);
#endif
}
@@ -715,7 +720,8 @@ TEST_CASE("Unit_hipMallocArray_Negative_InvalidChannelFormat") {
HIP_CHECK_ERROR(hipMallocArray(&arrayPtr, &desc, 1024, 1024, flag), hipErrorInvalidValue);
#else
unsigned int flag = GENERATE(hipArrayDefault, hipArraySurfaceLoadStore);
HIP_CHECK_ERROR(hipMallocArray(&arrayPtr, &desc, 1024, 1024, flag), hipErrorUnknown);
HIP_CHECK_ERROR(hipMallocArray(&arrayPtr, &desc, 1024, 1024, flag),
hipErrorInvalidChannelDescriptor);
#endif
}
catch/unit/memory/hipMallocMipmappedArray.cc
+1 -1
Näytä tiedosto
@@ -271,7 +271,7 @@ void testInvalidDescriptionMipmapped(hipChannelFormatDesc desc) {
hipMipmappedArray_t array;
#if HT_NVIDIA
hipError_t expectedError = hipErrorUnknown;
hipError_t expectedError = hipErrorInvalidChannelDescriptor;
#else
hipError_t expectedError = hipErrorInvalidValue;
#endif