Skip to content

Commit a1c9555

Browse files
committed
[NFC] Clean up match files for conf. testing
Clean up the match files to hopefully make them more easily readable. As we now use cts_exe.py, we don't need as many workarounds. This changes the following: * Removes the "{{NONDETERMINISTIC}}" tag, which isn't needed any more. * Removes the notice about only being supported in cts_exe.py - all suites now require cts_exe.py. * Device names have been simplified down to a single wildcard - should make it easier to read them and copy between files if needed. * If all tests for a specific enum fail, it has been folded into a single wildcard.
1 parent cd92e72 commit a1c9555

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
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/*
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/*
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
@@ -142,12 +142,9 @@ def _run_cmd(cmd, comment, filter):
142142
for l in f:
143143
optional = "{{OPT}}" in l
144144
l = l.replace("{{OPT}}", "")
145-
l = l.replace("{{.*}}", "*")
146145

147146
if l.startswith("#"):
148147
continue
149-
if l.startswith("{{NONDETERMINISTIC}}"):
150-
continue
151148
if l.strip() == "":
152149
continue
153150

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
{{NONDETERMINISTIC}}
21
{{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
{{NONDETERMINISTIC}}
21
{{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
{{NONDETERMINISTIC}}
21
{{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime
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

0 commit comments

Comments
 (0)