From af87eda594138d62564ff8b103b9deba74339d00 Mon Sep 17 00:00:00 2001 From: Nicolas Miller Date: Fri, 9 May 2025 12:54:31 +0100 Subject: [PATCH] [UR][HIP][CUDA] Update UR CTS disabled tests Most of these tests were already passing. One of them was just missing a simple check in the HIP adapter. --- unified-runtime/source/adapters/hip/kernel.cpp | 2 ++ .../conformance/enqueue/urEnqueueKernelLaunch.cpp | 4 ---- .../enqueue/urEnqueueMemBufferCopyRect.cpp | 7 ------- .../enqueue/urEnqueueMemBufferWriteRect.cpp | 9 --------- .../conformance/exp_command_buffer/rect_write.cpp | 13 ------------- .../test/conformance/kernel/urKernelGetInfo.cpp | 4 +--- .../test/conformance/kernel/urKernelSetArgValue.cpp | 2 +- .../test/conformance/memory/urMemImageCreate.cpp | 8 -------- .../test/conformance/program/urProgramGetInfo.cpp | 2 -- 9 files changed, 4 insertions(+), 47 deletions(-) diff --git a/unified-runtime/source/adapters/hip/kernel.cpp b/unified-runtime/source/adapters/hip/kernel.cpp index baac4f9e23867..680d9aac16298 100644 --- a/unified-runtime/source/adapters/hip/kernel.cpp +++ b/unified-runtime/source/adapters/hip/kernel.cpp @@ -178,6 +178,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urKernelSuggestMaxCooperativeGroupCountExp( UR_APIEXPORT ur_result_t UR_APICALL urKernelSetArgValue( ur_kernel_handle_t hKernel, uint32_t argIndex, size_t argSize, const ur_kernel_arg_value_properties_t *, const void *pArgValue) { + UR_ASSERT(argSize, UR_RESULT_ERROR_INVALID_KERNEL_ARGUMENT_SIZE); + ur_result_t Result = UR_RESULT_SUCCESS; try { hKernel->setKernelArg(argIndex, argSize, pArgValue); diff --git a/unified-runtime/test/conformance/enqueue/urEnqueueKernelLaunch.cpp b/unified-runtime/test/conformance/enqueue/urEnqueueKernelLaunch.cpp index e39f366774f4c..8e4a28826c4b7 100644 --- a/unified-runtime/test/conformance/enqueue/urEnqueueKernelLaunch.cpp +++ b/unified-runtime/test/conformance/enqueue/urEnqueueKernelLaunch.cpp @@ -633,10 +633,6 @@ UUR_DEVICE_TEST_SUITE_WITH_PARAM( uur::deviceTestWithParamPrinter); TEST_P(urEnqueueKernelLaunchUSMLinkedList, Success) { - if (use_pool) { - UUR_KNOWN_FAILURE_ON(uur::HIP{}); - } - ur_device_usm_access_capability_flags_t shared_usm_flags = 0; ASSERT_SUCCESS( uur::GetDeviceUSMSingleSharedSupport(device, shared_usm_flags)); diff --git a/unified-runtime/test/conformance/enqueue/urEnqueueMemBufferCopyRect.cpp b/unified-runtime/test/conformance/enqueue/urEnqueueMemBufferCopyRect.cpp index bfce4fb71fd27..641d29408f986 100644 --- a/unified-runtime/test/conformance/enqueue/urEnqueueMemBufferCopyRect.cpp +++ b/unified-runtime/test/conformance/enqueue/urEnqueueMemBufferCopyRect.cpp @@ -79,13 +79,6 @@ UUR_DEVICE_TEST_SUITE_WITH_PARAM( TEST_P(urEnqueueMemBufferCopyRectTestWithParam, Success) { const auto name = getParam().name; - if (name.find("copy_row_2D") != std::string::npos) { - UUR_KNOWN_FAILURE_ON(uur::HIP{}); - } - - if (name.find("copy_3D_2D") != std::string::npos) { - UUR_KNOWN_FAILURE_ON(uur::HIP{}); - } UUR_KNOWN_FAILURE_ON(uur::LevelZero{}, uur::LevelZeroV2{}); diff --git a/unified-runtime/test/conformance/enqueue/urEnqueueMemBufferWriteRect.cpp b/unified-runtime/test/conformance/enqueue/urEnqueueMemBufferWriteRect.cpp index a7c5a7cd7ec7a..3cc4fb66c16d0 100644 --- a/unified-runtime/test/conformance/enqueue/urEnqueueMemBufferWriteRect.cpp +++ b/unified-runtime/test/conformance/enqueue/urEnqueueMemBufferWriteRect.cpp @@ -78,15 +78,6 @@ UUR_DEVICE_TEST_SUITE_WITH_PARAM( uur::printRectTestString); TEST_P(urEnqueueMemBufferWriteRectTestWithParam, Success) { - const auto name = getParam().name; - if (name.find("write_row_2D") != std::string::npos) { - UUR_KNOWN_FAILURE_ON(uur::HIP{}); - } - - if (name.find("write_3D_2D") != std::string::npos) { - UUR_KNOWN_FAILURE_ON(uur::HIP{}); - } - UUR_KNOWN_FAILURE_ON(uur::LevelZero{}, uur::LevelZeroV2{}); // Unpack the parameters. diff --git a/unified-runtime/test/conformance/exp_command_buffer/rect_write.cpp b/unified-runtime/test/conformance/exp_command_buffer/rect_write.cpp index 7c63be305c12f..f6fdc3b1fd133 100644 --- a/unified-runtime/test/conformance/exp_command_buffer/rect_write.cpp +++ b/unified-runtime/test/conformance/exp_command_buffer/rect_write.cpp @@ -117,19 +117,6 @@ UUR_DEVICE_TEST_SUITE_WITH_PARAM( urCommandBufferAppendMemBufferWriteRectTestWithParam>); TEST_P(urCommandBufferAppendMemBufferWriteRectTestWithParam, Success) { - const auto name = getParam().name; - - // This file is based on enqueue/urEnqueueMemBufferWriteRect.cpp - // because of this, these checks are present here, - // since there were present in original code - if (name.find("write_row_2D") != std::string::npos) { - UUR_KNOWN_FAILURE_ON(uur::HIP{}); - } - - if (name.find("write_3D_2D") != std::string::npos) { - UUR_KNOWN_FAILURE_ON(uur::HIP{}); - } - UUR_KNOWN_FAILURE_ON(uur::LevelZero{}); // Zero it to begin with since the write may not cover the whole buffer. diff --git a/unified-runtime/test/conformance/kernel/urKernelGetInfo.cpp b/unified-runtime/test/conformance/kernel/urKernelGetInfo.cpp index b976268f560ab..18db87391b34f 100644 --- a/unified-runtime/test/conformance/kernel/urKernelGetInfo.cpp +++ b/unified-runtime/test/conformance/kernel/urKernelGetInfo.cpp @@ -199,8 +199,6 @@ TEST_P(urKernelGetInfoTest, SuccessAttributes) { } TEST_P(urKernelGetInfoTest, SuccessNumRegs) { - UUR_KNOWN_FAILURE_ON(uur::HIP{}); - const ur_kernel_info_t property_name = UR_KERNEL_INFO_NUM_REGS; size_t property_size = 0; @@ -217,7 +215,7 @@ TEST_P(urKernelGetInfoTest, SuccessNumRegs) { } TEST_P(urKernelGetInfoTest, SuccessSpillMemSize) { - UUR_KNOWN_FAILURE_ON(uur::HIP{}, uur::OpenCL{}); + UUR_KNOWN_FAILURE_ON(uur::OpenCL{}); ur_kernel_info_t property_name = UR_KERNEL_INFO_SPILL_MEM_SIZE; size_t property_size = 0; diff --git a/unified-runtime/test/conformance/kernel/urKernelSetArgValue.cpp b/unified-runtime/test/conformance/kernel/urKernelSetArgValue.cpp index 86ea5a36e8ed7..fe1924496acd3 100644 --- a/unified-runtime/test/conformance/kernel/urKernelSetArgValue.cpp +++ b/unified-runtime/test/conformance/kernel/urKernelSetArgValue.cpp @@ -48,7 +48,7 @@ TEST_P(urKernelSetArgValueTest, InvalidKernelArgumentIndex) { } TEST_P(urKernelSetArgValueTest, InvalidKernelArgumentSize) { - UUR_KNOWN_FAILURE_ON(uur::HIP{}, uur::OpenCL{"Intel(R) UHD Graphics 770"}); + UUR_KNOWN_FAILURE_ON(uur::OpenCL{"Intel(R) UHD Graphics 770"}); ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_KERNEL_ARGUMENT_SIZE, urKernelSetArgValue(kernel, 2, 0, nullptr, &arg_value)); diff --git a/unified-runtime/test/conformance/memory/urMemImageCreate.cpp b/unified-runtime/test/conformance/memory/urMemImageCreate.cpp index 03f75aa2a107d..54bc6bbc5ab90 100644 --- a/unified-runtime/test/conformance/memory/urMemImageCreate.cpp +++ b/unified-runtime/test/conformance/memory/urMemImageCreate.cpp @@ -92,10 +92,6 @@ UUR_DEVICE_TEST_SUITE_WITH_PARAM( TEST_P(urMemImageCreateTestWith1DMemoryTypeParam, Success) { UUR_KNOWN_FAILURE_ON(uur::OpenCL{"Intel(R) FPGA"}); - if (getParam() == UR_MEM_TYPE_IMAGE1D_ARRAY) { - UUR_KNOWN_FAILURE_ON(uur::CUDA{}); - } - ur_image_desc_t image_desc_with_param{ UR_STRUCTURE_TYPE_IMAGE_DESC, ///< [in] type of this structure nullptr, ///< [in][optional] pointer to extension-specific structure @@ -128,10 +124,6 @@ UUR_DEVICE_TEST_SUITE_WITH_PARAM( TEST_P(urMemImageCreateTestWith2DMemoryTypeParam, Success) { UUR_KNOWN_FAILURE_ON(uur::OpenCL{"Intel(R) FPGA"}); - if (getParam() == UR_MEM_TYPE_IMAGE2D_ARRAY) { - UUR_KNOWN_FAILURE_ON(uur::CUDA{}); - } - ur_image_desc_t image_desc_with_param{ UR_STRUCTURE_TYPE_IMAGE_DESC, ///< [in] type of this structure nullptr, ///< [in][optional] pointer to extension-specific structure diff --git a/unified-runtime/test/conformance/program/urProgramGetInfo.cpp b/unified-runtime/test/conformance/program/urProgramGetInfo.cpp index ebb717aa8296d..2a2d4ab234a8e 100644 --- a/unified-runtime/test/conformance/program/urProgramGetInfo.cpp +++ b/unified-runtime/test/conformance/program/urProgramGetInfo.cpp @@ -178,8 +178,6 @@ TEST_P(urProgramGetInfoTest, SuccessBinaries) { } TEST_P(urProgramGetInfoTest, SuccessNumKernels) { - UUR_KNOWN_FAILURE_ON(uur::HIP{}); - size_t property_size = 0; const ur_program_info_t property_name = UR_PROGRAM_INFO_NUM_KERNELS;