Skip to content

Commit ecedac6

Browse files
RossBruntonRossBrunton
authored
Merge pull request #2285 from RossBrunton/ross/confclean
[NFC] Clean up match files for conf. testing
2 parents 84cad07 + d83e2c8 commit ecedac6

File tree

55 files changed

+852
-1968
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+852
-1968
lines changed

‎scripts/core/CONTRIB.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,8 +393,6 @@ The format of the match files are as follows:
393393
matches a single character.
394394
* Empty lines or lines beginning with ``#`` are ignored.
395395
* A line beginning with ``{{OPT}}`` is a optional test; see below.
396-
* For compatibility with an older version of the matching logic, ``{{.*}}`` is
397-
interpreted as ``*`` and ``{{NONDETERMINISTIC}}`` is ignored.
398396

399397
Normally tests in the match file must fail (either by crashing or having a test
400398
failure) for the given adapter. However this can be disabled by prepending

‎test/conformance/adapter/adapter_adapter_native_cpu.match

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{{NONDETERMINISTIC}}
21
# These pass when the adapter is launched by the loader
32
{{OPT}}urAdapterGetLastErrorTest.Success
43
{{OPT}}urAdapterGetLastErrorTest.InvalidHandle

‎test/conformance/context/context_adapter_level_zero.match

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
{{NONDETERMINISTIC}}
2-
{{OPT}}urContextSetExtendedDeleterTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
1+
{{OPT}}urContextSetExtendedDeleterTest.Success/*

‎test/conformance/context/context_adapter_level_zero_v2.match

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{OPT}}urContextSetExtendedDeleterTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}__
1+
{{OPT}}urContextSetExtendedDeleterTest.Success/*

‎test/conformance/context/context_adapter_native_cpu.match

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{OPT}}urContextSetExtendedDeleterTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
1+
{{OPT}}urContextSetExtendedDeleterTest.Success/*

‎test/conformance/cts_exe.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,9 @@ def _run_cmd(cmd, comment, filter):
146146
for l in f:
147147
optional = "{{OPT}}" in l
148148
l = l.replace("{{OPT}}", "")
149-
l = l.replace("{{.*}}", "*")
150149

151150
if l.startswith("#"):
152151
continue
153-
if l.startswith("{{NONDETERMINISTIC}}"):
154-
continue
155152
if l.strip() == "":
156153
continue
157154

‎test/conformance/device/device_adapter_cuda.match

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
{{NONDETERMINISTIC}}
21
{{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime

‎test/conformance/device/device_adapter_hip.match

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
{{NONDETERMINISTIC}}
21
{{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime

‎test/conformance/device/device_adapter_level_zero.match

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
{{NONDETERMINISTIC}}
21
{{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime

‎test/conformance/device/device_adapter_level_zero_v2.match

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
{{NONDETERMINISTIC}}
21
{{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime
32
{{OPT}}urDeviceGetInfoTest.Success/UR_DEVICE_INFO_GLOBAL_MEM_FREE

‎test/conformance/device/device_adapter_native_cpu.match

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{{NONDETERMINISTIC}}
21
urDeviceCreateWithNativeHandleTest.InvalidNullHandlePlatform
32
urDeviceCreateWithNativeHandleTest.InvalidNullPointerDevice
43
{{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime

‎test/conformance/enqueue/enqueue_adapter_cuda.match

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
{{NONDETERMINISTIC}}
2-
urEnqueueKernelLaunchTest.InvalidKernelArgs/NVIDIA_CUDA_BACKEND___{{.*}}_
3-
urEnqueueKernelLaunchKernelWgSizeTest.NonMatchingLocalSize/NVIDIA_CUDA_BACKEND___{{.*}}_
4-
urEnqueueKernelLaunchKernelSubGroupTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}_
5-
urEnqueueMemBufferMapTestWithWriteFlagParam.SuccessWrite/NVIDIA_CUDA_BACKEND___{{.*}}___UR_MAP_FLAG_WRITE_INVALIDATE_REGION
6-
urEnqueueUSMAdviseWithParamTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_USM_ADVICE_FLAG_DEFAULT
7-
urEnqueueUSMAdviseTest.MultipleParamsSuccess/NVIDIA_CUDA_BACKEND___{{.*}}_
8-
urEnqueueUSMPrefetchWithParamTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}___UR_USM_MIGRATION_FLAG_DEFAULT
9-
urEnqueueUSMPrefetchWithParamTest.CheckWaitEvent/NVIDIA_CUDA_BACKEND___{{.*}}___UR_USM_MIGRATION_FLAG_DEFAULT
10-
urEnqueueTimestampRecordingExpTest.Success/NVIDIA_CUDA_BACKEND___{{.*}}_
11-
urEnqueueTimestampRecordingExpTest.SuccessBlocking/NVIDIA_CUDA_BACKEND___{{.*}}_
1+
urEnqueueKernelLaunchTest.InvalidKernelArgs/*
2+
urEnqueueKernelLaunchKernelWgSizeTest.NonMatchingLocalSize/*
3+
urEnqueueKernelLaunchKernelSubGroupTest.Success/*
4+
urEnqueueMemBufferMapTestWithWriteFlagParam.SuccessWrite/*__UR_MAP_FLAG_WRITE_INVALIDATE_REGION
5+
urEnqueueUSMAdviseWithParamTest.Success/*__UR_USM_ADVICE_FLAG_DEFAULT
6+
urEnqueueUSMAdviseTest.MultipleParamsSuccess/*
7+
urEnqueueUSMPrefetchWithParamTest.Success/*__UR_USM_MIGRATION_FLAG_DEFAULT
8+
urEnqueueUSMPrefetchWithParamTest.CheckWaitEvent/*__UR_USM_MIGRATION_FLAG_DEFAULT
9+
urEnqueueTimestampRecordingExpTest.Success/*
10+
urEnqueueTimestampRecordingExpTest.SuccessBlocking/*

‎test/conformance/enqueue/enqueue_adapter_hip.match

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
1-
{{NONDETERMINISTIC}}
21
# HIP can't check kernel arguments
3-
urEnqueueKernelLaunchTest.InvalidKernelArgs/AMD_HIP_BACKEND___{{.*}}_
4-
urEnqueueKernelLaunchKernelWgSizeTest.NonMatchingLocalSize/AMD_HIP_BACKEND___{{.*}}_
5-
urEnqueueKernelLaunchKernelSubGroupTest.Success/AMD_HIP_BACKEND___{{.*}}_
6-
urEnqueueKernelLaunchUSMLinkedList.Success/AMD_HIP_BACKEND___{{.*}}___UsePoolEnabled
7-
{{OPT}}urEnqueueMemBufferCopyRectTestWithParam.Success/AMD_HIP_BACKEND___{{.*}}___copy_row_2D
8-
{{OPT}}urEnqueueMemBufferCopyRectTestWithParam.Success/AMD_HIP_BACKEND___{{.*}}___copy_3d_2d
9-
{{OPT}}urEnqueueMemBufferWriteRectTestWithParam.Success/AMD_HIP_BACKEND___{{.*}}___write_row_2D
10-
{{OPT}}urEnqueueMemBufferWriteRectTestWithParam.Success/AMD_HIP_BACKEND___{{.*}}___write_3d_2d
2+
urEnqueueKernelLaunchTest.InvalidKernelArgs/*
3+
urEnqueueKernelLaunchKernelWgSizeTest.NonMatchingLocalSize/*
4+
urEnqueueKernelLaunchKernelSubGroupTest.Success/*
5+
urEnqueueKernelLaunchUSMLinkedList.Success/*__UsePoolEnabled
6+
{{OPT}}urEnqueueMemBufferCopyRectTestWithParam.Success/*__copy_row_2D
7+
{{OPT}}urEnqueueMemBufferCopyRectTestWithParam.Success/*__copy_3d_2d
8+
{{OPT}}urEnqueueMemBufferWriteRectTestWithParam.Success/*__write_row_2D
9+
{{OPT}}urEnqueueMemBufferWriteRectTestWithParam.Success/*__write_3d_2d
1110

1211
# HIP doesn't ignore unsupported USM advice or prefetching. Instead of
1312
# returning UR_RESULT_SUCCESS as per the spec, it instead returns
1413
# UR_RESULT_ERROR_ADAPTER_SPECIFIC to issue a warning. These tests will fail
1514
# until this is rectified.
16-
urEnqueueUSMAdviseWithParamTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_USM_ADVICE_FLAG_DEFAULT
17-
urEnqueueUSMAdviseTest.MultipleParamsSuccess/AMD_HIP_BACKEND___{{.*}}_
18-
urEnqueueUSMPrefetchWithParamTest.Success/AMD_HIP_BACKEND___{{.*}}___UR_USM_MIGRATION_FLAG_DEFAULT
19-
urEnqueueUSMPrefetchWithParamTest.CheckWaitEvent/AMD_HIP_BACKEND___{{.*}}___UR_USM_MIGRATION_FLAG_DEFAULT
15+
urEnqueueUSMAdviseWithParamTest.Success/*__UR_USM_ADVICE_FLAG_DEFAULT
16+
urEnqueueUSMAdviseTest.MultipleParamsSuccess/*
17+
urEnqueueUSMPrefetchWithParamTest.Success/*__UR_USM_MIGRATION_FLAG_DEFAULT
18+
urEnqueueUSMPrefetchWithParamTest.CheckWaitEvent/*__UR_USM_MIGRATION_FLAG_DEFAULT
2019

21-
urEnqueueTimestampRecordingExpTest.Success/AMD_HIP_BACKEND___{{.*}}
22-
urEnqueueTimestampRecordingExpTest.SuccessBlocking/AMD_HIP_BACKEND___{{.*}}
20+
urEnqueueTimestampRecordingExpTest.Success/*
21+
urEnqueueTimestampRecordingExpTest.SuccessBlocking/*

‎test/conformance/enqueue/enqueue_adapter_level_zero.match

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
1-
# Note: This file is only for use with cts_exe.py
2-
{{OPT}}urEnqueueEventsWaitTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
3-
{{OPT}}urEnqueueKernelLaunchTest.InvalidKernelArgs/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
4-
{{OPT}}urEnqueueKernelLaunchKernelWgSizeTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
5-
{{OPT}}urEnqueueKernelLaunchKernelSubGroupTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
6-
{{OPT}}urEnqueueMemBufferCopyRectTestWithParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___copy_2d_3d
7-
{{OPT}}urEnqueueMemBufferCopyRectTestWithParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___copy_3d_2d
8-
{{OPT}}urEnqueueMemBufferReadRectTestWithParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___write_non_zero_offsets_2D
9-
{{OPT}}urEnqueueMemBufferReadRectTestWithParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___write_different_buffer_sizes_2D
10-
{{OPT}}urEnqueueMemBufferReadRectTestWithParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___write_column_2D
11-
{{OPT}}urEnqueueMemBufferReadRectTestWithParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___write_3d_with_offsets
12-
{{OPT}}urEnqueueMemBufferReadRectTestWithParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___write_2d_3d
13-
{{OPT}}urEnqueueMemBufferReadRectTestWithParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___write_3d_2d
1+
{{OPT}}urEnqueueEventsWaitTest.Success/*
2+
{{OPT}}urEnqueueKernelLaunchTest.InvalidKernelArgs/*
3+
{{OPT}}urEnqueueKernelLaunchKernelWgSizeTest.Success/*
4+
{{OPT}}urEnqueueKernelLaunchKernelSubGroupTest.Success/*
5+
{{OPT}}urEnqueueMemBufferCopyRectTestWithParam.Success/*__copy_2d_3d
6+
{{OPT}}urEnqueueMemBufferCopyRectTestWithParam.Success/*__copy_3d_2d
7+
{{OPT}}urEnqueueMemBufferReadRectTestWithParam.Success/*__write_non_zero_offsets_2D
8+
{{OPT}}urEnqueueMemBufferReadRectTestWithParam.Success/*__write_different_buffer_sizes_2D
9+
{{OPT}}urEnqueueMemBufferReadRectTestWithParam.Success/*__write_column_2D
10+
{{OPT}}urEnqueueMemBufferReadRectTestWithParam.Success/*__write_3d_with_offsets
11+
{{OPT}}urEnqueueMemBufferReadRectTestWithParam.Success/*__write_2d_3d
12+
{{OPT}}urEnqueueMemBufferReadRectTestWithParam.Success/*__write_3d_2d
1413
{{OPT}}urEnqueueMemBufferMapMultiDeviceTest.*
15-
{{OPT}}urEnqueueMemBufferWriteRectTestWithParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___write_3d_with_offsets
16-
{{OPT}}urEnqueueMemBufferWriteRectTestWithParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___write_2d_3d
17-
{{OPT}}urEnqueueMemBufferWriteRectTestWithParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___write_3d_2d
18-
{{OPT}}urEnqueueMemImageCopyTest.InvalidSize/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___1D
19-
{{OPT}}urEnqueueMemImageCopyTest.InvalidSize/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___2D
20-
{{OPT}}urEnqueueMemImageCopyTest.InvalidSize/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___3D
21-
{{OPT}}urEnqueueMemImageReadTest.InvalidOrigin1D/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
22-
{{OPT}}urEnqueueMemImageReadTest.InvalidOrigin2D/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
23-
{{OPT}}urEnqueueMemImageReadTest.InvalidOrigin3D/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
14+
{{OPT}}urEnqueueMemBufferWriteRectTestWithParam.Success/*__write_3d_with_offsets
15+
{{OPT}}urEnqueueMemBufferWriteRectTestWithParam.Success/*__write_2d_3d
16+
{{OPT}}urEnqueueMemBufferWriteRectTestWithParam.Success/*__write_3d_2d
17+
{{OPT}}urEnqueueMemImageCopyTest.InvalidSize/*
18+
{{OPT}}urEnqueueMemImageReadTest.InvalidOrigin1D/*
19+
{{OPT}}urEnqueueMemImageReadTest.InvalidOrigin2D/*
20+
{{OPT}}urEnqueueMemImageReadTest.InvalidOrigin3D/*
2421
{{OPT}}urEnqueueEventsWaitMultiDeviceMTTest/*
2522
{{OPT}}urEnqueueEventsWaitWithBarrierOrderingTest.SuccessEventDependencies/*
2623
{{OPT}}urEnqueueEventsWaitWithBarrierOrderingTest.SuccessEventDependenciesBarrierOnly/*

0 commit comments

Comments
 (0)