Skip to content

Commit ed66e0e

Browse files
authored
[UR][HIP][CUDA] Update UR CTS disabled tests (#18396)
Most of these tests were already passing. One of them was just missing a simple check in the HIP adapter.
1 parent 7987a43 commit ed66e0e

File tree

9 files changed

+4
-47
lines changed

9 files changed

+4
-47
lines changed

unified-runtime/source/adapters/hip/kernel.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urKernelSuggestMaxCooperativeGroupCountExp(
178178
UR_APIEXPORT ur_result_t UR_APICALL urKernelSetArgValue(
179179
ur_kernel_handle_t hKernel, uint32_t argIndex, size_t argSize,
180180
const ur_kernel_arg_value_properties_t *, const void *pArgValue) {
181+
UR_ASSERT(argSize, UR_RESULT_ERROR_INVALID_KERNEL_ARGUMENT_SIZE);
182+
181183
ur_result_t Result = UR_RESULT_SUCCESS;
182184
try {
183185
hKernel->setKernelArg(argIndex, argSize, pArgValue);

unified-runtime/test/conformance/enqueue/urEnqueueKernelLaunch.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -633,10 +633,6 @@ UUR_DEVICE_TEST_SUITE_WITH_PARAM(
633633
uur::deviceTestWithParamPrinter<uur::BoolTestParam>);
634634

635635
TEST_P(urEnqueueKernelLaunchUSMLinkedList, Success) {
636-
if (use_pool) {
637-
UUR_KNOWN_FAILURE_ON(uur::HIP{});
638-
}
639-
640636
ur_device_usm_access_capability_flags_t shared_usm_flags = 0;
641637
ASSERT_SUCCESS(
642638
uur::GetDeviceUSMSingleSharedSupport(device, shared_usm_flags));

unified-runtime/test/conformance/enqueue/urEnqueueMemBufferCopyRect.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,6 @@ UUR_DEVICE_TEST_SUITE_WITH_PARAM(
7979

8080
TEST_P(urEnqueueMemBufferCopyRectTestWithParam, Success) {
8181
const auto name = getParam().name;
82-
if (name.find("copy_row_2D") != std::string::npos) {
83-
UUR_KNOWN_FAILURE_ON(uur::HIP{});
84-
}
85-
86-
if (name.find("copy_3D_2D") != std::string::npos) {
87-
UUR_KNOWN_FAILURE_ON(uur::HIP{});
88-
}
8982

9083
UUR_KNOWN_FAILURE_ON(uur::LevelZero{}, uur::LevelZeroV2{});
9184

unified-runtime/test/conformance/enqueue/urEnqueueMemBufferWriteRect.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,6 @@ UUR_DEVICE_TEST_SUITE_WITH_PARAM(
7878
uur::printRectTestString<urEnqueueMemBufferWriteRectTestWithParam>);
7979

8080
TEST_P(urEnqueueMemBufferWriteRectTestWithParam, Success) {
81-
const auto name = getParam().name;
82-
if (name.find("write_row_2D") != std::string::npos) {
83-
UUR_KNOWN_FAILURE_ON(uur::HIP{});
84-
}
85-
86-
if (name.find("write_3D_2D") != std::string::npos) {
87-
UUR_KNOWN_FAILURE_ON(uur::HIP{});
88-
}
89-
9081
UUR_KNOWN_FAILURE_ON(uur::LevelZero{}, uur::LevelZeroV2{});
9182

9283
// Unpack the parameters.

unified-runtime/test/conformance/exp_command_buffer/rect_write.cpp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -117,19 +117,6 @@ UUR_DEVICE_TEST_SUITE_WITH_PARAM(
117117
urCommandBufferAppendMemBufferWriteRectTestWithParam>);
118118

119119
TEST_P(urCommandBufferAppendMemBufferWriteRectTestWithParam, Success) {
120-
const auto name = getParam().name;
121-
122-
// This file is based on enqueue/urEnqueueMemBufferWriteRect.cpp
123-
// because of this, these checks are present here,
124-
// since there were present in original code
125-
if (name.find("write_row_2D") != std::string::npos) {
126-
UUR_KNOWN_FAILURE_ON(uur::HIP{});
127-
}
128-
129-
if (name.find("write_3D_2D") != std::string::npos) {
130-
UUR_KNOWN_FAILURE_ON(uur::HIP{});
131-
}
132-
133120
UUR_KNOWN_FAILURE_ON(uur::LevelZero{});
134121

135122
// Zero it to begin with since the write may not cover the whole buffer.

unified-runtime/test/conformance/kernel/urKernelGetInfo.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,6 @@ TEST_P(urKernelGetInfoTest, SuccessAttributes) {
199199
}
200200

201201
TEST_P(urKernelGetInfoTest, SuccessNumRegs) {
202-
UUR_KNOWN_FAILURE_ON(uur::HIP{});
203-
204202
const ur_kernel_info_t property_name = UR_KERNEL_INFO_NUM_REGS;
205203
size_t property_size = 0;
206204

@@ -217,7 +215,7 @@ TEST_P(urKernelGetInfoTest, SuccessNumRegs) {
217215
}
218216

219217
TEST_P(urKernelGetInfoTest, SuccessSpillMemSize) {
220-
UUR_KNOWN_FAILURE_ON(uur::HIP{}, uur::OpenCL{});
218+
UUR_KNOWN_FAILURE_ON(uur::OpenCL{});
221219

222220
ur_kernel_info_t property_name = UR_KERNEL_INFO_SPILL_MEM_SIZE;
223221
size_t property_size = 0;

unified-runtime/test/conformance/kernel/urKernelSetArgValue.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ TEST_P(urKernelSetArgValueTest, InvalidKernelArgumentIndex) {
4848
}
4949

5050
TEST_P(urKernelSetArgValueTest, InvalidKernelArgumentSize) {
51-
UUR_KNOWN_FAILURE_ON(uur::HIP{}, uur::OpenCL{"Intel(R) UHD Graphics 770"});
51+
UUR_KNOWN_FAILURE_ON(uur::OpenCL{"Intel(R) UHD Graphics 770"});
5252

5353
ASSERT_EQ_RESULT(UR_RESULT_ERROR_INVALID_KERNEL_ARGUMENT_SIZE,
5454
urKernelSetArgValue(kernel, 2, 0, nullptr, &arg_value));

unified-runtime/test/conformance/memory/urMemImageCreate.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,6 @@ UUR_DEVICE_TEST_SUITE_WITH_PARAM(
9292
TEST_P(urMemImageCreateTestWith1DMemoryTypeParam, Success) {
9393
UUR_KNOWN_FAILURE_ON(uur::OpenCL{"Intel(R) FPGA"});
9494

95-
if (getParam() == UR_MEM_TYPE_IMAGE1D_ARRAY) {
96-
UUR_KNOWN_FAILURE_ON(uur::CUDA{});
97-
}
98-
9995
ur_image_desc_t image_desc_with_param{
10096
UR_STRUCTURE_TYPE_IMAGE_DESC, ///< [in] type of this structure
10197
nullptr, ///< [in][optional] pointer to extension-specific structure
@@ -128,10 +124,6 @@ UUR_DEVICE_TEST_SUITE_WITH_PARAM(
128124
TEST_P(urMemImageCreateTestWith2DMemoryTypeParam, Success) {
129125
UUR_KNOWN_FAILURE_ON(uur::OpenCL{"Intel(R) FPGA"});
130126

131-
if (getParam() == UR_MEM_TYPE_IMAGE2D_ARRAY) {
132-
UUR_KNOWN_FAILURE_ON(uur::CUDA{});
133-
}
134-
135127
ur_image_desc_t image_desc_with_param{
136128
UR_STRUCTURE_TYPE_IMAGE_DESC, ///< [in] type of this structure
137129
nullptr, ///< [in][optional] pointer to extension-specific structure

unified-runtime/test/conformance/program/urProgramGetInfo.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,6 @@ TEST_P(urProgramGetInfoTest, SuccessBinaries) {
178178
}
179179

180180
TEST_P(urProgramGetInfoTest, SuccessNumKernels) {
181-
UUR_KNOWN_FAILURE_ON(uur::HIP{});
182-
183181
size_t property_size = 0;
184182
const ur_program_info_t property_name = UR_PROGRAM_INFO_NUM_KERNELS;
185183

0 commit comments

Comments
 (0)