[CI] run (almost) all conformance tests on PVC for L0

oneapi-src · Oct 29, 2024 · d654a17 · d654a17
1 parent cf8e2d4
commit d654a17
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 36 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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,