Remove fallback macro in tests and disable known failing L0 cases

steffenlarsen · steffenlarsen · commit ee0707bad866 · 2025-08-13T20:17:53.000-07:00
Signed-off-by: Larsen, Steffen &lt;steffen.larsen@intel.com&gt;
diff --git a/sycl/test-e2e/Assert/assert_in_kernels.cpp b/sycl/test-e2e/Assert/assert_in_kernels.cpp
@@ -5,8 +5,12 @@
 //
 // XFAIL: (opencl && gpu)
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/11364
+//
+// L0 does not currently abort after synchronizing with a failing kernel. 
+// UNSUPPORTED: level_zero
+// UNSUPPORTED-TRACKER: GSD-11097
 
-// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -Wno-error=#warnings -o %t.out
+// RUN: %{build} -o %t.out
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
 // RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
 //
diff --git a/sycl/test-e2e/Assert/assert_in_kernels_non_native.cpp b/sycl/test-e2e/Assert/assert_in_kernels_non_native.cpp
@@ -1,5 +1,9 @@
 // REQUIRES: linux && preview-breaking-changes-supported && !aspect-ext_oneapi_native_assert
 //
+// L0 does not currently abort after synchronizing with a failing kernel. 
+// UNSUPPORTED: level_zero
+// UNSUPPORTED-TRACKER: GSD-11097
+//
 // RUN: %{build} -fpreview-breaking-changes -o %t.out
 // RUN: %{run} %t.out | FileCheck %s
 //
diff --git a/sycl/test-e2e/Assert/assert_in_kernels_win.cpp b/sycl/test-e2e/Assert/assert_in_kernels_win.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: windows
-// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -Wno-error=#warnings -o %t.out
+// RUN: %{build} -o %t.out
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
 // RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
 //
diff --git a/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp b/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp
@@ -8,9 +8,10 @@
 //
 // XFAIL: (opencl && gpu)
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/11364
-
-// Test requires at least this version of the Intel GPU driver on Arc.
-// REQUIRES-INTEL-DRIVER: lin: 31294
+//
+// L0 does not currently abort after synchronizing with a failing kernel. 
+// UNSUPPORTED: level_zero
+// UNSUPPORTED-TRACKER: GSD-11097
 
 // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -Wno-error=#warnings -I %S/Inputs %S/Inputs/kernels_in_file2.cpp -o %t.out
 // RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
diff --git a/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp b/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp
@@ -9,7 +9,7 @@
 // XFAIL: (opencl && gpu)
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/11364
 
-// RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -Wno-error=#warnings -fsycl %{sycl_target_opts} -DDEFINE_NDEBUG_INFILE2 -I %S/Inputs %S/assert_in_multiple_tus.cpp %S/Inputs/kernels_in_file2.cpp -o %t.out
+// RUN: %clangxx -fsycl %{sycl_target_opts} -DDEFINE_NDEBUG_INFILE2 -I %S/Inputs %S/assert_in_multiple_tus.cpp %S/Inputs/kernels_in_file2.cpp -o %t.out
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
 // RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
 //
diff --git a/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug_win.cpp b/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug_win.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: windows
-// RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -Wno-error=#warnings -fsycl %{sycl_target_opts} -DDEFINE_NDEBUG_INFILE2 -I %S/Inputs %S/assert_in_multiple_tus.cpp %S/Inputs/kernels_in_file2.cpp -o %t.out
+// RUN: %clangxx -fsycl %{sycl_target_opts} -DDEFINE_NDEBUG_INFILE2 -I %S/Inputs %S/assert_in_multiple_tus.cpp %S/Inputs/kernels_in_file2.cpp -o %t.out
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
 // RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
 //
diff --git a/sycl/test-e2e/Assert/assert_in_multiple_tus_win.cpp b/sycl/test-e2e/Assert/assert_in_multiple_tus_win.cpp
@@ -1,5 +1,10 @@
 // REQUIRES: windows
-// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -Wno-error=#warnings -I %S/Inputs %S/Inputs/kernels_in_file2.cpp -o %t.out
+//
+// L0 does not currently abort after synchronizing with a failing kernel. 
+// UNSUPPORTED: level_zero
+// UNSUPPORTED-TRACKER: GSD-11097
+//
+// RUN: %{build} -I %S/Inputs %S/Inputs/kernels_in_file2.cpp -o %t.out
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
 // RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
 //
diff --git a/sycl/test-e2e/Assert/assert_in_one_kernel.cpp b/sycl/test-e2e/Assert/assert_in_one_kernel.cpp
@@ -6,7 +6,7 @@
 // XFAIL: (opencl && gpu)
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/11364
 
-// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -Wno-error=#warnings -o %t.out
+// RUN: %{build} -o %t.out
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
 // RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
 //
diff --git a/sycl/test-e2e/Assert/assert_in_one_kernel_win.cpp b/sycl/test-e2e/Assert/assert_in_one_kernel_win.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: windows
-// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -Wno-error=#warnings -o %t.out
+// RUN: %{build} -o %t.out
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
 // RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
 //
diff --git a/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp b/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp
@@ -1,7 +1,7 @@
 // REQUIRES: linux
 // FIXME: Flaky on HIP and cuda
 // UNSUPPORTED: hip || cuda
-// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -Wno-error=#warnings -o %t.out %threads_lib
+// RUN: %{build} -o %t.out %threads_lib
 //
 // XFAIL: (opencl && gpu)
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/11364
diff --git a/sycl/test-e2e/Assert/assert_in_simultaneous_kernels_win.cpp b/sycl/test-e2e/Assert/assert_in_simultaneous_kernels_win.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: windows
-// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -Wno-error=#warnings -o %t.out %threads_lib
+// RUN: %{build} -o %t.out %threads_lib
 //
 // Since this is a multi-threaded application enable memory tracking and
 // deferred release feature in the Level Zero adapter to avoid releasing memory
diff --git a/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp b/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp
@@ -4,7 +4,7 @@
 // XFAIL: (opencl && gpu)
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/11364
 //
-// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -Wno-error=#warnings -I %S/Inputs %S/Inputs/kernels_in_file2.cpp -o %t.out %threads_lib
+// RUN: %{build} -I %S/Inputs %S/Inputs/kernels_in_file2.cpp -o %t.out %threads_lib
 //
 // Since this is a multi-threaded application enable memory tracking and
 // deferred release feature in the Level Zero adapter to avoid releasing memory
diff --git a/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp b/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp
@@ -5,7 +5,7 @@
 // XFAIL: (opencl && gpu)
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/11364
 //
-// RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -Wno-error=#warnings -fsycl %{sycl_target_opts} -DDEFINE_NDEBUG_INFILE2 -I %S/Inputs %S/assert_in_simultaneously_multiple_tus.cpp %S/Inputs/kernels_in_file2.cpp -o %t.out %threads_lib
+// RUN: %clangxx -fsycl %{sycl_target_opts} -DDEFINE_NDEBUG_INFILE2 -I %S/Inputs %S/assert_in_simultaneously_multiple_tus.cpp %S/Inputs/kernels_in_file2.cpp -o %t.out %threads_lib
 // RUN: %if cpu %{ %{run} %t.out &> %t.cpu.txt ; FileCheck %s --input-file %t.cpu.txt %}
 //
 // Since this is a multi-threaded application enable memory tracking and
diff --git a/sycl/test-e2e/DeviceLib/assert-aot.cpp b/sycl/test-e2e/DeviceLib/assert-aot.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: opencl-aot, cpu, linux
 
 // CPU AOT targets host isa, so we compile on the run system instead.
-// RUN: %{run-aux} %clangxx -DSYCL_FALLBACK_ASSERT=1 -Wno-error=#warnings -fsycl -fsycl-targets=spir64_x86_64 %S/assert.cpp -o %t.aot.out
+// RUN: %{run-aux} %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/assert.cpp -o %t.aot.out
 // RUN: env EXPECTED_SIGNAL=SIGABRT SHOULD_CRASH=1 %{run} %t.aot.out 2>&1 | FileCheck %S/assert.cpp --check-prefixes=CHECK-MESSAGE
diff --git a/sycl/test-e2e/DeviceLib/assert-windows.cpp b/sycl/test-e2e/DeviceLib/assert-windows.cpp
@@ -2,7 +2,7 @@
 // XFAIL: opencl && gpu
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/11364
 //
-// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -Wno-error=#warnings -o %t.out
+// RUN: %{build} -o %t.out
 //
 // RUN: not env SHOULD_CRASH=1 SYCL_DEVICELIB_INHIBIT_NATIVE=1 CL_CONFIG_USE_VECTORIZER=False \
 // RUN: %{run} %t.out 2>&1 >/dev/null | FileCheck %s --check-prefix=CHECK-MESSAGE
diff --git a/sycl/test-e2e/DeviceLib/assert.cpp b/sycl/test-e2e/DeviceLib/assert.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: (cpu || cuda || hip ) && linux
-// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -Wno-error=#warnings -o %t.out
+// RUN: %{build} -o %t.out
 // (see the other RUN lines below; it is a bit complicated)
 //
 // assert() call in device code guarantees nothing: on some devices it behaves
diff --git a/sycl/test-e2e/ESIMD/assert.cpp b/sycl/test-e2e/ESIMD/assert.cpp
@@ -1,7 +1,7 @@
 // REQUIRES-INTEL-DRIVER: lin: 26816, win: 101.4576
 // REQUIRES: linux && level_zero
 
-// RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -Wno-error=#warnings -o %t.out
+// RUN: %{build} -o %t.out
 // RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // The test still fails after GPU driver update on Linux. Temporary marking it
