Skip to content

Commit cf994bf

Browse files
authored
[SYCL][E2E] Remove --crash flag from usages of not (#18596)
run-only mode now uses the internal lit shell, so the `--crash` flag is no longer needed in these tests.
1 parent 3fb8552 commit cf994bf

File tree

6 files changed

+17
-29
lines changed

6 files changed

+17
-29
lines changed

sycl/test-e2e/AddressSanitizer/common/print-build-log.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// REQUIRES: linux, cpu || (gpu && level_zero)
33
// RUN: %{build} %device_asan_flags -DGPU -o %t_gpu.out
44
// RUN: %{build} %device_asan_flags -o %t.out
5-
// RUN: %{run} not --crash %if gpu %{ %t_gpu.out %} %else %{ %t.out %} 2>&1 | FileCheck %s
5+
// RUN: %{run} not %if gpu %{ %t_gpu.out %} %else %{ %t.out %} 2>&1 | FileCheck %s
66

77
#include <iostream>
88
#include <sycl/detail/core.hpp>

sycl/test-e2e/AddressSanitizer/out-of-bounds/DeviceGlobal/device_global.cpp

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,13 @@
44
// sycl-toolchain is built with assertions enabled, then we hit one at
55
// `DeviceGlobalUSMMem::~DeviceGlobalUSMMem()` and exit with abort. If not, then
66
// sanitizer does `exit(1)`.
7-
//
8-
// That doesn't matter as long as LIT does *not* use "external shell", but when
9-
// it does, the difference between `not` and `not --crash` becomes crucial and
10-
// we cannot have a single command that would match both behaviors. Ideally,
11-
// we'd need to make a choice based on how the toolchain was built.
12-
// Unfortunately, we don't have that information at the LIT level and
13-
// propagating it all the way down to it would be ugly. Instead, rely on the
14-
// fact that "no-assertion" mode doesn't use "run-only" lit invocations and make
15-
// a choice based on that. This is rather fragile but workarounds the issue for
16-
// the time being.
17-
18-
// DEFINE: %{not} = not %if run-mode && !build-mode %{ --crash %}
197

208
// RUN: %{build} %device_asan_flags -O0 -g -o %t1.out
21-
// RUN: %{run} %{not} %t1.out 2>&1 | FileCheck %s
9+
// RUN: %{run} not %t1.out 2>&1 | FileCheck %s
2210
// RUN: %{build} %device_asan_flags -O1 -g -o %t2.out
23-
// RUN: %{run} %{not} %t2.out 2>&1 | FileCheck %s
11+
// RUN: %{run} not %t2.out 2>&1 | FileCheck %s
2412
// RUN: %{build} %device_asan_flags -O2 -g -o %t3.out
25-
// RUN: %{run} %{not} %t3.out 2>&1 | FileCheck %s
13+
// RUN: %{run} not %t3.out 2>&1 | FileCheck %s
2614

2715
// Flakily timesout on PVC
2816
// UNSUPPORTED: arch-intel_gpu_pvc
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11

22
// RUN: %clangxx -fsycl %{sycl_target_opts} %S/Inputs/trivial.cpp -o %t.out
3-
// RUN: not --crash env ONEAPI_DEVICE_SELECTOR="macaroni:*" %{run-unfiltered-devices} %t.out
4-
// RUN: not --crash env ONEAPI_DEVICE_SELECTOR=":" %{run-unfiltered-devices} %t.out
5-
// RUN: not --crash env ONEAPI_DEVICE_SELECTOR="level_zero:." %{run-unfiltered-devices} %t.out
6-
// RUN: not --crash env ONEAPI_DEVICE_SELECTOR="macaroni_level_zero:." %{run-unfiltered-devices} %t.out
7-
// RUN: not --crash env ONEAPI_DEVICE_SELECTOR="level_zero:macaroni_gpu" %{run-unfiltered-devices} %t.out
8-
// RUN: not --crash env ONEAPI_DEVICE_SELECTOR="level_zero:0..0" %{run-unfiltered-devices} %t.out
9-
// RUN: not --crash env ONEAPI_DEVICE_SELECTOR="level_zero:" %{run-unfiltered-devices} %t.out
10-
// RUN: not --crash env ONEAPI_DEVICE_SELECTOR="level_zero:::gpu" %{run-unfiltered-devices} %t.out
11-
// RUN: not --crash env ONEAPI_DEVICE_SELECTOR="level_zero:.1" %{run-unfiltered-devices} %t.out
12-
// RUN: not --crash env ONEAPI_DEVICE_SELECTOR="" %{run-unfiltered-devices} %t.out
3+
// RUN: not env ONEAPI_DEVICE_SELECTOR="macaroni:*" %{run-unfiltered-devices} %t.out
4+
// RUN: not env ONEAPI_DEVICE_SELECTOR=":" %{run-unfiltered-devices} %t.out
5+
// RUN: not env ONEAPI_DEVICE_SELECTOR="level_zero:." %{run-unfiltered-devices} %t.out
6+
// RUN: not env ONEAPI_DEVICE_SELECTOR="macaroni_level_zero:." %{run-unfiltered-devices} %t.out
7+
// RUN: not env ONEAPI_DEVICE_SELECTOR="level_zero:macaroni_gpu" %{run-unfiltered-devices} %t.out
8+
// RUN: not env ONEAPI_DEVICE_SELECTOR="level_zero:0..0" %{run-unfiltered-devices} %t.out
9+
// RUN: not env ONEAPI_DEVICE_SELECTOR="level_zero:" %{run-unfiltered-devices} %t.out
10+
// RUN: not env ONEAPI_DEVICE_SELECTOR="level_zero:::gpu" %{run-unfiltered-devices} %t.out
11+
// RUN: not env ONEAPI_DEVICE_SELECTOR="level_zero:.1" %{run-unfiltered-devices} %t.out
12+
// RUN: not env ONEAPI_DEVICE_SELECTOR="" %{run-unfiltered-devices} %t.out
1313

1414
// Calling ONEAPI_DEVICE_SELECTOR with an illegal input should result in an
1515
// error.

sycl/test-e2e/Tracing/usm/queue_copy_released_pointer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// UNSUPPORTED: windows || hip
22
// RUN: %{build} -o %t.out
3-
// RUN: not --crash env SYCL_TRACE_TERMINATE_ON_WARNING=1 %{run} sycl-trace --verify %t.out | FileCheck %s
3+
// RUN: not env SYCL_TRACE_TERMINATE_ON_WARNING=1 %{run} sycl-trace --verify %t.out | FileCheck %s
44

55
// Test parameter analysis of USM function
66

sycl/test-e2e/Tracing/usm/queue_single_task_nullptr.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// UNSUPPORTED: windows || target-amd
22
// RUN: %{build} -o %t.out
3-
// RUN: not --crash env SYCL_TRACE_TERMINATE_ON_WARNING=1 %{run} sycl-trace --verify %t.out | FileCheck %s
3+
// RUN: not env SYCL_TRACE_TERMINATE_ON_WARNING=1 %{run} sycl-trace --verify %t.out | FileCheck %s
44

55
// Test parameter analysis of USM usage
66

sycl/test-e2e/Tracing/usm/queue_single_task_released_pointer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// UNSUPPORTED: windows || hip
22
// RUN: %{build} -o %t.out
3-
// RUN: not --crash env SYCL_TRACE_TERMINATE_ON_WARNING=1 %{run} sycl-trace --verify %t.out | FileCheck %s
3+
// RUN: not env SYCL_TRACE_TERMINATE_ON_WARNING=1 %{run} sycl-trace --verify %t.out | FileCheck %s
44

55
// Test parameter analysis of USM usage
66

0 commit comments

Comments
 (0)