diff --git a/source/adapters/native_cpu/device.cpp b/source/adapters/native_cpu/device.cpp index 48cdf9a404..b00892d040 100644 --- a/source/adapters/native_cpu/device.cpp +++ b/source/adapters/native_cpu/device.cpp @@ -420,6 +420,9 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice, case UR_DEVICE_INFO_ENQUEUE_NATIVE_COMMAND_SUPPORT_EXP: return ReturnValue(false); + case UR_DEVICE_INFO_HOST_PIPE_READ_WRITE_SUPPORTED: + return ReturnValue(ur_bool_t{false}); + case UR_DEVICE_INFO_USM_POOL_SUPPORT: return ReturnValue(false); diff --git a/test/conformance/device/device_adapter_native_cpu.match b/test/conformance/device/device_adapter_native_cpu.match index da07da18dc..2764ad4fd1 100644 --- a/test/conformance/device/device_adapter_native_cpu.match +++ b/test/conformance/device/device_adapter_native_cpu.match @@ -11,7 +11,6 @@ urDeviceGetInfoTest.Success/UR_DEVICE_INFO_SUB_GROUP_INDEPENDENT_FORWARD_PROGRES urDeviceGetInfoTest.Success/UR_DEVICE_INFO_MAX_COMPUTE_QUEUE_INDICES urDeviceGetInfoTest.Success/UR_DEVICE_INFO_MAX_WORK_GROUPS_3D urDeviceGetInfoTest.Success/UR_DEVICE_INFO_ASYNC_BARRIER -urDeviceGetInfoTest.Success/UR_DEVICE_INFO_HOST_PIPE_READ_WRITE_SUPPORTED urDeviceGetInfoTest.Success/UR_DEVICE_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES urDeviceGetInfoTest.Success/UR_DEVICE_INFO_ATOMIC_MEMORY_SCOPE_CAPABILITIES urDeviceGetInfoTest.Success/UR_DEVICE_INFO_KERNEL_SET_SPECIALIZATION_CONSTANTS diff --git a/test/conformance/enqueue/enqueue_adapter_level_zero.match b/test/conformance/enqueue/enqueue_adapter_level_zero.match index fdfbe01690..286cafc7fa 100644 --- a/test/conformance/enqueue/enqueue_adapter_level_zero.match +++ b/test/conformance/enqueue/enqueue_adapter_level_zero.match @@ -54,7 +54,6 @@ {{OPT}}urEnqueueMemImageWriteTest.InvalidRegion3D/* {{OPT}}urEnqueueKernelLaunchMultiDeviceTest.KernelLaunchReadDifferentQueues/* urEnqueueUSMAdviseTest.InvalidSizeTooLarge/* -urEnqueueUSMFill2DNegativeTest.OutOfBounds/* {{OPT}}urEnqueueUSMMemcpyTest.Blocking/* {{OPT}}urEnqueueUSMMemcpyTest.BlockingWithEvent/* {{OPT}}urEnqueueUSMMemcpyTest.WaitForDependencies/* diff --git a/test/conformance/enqueue/enqueue_adapter_level_zero_v2.match b/test/conformance/enqueue/enqueue_adapter_level_zero_v2.match index f0af10a448..58a6ec4116 100644 --- a/test/conformance/enqueue/enqueue_adapter_level_zero_v2.match +++ b/test/conformance/enqueue/enqueue_adapter_level_zero_v2.match @@ -68,7 +68,6 @@ urEnqueueKernelLaunchKernelWgSizeTest.Success/* {{OPT}}urEnqueueMemImageWriteTest.InvalidRegion2D/* {{OPT}}urEnqueueMemImageWriteTest.InvalidRegion3D/* {{OPT}}urEnqueueKernelLaunchMultiDeviceTest.KernelLaunchReadDifferentQueues/* -urEnqueueUSMFill2DNegativeTest.OutOfBounds/* urEnqueueUSMAdviseTest.InvalidSizeTooLarge/* urEnqueueUSMPrefetchTest.InvalidSizeTooLarge/* {{OPT}}urEnqueueTimestampRecordingExpTest.SuccessBlocking/* diff --git a/test/conformance/enqueue/enqueue_adapter_native_cpu.match b/test/conformance/enqueue/enqueue_adapter_native_cpu.match index 18abf6abfe..35b9df84de 100644 --- a/test/conformance/enqueue/enqueue_adapter_native_cpu.match +++ b/test/conformance/enqueue/enqueue_adapter_native_cpu.match @@ -139,16 +139,6 @@ urEnqueueEventsWaitWithBarrierOrderingTest.SuccessNonEventDependencies/*_ {{OPT}}urEnqueueUSMPrefetchTest.InvalidSizeZero/* {{OPT}}urEnqueueUSMPrefetchTest.InvalidSizeTooLarge/* {{OPT}}urEnqueueUSMPrefetchTest.InvalidEventWaitList/* -{{OPT}}urEnqueueReadHostPipeTest.InvalidNullHandleQueue/* -{{OPT}}urEnqueueReadHostPipeTest.InvalidNullHandleProgram/* -{{OPT}}urEnqueueReadHostPipeTest.InvalidNullPointerPipeSymbol/* -{{OPT}}urEnqueueReadHostPipeTest.InvalidNullPointerBuffer/* -{{OPT}}urEnqueueReadHostPipeTest.InvalidEventWaitList/* -{{OPT}}urEnqueueWriteHostPipeTest.InvalidNullHandleQueue/* -{{OPT}}urEnqueueWriteHostPipeTest.InvalidNullHandleProgram/* -{{OPT}}urEnqueueWriteHostPipeTest.InvalidNullPointerPipeSymbol/* -{{OPT}}urEnqueueWriteHostPipeTest.InvalidNullPointerBuffer/* -{{OPT}}urEnqueueWriteHostPipeTest.InvalidEventWaitList/* urEnqueueKernelLaunchIncrementMultiDeviceMultiThreadTest.Success/* urEnqueueKernelLaunchIncrementMultiDeviceTest.Success/* urEnqueueKernelLaunchIncrementTest.Success/* diff --git a/test/conformance/enqueue/urEnqueueUSMFill2D.cpp b/test/conformance/enqueue/urEnqueueUSMFill2D.cpp index 29123b57bd..e5d3186b81 100644 --- a/test/conformance/enqueue/urEnqueueUSMFill2D.cpp +++ b/test/conformance/enqueue/urEnqueueUSMFill2D.cpp @@ -134,9 +134,9 @@ TEST_P(urEnqueueUSMFill2DTestWithParam, Success) { ur_event_handle_t event = nullptr; - ASSERT_SUCCESS(urEnqueueUSMFill2D(queue, ptr, pitch, pattern_size, - pattern.data(), width, height, 0, nullptr, - &event)); + UUR_ASSERT_SUCCESS_OR_UNSUPPORTED( + urEnqueueUSMFill2D(queue, ptr, pitch, pattern_size, pattern.data(), + width, height, 0, nullptr, &event)); EXPECT_SUCCESS(urQueueFlush(queue)); ASSERT_SUCCESS(urEventWait(1, &event)); @@ -161,6 +161,11 @@ struct urEnqueueUSMFill2DNegativeTest : uur::urQueueTest { ASSERT_SUCCESS(urUSMDeviceAlloc(context, device, nullptr, nullptr, allocation_size, &ptr)); + + UUR_ASSERT_SUCCESS_OR_UNSUPPORTED( + urEnqueueUSMFill2D(queue, ptr, pitch, pattern_size, pattern.data(), + width, height, 0, nullptr, nullptr)); + ASSERT_SUCCESS(urQueueFinish(queue)); } void TearDown() override { diff --git a/test/conformance/memory/memory_adapter_level_zero_v2.match b/test/conformance/memory/memory_adapter_level_zero_v2.match deleted file mode 100644 index ec09c7b5ef..0000000000 --- a/test/conformance/memory/memory_adapter_level_zero_v2.match +++ /dev/null @@ -1,15 +0,0 @@ -{{OPT}}urMemBufferPartitionWithFlagsTest.Success/* -{{OPT}}urMemBufferPartitionTest.InvalidValueCreateType/* -{{OPT}}urMemBufferPartitionTest.InvalidValueBufferCreateInfoOutOfBounds/* -{{OPT}}urMemGetInfoImageTest.Success/* -{{OPT}}urMemImageCreateTestWithImageFormatParam.Success/* -{{OPT}}urMemImageGetInfoTest.Success/* -{{OPT}}urMemImageGetInfoTest.InvalidNullHandleImage/* -{{OPT}}urMemImageGetInfoTest.InvalidEnumerationImageInfoType/* -{{OPT}}urMemImageGetInfoTest.InvalidSizeZero/* -{{OPT}}urMemImageGetInfoTest.InvalidSizeSmall/* -{{OPT}}urMemImageGetInfoTest.InvalidNullPointerParamValue/* -{{OPT}}urMemImageGetInfoTest.InvalidNullPointerPropSizeRet/* -{{OPT}}urMemImageCreateWithNativeHandleTest.Success/* -{{OPT}}urMemImageCreateWithNativeHandleTest.InvalidNullHandle/* -{{OPT}}urMemImageCreateWithNativeHandleTest.InvalidNullPointer/* diff --git a/test/conformance/memory/memory_adapter_native_cpu.match b/test/conformance/memory/memory_adapter_native_cpu.match index aafd22075c..4465185bed 100644 --- a/test/conformance/memory/memory_adapter_native_cpu.match +++ b/test/conformance/memory/memory_adapter_native_cpu.match @@ -4,7 +4,6 @@ urMemBufferPartitionTest.InvalidValueCreateType/* urMemBufferPartitionTest.InvalidValueBufferCreateInfoOutOfBounds/* urMemGetInfoTestWithParam.Success/* urMemGetInfoTest.InvalidSizeSmall/* -urMemImageCreateTestWithImageFormatParam.Success/* urMemReleaseTest.Success/* urMemReleaseTest.CheckReferenceCount/* urMemRetainTest.Success/* diff --git a/test/conformance/memory/urMemImageCreateWithImageFormatParam.cpp b/test/conformance/memory/urMemImageCreateWithImageFormatParam.cpp index c305f58f00..b72b5a9425 100644 --- a/test/conformance/memory/urMemImageCreateWithImageFormatParam.cpp +++ b/test/conformance/memory/urMemImageCreateWithImageFormatParam.cpp @@ -110,6 +110,10 @@ TEST_P(urMemImageCreateTestWithImageFormatParam, Success) { } } + if (res == UR_RESULT_ERROR_UNSUPPORTED_FEATURE) { + GTEST_SKIP() << "urMemImageCreate not supported"; + } + if (!is_primary_image_format && res == UR_RESULT_ERROR_UNSUPPORTED_IMAGE_FORMAT) { GTEST_SKIP(); diff --git a/test/conformance/memory/urMemImageCreateWithNativeHandle.cpp b/test/conformance/memory/urMemImageCreateWithNativeHandle.cpp index c33cc814a3..a881af0752 100644 --- a/test/conformance/memory/urMemImageCreateWithNativeHandle.cpp +++ b/test/conformance/memory/urMemImageCreateWithNativeHandle.cpp @@ -10,7 +10,8 @@ UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urMemImageCreateWithNativeHandleTest); TEST_P(urMemImageCreateWithNativeHandleTest, Success) { ur_native_handle_t native_handle = 0; - ASSERT_SUCCESS(urMemGetNativeHandle(image, device, &native_handle)); + UUR_ASSERT_SUCCESS_OR_UNSUPPORTED( + urMemGetNativeHandle(image, device, &native_handle)); ur_mem_handle_t mem = nullptr; ASSERT_SUCCESS(urMemImageCreateWithNativeHandle( diff --git a/test/conformance/testing/include/uur/fixtures.h b/test/conformance/testing/include/uur/fixtures.h index e5c5d39591..584ce8b9ca 100644 --- a/test/conformance/testing/include/uur/fixtures.h +++ b/test/conformance/testing/include/uur/fixtures.h @@ -209,9 +209,9 @@ struct urMemImageTest : urContextTest { if (!imageSupported) { GTEST_SKIP(); } - ASSERT_SUCCESS(urMemImageCreate(context, UR_MEM_FLAG_READ_WRITE, - &image_format, &image_desc, nullptr, - &image)); + UUR_ASSERT_SUCCESS_OR_UNSUPPORTED( + urMemImageCreate(context, UR_MEM_FLAG_READ_WRITE, &image_format, + &image_desc, nullptr, &image)); } void TearDown() override { @@ -323,8 +323,9 @@ template struct urMemImageTestWithParam : urContextTestWithParam { if (!imageSupported) { GTEST_SKIP(); } - ASSERT_SUCCESS(urMemImageCreate(this->context, UR_MEM_FLAG_READ_WRITE, - &format, &desc, nullptr, &image)); + UUR_ASSERT_SUCCESS_OR_UNSUPPORTED( + urMemImageCreate(this->context, UR_MEM_FLAG_READ_WRITE, &format, + &desc, nullptr, &image)); ASSERT_NE(nullptr, image); } @@ -373,10 +374,6 @@ struct urQueueTest : urContextTest { struct urHostPipeTest : urQueueTest { void SetUp() override { UUR_RETURN_ON_FATAL_FAILURE(urQueueTest::SetUp()); - UUR_RETURN_ON_FATAL_FAILURE( - uur::KernelsEnvironment::instance->LoadSource("foo", il_binary)); - ASSERT_SUCCESS(uur::KernelsEnvironment::instance->CreateProgram( - platform, context, device, *il_binary, nullptr, &program)); size_t size = 0; ASSERT_SUCCESS(urDeviceGetInfo( @@ -384,6 +381,7 @@ struct urHostPipeTest : urQueueTest { &size)); ASSERT_NE(size, 0); ASSERT_EQ(sizeof(ur_bool_t), size); + void *info_data = alloca(size); ASSERT_SUCCESS(urDeviceGetInfo( device, UR_DEVICE_INFO_HOST_PIPE_READ_WRITE_SUPPORTED, size, @@ -395,6 +393,11 @@ struct urHostPipeTest : urQueueTest { if (!supported) { GTEST_SKIP() << "Host pipe read/write is not supported."; } + + UUR_RETURN_ON_FATAL_FAILURE( + uur::KernelsEnvironment::instance->LoadSource("foo", il_binary)); + ASSERT_SUCCESS(uur::KernelsEnvironment::instance->CreateProgram( + platform, context, device, *il_binary, nullptr, &program)); } void TearDown() override {