Skip to content

Commit 262bea8

Browse files
RossBruntonRossBrunton
authored
Merge pull request #2220 from RossBrunton/ross/nosegfault
No longer expect segfaults in match files
2 parents d8cc532 + 68630ac commit 262bea8

9 files changed

+80
-18
lines changed

‎test/conformance/cts_exe.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,16 +120,12 @@ def _run_cmd(cmd, comment, filter):
120120
# Parse fails list
121121
_print_format("Loading fails from {}", args.failslist)
122122
fail_patterns = []
123-
expected_fail = False
124123
with open(args.failslist) as f:
125124
for l in f:
126125
optional = "{{OPT}}" in l
127126
l = l.replace("{{OPT}}", "")
128127
l = l.replace("{{.*}}", "*")
129128

130-
if l.startswith("{{Segmentation fault"):
131-
expected_fail = True
132-
continue
133129
if l.startswith("#"):
134130
continue
135131
if l.startswith("{{NONDETERMINISTIC}}"):
@@ -160,7 +156,7 @@ def _run_cmd(cmd, comment, filter):
160156
gtest_filter = "-" + (":".join(map(lambda x: x["pattern"], fail_patterns)))
161157
if _check_filter(base_invocation, gtest_filter):
162158
result = _run_cmd(base_invocation, "known good tests", gtest_filter)
163-
if result != 0 and not expected_fail:
159+
if result != 0:
164160
_print_error("Tests we expected to pass have failed")
165161
final_result = result
166162
else:

‎test/conformance/enqueue/enqueue_adapter_level_zero.match

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{NONDETERMINISTIC}}
1+
# Note: This file is only for use with cts_exe.py
22
{{OPT}}urEnqueueEventsWaitTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
33
{{OPT}}urEnqueueKernelLaunchTest.InvalidKernelArgs/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
44
{{OPT}}urEnqueueKernelLaunchKernelWgSizeTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
@@ -22,4 +22,49 @@
2222
{{OPT}}urEnqueueMemImageReadTest.InvalidOrigin1D/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
2323
{{OPT}}urEnqueueMemImageReadTest.InvalidOrigin2D/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
2424
{{OPT}}urEnqueueMemImageReadTest.InvalidOrigin3D/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
25-
{{Segmentation fault|Aborted}}
25+
urEnqueueEventsWaitWithBarrierOrderingTest.SuccessEventDependencies/*
26+
urEnqueueEventsWaitWithBarrierOrderingTest.SuccessEventDependenciesBarrierOnly/*
27+
urEnqueueEventsWaitWithBarrierOrderingTest.SuccessEventDependenciesLaunchOnly/*
28+
urEnqueueEventsWaitWithBarrierOrderingTest.SuccessNonEventDependencies/*
29+
urEnqueueEventsWaitWithBarrierTest.Success/*
30+
urEnqueueMemBufferCopyRectTestWithParam.Success/*
31+
urEnqueueMemBufferCopyTestWithParam.Success/*
32+
urEnqueueMemBufferFillTest.Success/*
33+
urEnqueueMemBufferFillTest.SuccessOffset/*
34+
urEnqueueMemBufferFillTest.SuccessPartialFill/*
35+
urEnqueueMemBufferMapTestWithParam.SuccesPinnedWrite/*
36+
urEnqueueMemBufferMapTestWithParam.SuccessMultiMaps/*
37+
urEnqueueMemBufferMapTestWithParam.SuccessOffset/*
38+
urEnqueueMemBufferMapTestWithParam.SuccessPartialMap/*
39+
urEnqueueMemBufferMapTestWithWriteFlagParam.SuccessWrite/*
40+
urEnqueueMemBufferReadRectTestWithParam.Success/*
41+
urEnqueueMemBufferWriteRectTestWithParam.Success/*
42+
urEnqueueMemImageCopyTest.Success/*
43+
urEnqueueMemImageCopyTest.SuccessPartialCopy/*
44+
urEnqueueMemImageCopyTest.SuccessPartialCopyWithDstOffset/*
45+
urEnqueueMemImageCopyTest.SuccessPartialCopyWithSrcOffset/*
46+
urEnqueueMemImageReadTest.InvalidRegion1D/*
47+
urEnqueueMemImageReadTest.InvalidRegion2D/*
48+
urEnqueueMemImageReadTest.InvalidRegion3D/*
49+
urEnqueueMemImageWriteTest.InvalidOrigin1D/*
50+
urEnqueueMemImageWriteTest.InvalidOrigin2D/*
51+
urEnqueueMemImageWriteTest.InvalidOrigin3D/*
52+
urEnqueueMemImageWriteTest.InvalidRegion1D/*
53+
urEnqueueMemImageWriteTest.InvalidRegion2D/*
54+
urEnqueueMemImageWriteTest.InvalidRegion3D/*
55+
urEnqueueReadHostPipeTest.InvalidEventWaitList/*
56+
urEnqueueReadHostPipeTest.InvalidNullHandleProgram/*
57+
urEnqueueReadHostPipeTest.InvalidNullHandleQueue/*
58+
urEnqueueReadHostPipeTest.InvalidNullPointerBuffer/*
59+
urEnqueueReadHostPipeTest.InvalidNullPointerPipeSymbol/*
60+
urEnqueueUSMAdviseTest.InvalidSizeTooLarge/*
61+
urEnqueueUSMFill2DNegativeTest.OutOfBounds/*
62+
urEnqueueUSMMemcpyTest.Blocking/*
63+
urEnqueueUSMMemcpyTest.BlockingWithEvent/*
64+
urEnqueueUSMMemcpyTest.WaitForDependencies/*
65+
urEnqueueUSMPrefetchTest.InvalidSizeTooLarge/*
66+
urEnqueueWriteHostPipeTest.InvalidEventWaitList/*
67+
urEnqueueWriteHostPipeTest.InvalidNullHandleProgram/*
68+
urEnqueueWriteHostPipeTest.InvalidNullHandleQueue/*
69+
urEnqueueWriteHostPipeTest.InvalidNullPointerBuffer/*
70+
urEnqueueWriteHostPipeTest.InvalidNullPointerPipeSymbol/*

‎test/conformance/enqueue/enqueue_adapter_native_cpu.match

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{NONDETERMINISTIC}}
1+
# Note: This file is only for use with cts_exe.py
22
{{OPT}}urEnqueueEventsWaitMultiDeviceTest.EmptyWaitList
33
{{OPT}}urEnqueueEventsWaitMultiDeviceTest.EmptyWaitListWithEvent
44
{{OPT}}urEnqueueEventsWaitMultiDeviceTest.EnqueueWaitOnADifferentQueue
@@ -385,4 +385,8 @@ urEnqueueEventsWaitWithBarrierOrderingTest.SuccessNonEventDependencies/SYCL_NATI
385385
{{OPT}}urEnqueueWriteHostPipeTest.InvalidNullPointerPipeSymbol/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
386386
{{OPT}}urEnqueueWriteHostPipeTest.InvalidNullPointerBuffer/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
387387
{{OPT}}urEnqueueWriteHostPipeTest.InvalidEventWaitList/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
388-
{{OPT}}{{Segmentation fault|Aborted}}
388+
urEnqueueKernelLaunchIncrementMultiDeviceMultiThreadTest.Success/*
389+
urEnqueueKernelLaunchIncrementMultiDeviceTest.Success/*
390+
urEnqueueKernelLaunchIncrementTest.Success/*
391+
# This one is flakey
392+
{{OPT}}urEnqueueMemBufferReadTestWithParam.NonBlocking/*

‎test/conformance/event/event_adapter_level_zero.match

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
{{NONDETERMINISTIC}}
1+
# Note: This file is only for use with cts_exe.py
22
{{OPT}}urEventGetInfoTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_EVENT_INFO_COMMAND_TYPE
33
{{OPT}}urEventGetProfilingInfoTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_PROFILING_INFO_COMMAND_QUEUED
44
{{OPT}}urEventGetProfilingInfoTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_PROFILING_INFO_COMMAND_SUBMIT
55
{{OPT}}urEventGetProfilingInfoTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_PROFILING_INFO_COMMAND_COMPLETE
66
{{OPT}}urEventGetProfilingInfoWithTimingComparisonTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
7-
{{OPT}}{{Segmentation fault|Aborted}}
7+
urEventCreateWithNativeHandleTest.Success/*
8+
urEventSetCallbackTest.AllStates/*
9+
urEventSetCallbackTest.EventAlreadyCompleted/*
10+
urEventSetCallbackTest.Success/*
11+
urEventSetCallbackTest.ValidateParameters/*

‎test/conformance/integration/integration_adapter_native_cpu.match

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ QueueUSMTestWithParam.QueueUSMTest/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__IN
55
QueueUSMTestWithParam.QueueUSMTest/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__OUT_OF_ORDER_QUEUE
66
QueueBufferTestWithParam.QueueBufferTest/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__IN_ORDER_QUEUE
77
QueueBufferTestWithParam.QueueBufferTest/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}__OUT_OF_ORDER_QUEUE
8-
{{OPT}}{{Segmentation fault|Aborted}}

‎test/conformance/memory/memory_adapter_level_zero.match

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
{{NONDETERMINISTIC}}
1+
# Note: This file is only for use with cts_exe.py
22
urMemBufferPartitionTest.InvalidValueCreateType/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
33
urMemBufferPartitionTest.InvalidValueBufferCreateInfoOutOfBounds/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
44
{{OPT}}urMemGetInfoImageTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_MEM_INFO_SIZE
5-
{{OPT}}{{Segmentation fault|Aborted}}
65
{{OPT}}urMemImageCreateTestWithImageFormatParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_IMAGE_CHANNEL_ORDER_RGBA__UR_IMAGE_CHANNEL_TYPE_SNORM_INT8
76
{{OPT}}urMemImageCreateTestWithImageFormatParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_IMAGE_CHANNEL_ORDER_RGBA__UR_IMAGE_CHANNEL_TYPE_SNORM_INT16
87
{{OPT}}urMemImageCreateTestWithImageFormatParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_IMAGE_CHANNEL_ORDER_RGBA__UR_IMAGE_CHANNEL_TYPE_UNORM_INT8
@@ -14,4 +13,22 @@ urMemBufferPartitionTest.InvalidValueBufferCreateInfoOutOfBounds/Intel_R__oneAPI
1413
{{OPT}}urMemImageCreateTestWithImageFormatParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_IMAGE_CHANNEL_ORDER_RGBA__UR_IMAGE_CHANNEL_TYPE_UNSIGNED_INT16
1514
{{OPT}}urMemImageCreateTestWithImageFormatParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_IMAGE_CHANNEL_ORDER_RGBA__UR_IMAGE_CHANNEL_TYPE_UNSIGNED_INT32
1615
{{OPT}}urMemImageCreateTestWithImageFormatParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_IMAGE_CHANNEL_ORDER_RGBA__UR_IMAGE_CHANNEL_TYPE_HALF_FLOAT
17-
{{OPT}}urMemImageCreateTestWithImageFormatParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_IMAGE_CHANNEL_ORDER_RGBA__UR_IMAGE_CHANNEL_TYPE_FLOAT
16+
{{OPT}}urMemImageCreateTestWithImageFormatParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_IMAGE_CHANNEL_ORDER_RGBA__UR_IMAGE_CHANNEL_TYPE_FLOAT
17+
# These tests fail in the "Multi device testing" job, but pass in the hardware specific test
18+
{{OPT}}urMemImageCreateTest.InvalidImageDescStype/*
19+
{{OPT}}urMemImageCreateTest.InvalidSize/*
20+
{{OPT}}urMemImageCreateWithHostPtrFlagsTest.Success/*
21+
{{OPT}}urMemImageGetInfoTest.InvalidSizeSmall/*__UR_IMAGE_INFO_DEPTH
22+
{{OPT}}urMemImageGetInfoTest.InvalidSizeSmall/*__UR_IMAGE_INFO_ELEMENT_SIZE
23+
{{OPT}}urMemImageGetInfoTest.InvalidSizeSmall/*__UR_IMAGE_INFO_FORMAT
24+
{{OPT}}urMemImageGetInfoTest.InvalidSizeSmall/*__UR_IMAGE_INFO_HEIGHT
25+
{{OPT}}urMemImageGetInfoTest.InvalidSizeSmall/*__UR_IMAGE_INFO_ROW_PITCH
26+
{{OPT}}urMemImageGetInfoTest.InvalidSizeSmall/*__UR_IMAGE_INFO_SLICE_PITCH
27+
{{OPT}}urMemImageGetInfoTest.InvalidSizeSmall/*__UR_IMAGE_INFO_WIDTH
28+
{{OPT}}urMemImageGetInfoTest.Success/*__UR_IMAGE_INFO_DEPTH
29+
{{OPT}}urMemImageGetInfoTest.Success/*__UR_IMAGE_INFO_ELEMENT_SIZE
30+
{{OPT}}urMemImageGetInfoTest.Success/*__UR_IMAGE_INFO_FORMAT
31+
{{OPT}}urMemImageGetInfoTest.Success/*__UR_IMAGE_INFO_HEIGHT
32+
{{OPT}}urMemImageGetInfoTest.Success/*__UR_IMAGE_INFO_ROW_PITCH
33+
{{OPT}}urMemImageGetInfoTest.Success/*__UR_IMAGE_INFO_SLICE_PITCH
34+
{{OPT}}urMemImageGetInfoTest.Success/*__UR_IMAGE_INFO_WIDTH

‎test/conformance/program/program_adapter_native_cpu.match

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,4 +145,3 @@
145145
{{OPT}}urProgramSetSpecializationConstantsTest.InvalidValuePtr/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
146146
{{OPT}}urProgramSetMultipleSpecializationConstantsTest.MultipleCalls/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
147147
{{OPT}}urProgramSetMultipleSpecializationConstantsTest.SingleCall/SYCL_NATIVE_CPU___SYCL_Native_CPU__{{.*}}
148-
{{OPT}}{{Segmentation fault|Aborted}}

‎test/conformance/sampler/sampler_adapter_level_zero.match

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@
77
{{OPT}}urSamplerGetInfoTest.InvalidSizePropSizeSmall/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
88
{{OPT}}urSamplerReleaseTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
99
{{OPT}}urSamplerRetainTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
10-
{{OPT}}{{Segmentation fault|Aborted}}

‎test/conformance/sampler/sampler_adapter_level_zero_v2.match

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@
77
{{OPT}}urSamplerGetInfoTest.InvalidSizePropSizeSmall/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
88
{{OPT}}urSamplerReleaseTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
99
{{OPT}}urSamplerRetainTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_
10-
{{OPT}}{{Segmentation fault|Aborted}}

0 commit comments

Comments
 (0)