From d654a17fee830d401991d858dbb83ceb93a0b77c Mon Sep 17 00:00:00 2001 From: Igor Chorazewicz Date: Wed, 23 Oct 2024 01:02:40 +0000 Subject: [PATCH] [CI] run (almost) all conformance tests on PVC for L0 --- .github/workflows/multi_device.yml | 2 +- .../enqueue/enqueue_adapter_level_zero.match | 68 ++++++++++--------- .../enqueue_adapter_level_zero_v2.match | 1 + .../enqueue/urEnqueueMemImageCopy.cpp | 9 +++ test/conformance/event/urEventWait.cpp | 4 +- 5 files changed, 48 insertions(+), 36 deletions(-) diff --git a/.github/workflows/multi_device.yml b/.github/workflows/multi_device.yml index 239ad6b6d7..48a804bdf8 100644 --- a/.github/workflows/multi_device.yml +++ b/.github/workflows/multi_device.yml @@ -63,4 +63,4 @@ jobs: - name: Test adapters working-directory: ${{github.workspace}}/build - run: env UR_CTS_ADAPTER_PLATFORM="${{matrix.adapter.platform}}" ctest -C ${{matrix.build_type}} --output-on-failure -L "conformance" -E "kernel|integration|exp_command_buffer|exp_enqueue_native|exp_launch_properties|exp_usm_p2p" --timeout 180 + run: env UR_CTS_ADAPTER_PLATFORM="${{matrix.adapter.platform}}" ctest -C ${{matrix.build_type}} --output-on-failure -L "conformance" -E "exp_command_buffer" --timeout 180 diff --git a/test/conformance/enqueue/enqueue_adapter_level_zero.match b/test/conformance/enqueue/enqueue_adapter_level_zero.match index ae4163743f..5a9ce841b8 100644 --- a/test/conformance/enqueue/enqueue_adapter_level_zero.match +++ b/test/conformance/enqueue/enqueue_adapter_level_zero.match @@ -11,6 +11,7 @@ {{OPT}}urEnqueueMemBufferReadRectTestWithParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___write_3d_with_offsets {{OPT}}urEnqueueMemBufferReadRectTestWithParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___write_2d_3d {{OPT}}urEnqueueMemBufferReadRectTestWithParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___write_3d_2d +{{OPT}}urEnqueueMemBufferMapMultiDeviceTest.* {{OPT}}urEnqueueMemBufferWriteRectTestWithParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___write_3d_with_offsets {{OPT}}urEnqueueMemBufferWriteRectTestWithParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___write_2d_3d {{OPT}}urEnqueueMemBufferWriteRectTestWithParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___write_3d_2d @@ -21,36 +22,37 @@ {{OPT}}urEnqueueMemImageReadTest.InvalidOrigin2D/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_ {{OPT}}urEnqueueMemImageReadTest.InvalidOrigin3D/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_ {{OPT}}urEnqueueEventsWaitMultiDeviceMTTest/* -urEnqueueEventsWaitWithBarrierOrderingTest.SuccessEventDependencies/* -urEnqueueEventsWaitWithBarrierOrderingTest.SuccessEventDependenciesBarrierOnly/* -urEnqueueEventsWaitWithBarrierOrderingTest.SuccessEventDependenciesLaunchOnly/* -urEnqueueEventsWaitWithBarrierOrderingTest.SuccessNonEventDependencies/* -urEnqueueEventsWaitWithBarrierTest.Success/* -urEnqueueMemBufferCopyRectTestWithParam.Success/* -urEnqueueMemBufferCopyTestWithParam.Success/* -urEnqueueMemBufferFillTest.Success/* -urEnqueueMemBufferFillTest.SuccessOffset/* -urEnqueueMemBufferFillTest.SuccessPartialFill/* -urEnqueueMemBufferMapTestWithParam.SuccesPinnedWrite/* -urEnqueueMemBufferMapTestWithParam.SuccessMultiMaps/* -urEnqueueMemBufferMapTestWithParam.SuccessOffset/* -urEnqueueMemBufferMapTestWithParam.SuccessPartialMap/* -urEnqueueMemBufferMapTestWithWriteFlagParam.SuccessWrite/* -urEnqueueMemBufferReadRectTestWithParam.Success/* -urEnqueueMemBufferWriteRectTestWithParam.Success/* -urEnqueueMemImageCopyTest.Success/* -urEnqueueMemImageCopyTest.SuccessPartialCopy/* -urEnqueueMemImageCopyTest.SuccessPartialCopyWithDstOffset/* -urEnqueueMemImageCopyTest.SuccessPartialCopyWithSrcOffset/* -urEnqueueMemImageReadTest.InvalidRegion1D/* -urEnqueueMemImageReadTest.InvalidRegion2D/* -urEnqueueMemImageReadTest.InvalidRegion3D/* -urEnqueueMemImageWriteTest.InvalidOrigin1D/* -urEnqueueMemImageWriteTest.InvalidOrigin2D/* -urEnqueueMemImageWriteTest.InvalidOrigin3D/* -urEnqueueMemImageWriteTest.InvalidRegion1D/* -urEnqueueMemImageWriteTest.InvalidRegion2D/* -urEnqueueMemImageWriteTest.InvalidRegion3D/* +{{OPT}}urEnqueueEventsWaitWithBarrierOrderingTest.SuccessEventDependencies/* +{{OPT}}urEnqueueEventsWaitWithBarrierOrderingTest.SuccessEventDependenciesBarrierOnly/* +{{OPT}}urEnqueueEventsWaitWithBarrierOrderingTest.SuccessEventDependenciesLaunchOnly/* +{{OPT}}urEnqueueEventsWaitWithBarrierOrderingTest.SuccessNonEventDependencies/* +{{OPT}}urEnqueueEventsWaitWithBarrierTest.Success/* +{{OPT}}urEnqueueMemBufferCopyRectTestWithParam.Success/* +{{OPT}}urEnqueueMemBufferCopyTestWithParam.Success/* +{{OPT}}urEnqueueMemBufferFillTest.Success/* +{{OPT}}urEnqueueMemBufferFillTest.SuccessOffset/* +{{OPT}}urEnqueueMemBufferFillTest.SuccessPartialFill/* +{{OPT}}urEnqueueMemBufferMapTestWithParam.SuccesPinnedWrite/* +{{OPT}}urEnqueueMemBufferMapTestWithParam.SuccessMultiMaps/* +{{OPT}}urEnqueueMemBufferMapTestWithParam.SuccessRead/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___Intel_R__Data_Center_GPU_Max* +{{OPT}}urEnqueueMemBufferMapTestWithParam.SuccessOffset/* +{{OPT}}urEnqueueMemBufferMapTestWithParam.SuccessPartialMap/* +{{OPT}}urEnqueueMemBufferMapTestWithWriteFlagParam.SuccessWrite/* +{{OPT}}urEnqueueMemBufferReadRectTestWithParam.Success/* +{{OPT}}urEnqueueMemBufferWriteRectTestWithParam.Success/* +{{OPT}}urEnqueueMemImageCopyTest.Success/* +{{OPT}}urEnqueueMemImageCopyTest.SuccessPartialCopy/* +{{OPT}}urEnqueueMemImageCopyTest.SuccessPartialCopyWithDstOffset/* +{{OPT}}urEnqueueMemImageCopyTest.SuccessPartialCopyWithSrcOffset/* +{{OPT}}urEnqueueMemImageReadTest.InvalidRegion1D/* +{{OPT}}urEnqueueMemImageReadTest.InvalidRegion2D/* +{{OPT}}urEnqueueMemImageReadTest.InvalidRegion3D/* +{{OPT}}urEnqueueMemImageWriteTest.InvalidOrigin1D/* +{{OPT}}urEnqueueMemImageWriteTest.InvalidOrigin2D/* +{{OPT}}urEnqueueMemImageWriteTest.InvalidOrigin3D/* +{{OPT}}urEnqueueMemImageWriteTest.InvalidRegion1D/* +{{OPT}}urEnqueueMemImageWriteTest.InvalidRegion2D/* +{{OPT}}urEnqueueMemImageWriteTest.InvalidRegion3D/* {{OPT}}urEnqueueKernelLaunchMultiDeviceTest.KernelLaunchReadDifferentQueues/* urEnqueueReadHostPipeTest.InvalidEventWaitList/* urEnqueueReadHostPipeTest.InvalidNullHandleProgram/* @@ -59,9 +61,9 @@ urEnqueueReadHostPipeTest.InvalidNullPointerBuffer/* urEnqueueReadHostPipeTest.InvalidNullPointerPipeSymbol/* urEnqueueUSMAdviseTest.InvalidSizeTooLarge/* urEnqueueUSMFill2DNegativeTest.OutOfBounds/* -urEnqueueUSMMemcpyTest.Blocking/* -urEnqueueUSMMemcpyTest.BlockingWithEvent/* -urEnqueueUSMMemcpyTest.WaitForDependencies/* +{{OPT}}urEnqueueUSMMemcpyTest.Blocking/* +{{OPT}}urEnqueueUSMMemcpyTest.BlockingWithEvent/* +{{OPT}}urEnqueueUSMMemcpyTest.WaitForDependencies/* urEnqueueUSMPrefetchTest.InvalidSizeTooLarge/* urEnqueueWriteHostPipeTest.InvalidEventWaitList/* urEnqueueWriteHostPipeTest.InvalidNullHandleProgram/* diff --git a/test/conformance/enqueue/enqueue_adapter_level_zero_v2.match b/test/conformance/enqueue/enqueue_adapter_level_zero_v2.match index 7705cb5798..c72bf51398 100644 --- a/test/conformance/enqueue/enqueue_adapter_level_zero_v2.match +++ b/test/conformance/enqueue/enqueue_adapter_level_zero_v2.match @@ -6,6 +6,7 @@ urEnqueueKernelLaunchWithVirtualMemory.Success/Intel_R__oneAPI_Unified_Runtime_o {{OPT}}urEnqueueKernelLaunchIncrementTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UseEventsDisabled {{OPT}}urEnqueueKernelLaunchIncrementMultiDeviceMultiThreadTest.Success/UseEventsNoQueuePerThread {{OPT}}urEnqueueKernelLaunchIncrementMultiDeviceMultiThreadTest.Success/NoUseEventsNoQueuePerThread +{{OPT}}urEnqueueKernelLaunchKernelSubGroupTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_ {{OPT}}urEnqueueMemBufferCopyRectTestWithParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___copy_whole_buffer_2D {{OPT}}urEnqueueMemBufferCopyRectTestWithParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___copy_non_zero_offsets_2D {{OPT}}urEnqueueMemBufferCopyRectTestWithParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___copy_different_buffer_sizes_2D diff --git a/test/conformance/enqueue/urEnqueueMemImageCopy.cpp b/test/conformance/enqueue/urEnqueueMemImageCopy.cpp index 293297589a..715fd66773 100644 --- a/test/conformance/enqueue/urEnqueueMemImageCopy.cpp +++ b/test/conformance/enqueue/urEnqueueMemImageCopy.cpp @@ -12,6 +12,15 @@ struct urEnqueueMemImageCopyTest }; void SetUp() override { UUR_RETURN_ON_FATAL_FAILURE(urQueueTestWithParam::SetUp()); + + ur_bool_t imageSupported; + ASSERT_SUCCESS( + urDeviceGetInfo(this->device, UR_DEVICE_INFO_IMAGE_SUPPORTED, + sizeof(ur_bool_t), &imageSupported, nullptr)); + if (!imageSupported) { + GTEST_SKIP(); + } + type = getParam(); size = (type == UR_MEM_TYPE_IMAGE1D) ? ur_rect_region_t{width, 1, 1} : (type == UR_MEM_TYPE_IMAGE2D) diff --git a/test/conformance/event/urEventWait.cpp b/test/conformance/event/urEventWait.cpp index c226c497a4..1fbfaa09c3 100644 --- a/test/conformance/event/urEventWait.cpp +++ b/test/conformance/event/urEventWait.cpp @@ -8,9 +8,9 @@ struct urEventWaitTest : uur::urQueueTest { void SetUp() override { UUR_RETURN_ON_FATAL_FAILURE(urQueueTest::SetUp()); - ASSERT_SUCCESS(urMemBufferCreate(context, UR_MEM_FLAG_WRITE_ONLY, size, - nullptr, &src_buffer)); ASSERT_SUCCESS(urMemBufferCreate(context, UR_MEM_FLAG_READ_ONLY, size, + nullptr, &src_buffer)); + ASSERT_SUCCESS(urMemBufferCreate(context, UR_MEM_FLAG_WRITE_ONLY, size, nullptr, &dst_buffer)); input.assign(count, 42); ASSERT_SUCCESS(urEnqueueMemBufferWrite(queue, src_buffer, false, 0,