Merge pull request #2285 from RossBrunton/ross/confclean

[NFC] Clean up match files for conf. testing

Author: RossBrunton

scripts/core/CONTRIB.rst

@@ -393,8 +393,6 @@ The format of the match files are as follows:
   matches a single character.
 * Empty lines or lines beginning with ``#`` are ignored.
 * A line beginning with ``{{OPT}}`` is a optional test; see below.
-* For compatibility with an older version of the matching logic, ``{{.*}}`` is
-  interpreted as ``*`` and ``{{NONDETERMINISTIC}}`` is ignored.
 
 Normally tests in the match file must fail (either by crashing or having a test
 failure) for the given adapter. However this can be disabled by prepending

test/conformance/adapter/adapter_adapter_native_cpu.match

@@ -1,4 +1,3 @@
-{{NONDETERMINISTIC}}
 # These pass when the adapter is launched by the loader
 {{OPT}}urAdapterGetLastErrorTest.Success
 {{OPT}}urAdapterGetLastErrorTest.InvalidHandle

test/conformance/context/context_adapter_level_zero.match

@@ -1,2 +1 @@
-{{NONDETERMINISTIC}}
-{{OPT}}urContextSetExtendedDeleterTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
+{{OPT}}urContextSetExtendedDeleterTest.Success/*

test/conformance/context/context_adapter_level_zero_v2.match

@@ -1 +1 @@
-{{OPT}}urContextSetExtendedDeleterTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}__
+{{OPT}}urContextSetExtendedDeleterTest.Success/*

test/conformance/context/context_adapter_native_cpu.match

@@ -1 +1 @@
-{{OPT}}urContextSetExtendedDeleterTest.Success/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
+{{OPT}}urContextSetExtendedDeleterTest.Success/*

test/conformance/cts_exe.py

@@ -146,12 +146,9 @@ def _run_cmd(cmd, comment, filter):
         for l in f:
             optional = "{{OPT}}" in l
             l = l.replace("{{OPT}}", "")
-            l = l.replace("{{.*}}", "*")
 
             if l.startswith("#"):
                 continue
-            if l.startswith("{{NONDETERMINISTIC}}"):
-                continue
             if l.strip() == "":
                 continue
 

test/conformance/device/device_adapter_cuda.match

@@ -1,2 +1 @@
-{{NONDETERMINISTIC}}
 {{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime

test/conformance/device/device_adapter_hip.match

@@ -1,2 +1 @@
-{{NONDETERMINISTIC}}
 {{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime

test/conformance/device/device_adapter_level_zero.match

@@ -1,2 +1 @@
-{{NONDETERMINISTIC}}
 {{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime

test/conformance/device/device_adapter_level_zero_v2.match

@@ -1,3 +1,2 @@
-{{NONDETERMINISTIC}}
 {{OPT}}urDeviceGetGlobalTimestampTest.SuccessSynchronizedTime
 {{OPT}}urDeviceGetInfoTest.Success/UR_DEVICE_INFO_GLOBAL_MEM_FREE