From e3ac869fe6d532632ba156f8eb72b8114daa486f Mon Sep 17 00:00:00 2001
From: jinge90 <ge.jin@intel.com>
Date: Wed, 17 Sep 2025 11:47:36 +0800
Subject: [PATCH] [SYCL] Remove fpga related Assert tests

Signed-off-by: jinge90 <ge.jin@intel.com>
---
 sycl/test-e2e/Assert/assert_in_kernels.cpp    |  6 +-----
 .../Assert/assert_in_kernels_non_native.cpp   | 20 -------------------
 .../test-e2e/Assert/assert_in_kernels_win.cpp |  6 +-----
 .../Assert/assert_in_multiple_tus.cpp         |  6 +-----
 .../assert_in_multiple_tus_one_ndebug.cpp     |  6 +-----
 .../assert_in_multiple_tus_one_ndebug_win.cpp |  6 +-----
 .../Assert/assert_in_multiple_tus_win.cpp     |  6 +-----
 sycl/test-e2e/Assert/assert_in_one_kernel.cpp |  6 +-----
 .../Assert/assert_in_one_kernel_win.cpp       |  6 +-----
 .../Assert/assert_in_simultaneous_kernels.cpp |  6 +-----
 .../assert_in_simultaneous_kernels_win.cpp    |  6 +-----
 .../assert_in_simultaneously_multiple_tus.cpp |  6 +-----
 ...simultaneously_multiple_tus_one_ndebug.cpp |  5 -----
 13 files changed, 11 insertions(+), 80 deletions(-)
 delete mode 100644 sycl/test-e2e/Assert/assert_in_kernels_non_native.cpp

diff --git a/sycl/test-e2e/Assert/assert_in_kernels.cpp b/sycl/test-e2e/Assert/assert_in_kernels.cpp
index f57060c949563..c20ca539a2eb8 100644
--- a/sycl/test-e2e/Assert/assert_in_kernels.cpp
+++ b/sycl/test-e2e/Assert/assert_in_kernels.cpp
@@ -11,16 +11,12 @@
 // UNSUPPORTED-TRACKER: GSD-11097
 
 // 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 %}
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CHECK-NOT:  One shouldn't see this message
 // CHECK:      {{.*}}assert_in_kernels.hpp:27: void kernelFunc2(int *, int): {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
 // CHECK-SAME: Assertion `Buf[wiID] == 0 && "from assert statement"` failed
 // CHECK-NOT:  test aborts earlier, one shouldn't see this message
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_kernels.hpp:27: void kernelFunc2(int *, int): {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
-// CHECK-ACC: The test ended.
 
 #include "assert_in_kernels.hpp"
diff --git a/sycl/test-e2e/Assert/assert_in_kernels_non_native.cpp b/sycl/test-e2e/Assert/assert_in_kernels_non_native.cpp
deleted file mode 100644
index 5cb606166f1b7..0000000000000
--- a/sycl/test-e2e/Assert/assert_in_kernels_non_native.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// REQUIRES: linux && !aspect-ext_oneapi_native_assert
-//
-// Intel OpenCL GPU drivers do not currently report cl_intel_devicelib_assert
-// despite supporting assertions.
-// UNSUPPORTED: opencl && gpu
-// UNSUPPORTED-TRACKER: GSD-11496
-//
-// RUN: %{build} -o %t.out
-// RUN: %{run} %t.out | FileCheck %s
-//
-// CHECK-NOT: One shouldn't see this message
-// CHECK-NOT: {{.*}}assert_in_kernels.hpp:27: void kernelFunc2(int *, int): {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
-// CHECK-NOT: Assertion `Buf[wiID] == 0 && "from assert statement"` failed
-// CHECK-NOT: test aborts earlier, one shouldn't see this message
-// CHECK: The test ended.
-//
-// This test checks that devices that do not support native asserts will simply
-// skip assertions.
-
-#include "assert_in_kernels.hpp"
diff --git a/sycl/test-e2e/Assert/assert_in_kernels_win.cpp b/sycl/test-e2e/Assert/assert_in_kernels_win.cpp
index 4505959b4d840..c78cc6ddf5f7a 100644
--- a/sycl/test-e2e/Assert/assert_in_kernels_win.cpp
+++ b/sycl/test-e2e/Assert/assert_in_kernels_win.cpp
@@ -1,7 +1,6 @@
 // REQUIRES: windows
 // 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 %}
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CHECK-NOT:  One shouldn't see this message
 // FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
@@ -10,8 +9,5 @@
 // CHECK-SAME: Assertion `Buf[wiID] == 0 && "from assert statement"` failed.
 // CHECK-NOT:  test aborts earlier, one shouldn't see this message
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_kernels.hpp:27: {{<unknown func>|\(null\)}}: {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
-// CHECK-ACC: The test ended.
 
 #include "assert_in_kernels.hpp"
diff --git a/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp b/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp
index 3264d9ae3796f..fc805362aa62e 100644
--- a/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp
+++ b/sycl/test-e2e/Assert/assert_in_multiple_tus.cpp
@@ -14,8 +14,7 @@
 // UNSUPPORTED-TRACKER: GSD-11097
 
 // RUN: %{build} -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 %}
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CUDA uses block/thread vs global/local id for SYCL, also it shows the
 // position of a thread within the block, not the absolute ID.
@@ -23,8 +22,5 @@
 // CHECK-SAME: Assertion `X && "this message from calculus"` failed
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}kernels_in_file2.cpp:15: int calculus(int): global id: [5,0,0], local id: [1,0,0]
-// CHECK-ACC: The test ended.
 
 #include "assert_in_multiple_tus.hpp"
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
index 846564a5c9df1..4b912332c25de 100644
--- a/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp
+++ b/sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp
@@ -10,8 +10,7 @@
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/11364
 
 // 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 %}
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CHECK-NOT:  this message from calculus
 // CUDA uses block/thread vs global/local id for SYCL, also it shows the
@@ -20,6 +19,3 @@
 // CHECK-SAME: {{.*}} [1,0,0] Assertion `X && "Nil in result"` failed
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_multiple_tus.hpp:23: int checkFunction(): {{.*}}
-// CHECK-ACC: The test ended.
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
index 67a307b85bdc3..92df74003e139 100644
--- 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,7 +1,6 @@
 // REQUIRES: windows
 // 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 %}
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CHECK-NOT:  this message from calculus
 // FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
@@ -10,6 +9,3 @@
 // CHECK-SAME: {{.*}} [1,0,0] Assertion `X && "Nil in result"` failed.
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_multiple_tus.hpp:23: {{<unknown func>|\(null\)}}: {{.*}} [5,0,0],
-// CHECK-ACC: The test ended.
diff --git a/sycl/test-e2e/Assert/assert_in_multiple_tus_win.cpp b/sycl/test-e2e/Assert/assert_in_multiple_tus_win.cpp
index 342013d7322d6..ce30d79cf85e7 100644
--- a/sycl/test-e2e/Assert/assert_in_multiple_tus_win.cpp
+++ b/sycl/test-e2e/Assert/assert_in_multiple_tus_win.cpp
@@ -5,8 +5,7 @@
 // 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 %}
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
 // while for some insane reason.
@@ -14,8 +13,5 @@
 // CHECK-SAME: Assertion `X && "this message from calculus"` failed.
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}kernels_in_file2.cpp:15: {{<unknown func>|\(null\)}}: {{.*}} [5,0,0], {{.*}} [1,0,0]
-// CHECK-ACC: The test ended.
 
 #include "assert_in_multiple_tus.hpp"
diff --git a/sycl/test-e2e/Assert/assert_in_one_kernel.cpp b/sycl/test-e2e/Assert/assert_in_one_kernel.cpp
index 6c8bd0e526f67..6aa3bdf66b7bf 100644
--- a/sycl/test-e2e/Assert/assert_in_one_kernel.cpp
+++ b/sycl/test-e2e/Assert/assert_in_one_kernel.cpp
@@ -7,14 +7,10 @@
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/11364
 
 // 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 %}
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CHECK:      {{.*}}assert_in_one_kernel.hpp:12: void kernelFunc(int *, int): {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0]
 // CHECK-SAME: Assertion `Buf[wiID] != 0 && "from assert statement"` failed
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_one_kernel.hpp:12: void kernelFunc(int *, int): {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0]
-// CHECK-ACC: The test ended.
 
 #include "assert_in_one_kernel.hpp"
diff --git a/sycl/test-e2e/Assert/assert_in_one_kernel_win.cpp b/sycl/test-e2e/Assert/assert_in_one_kernel_win.cpp
index 6c8cea029c17f..493cf250f2145 100644
--- a/sycl/test-e2e/Assert/assert_in_one_kernel_win.cpp
+++ b/sycl/test-e2e/Assert/assert_in_one_kernel_win.cpp
@@ -1,15 +1,11 @@
 // REQUIRES: windows
 // 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 %}
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
 // while for some insane reason.
 // CHECK:      {{.*}}assert_in_one_kernel.hpp:12: {{<unknown func>|\(null\)}}: {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0]
 // CHECK-SAME: Assertion `Buf[wiID] != 0 && "from assert statement"` failed.
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_one_kernel.hpp:12: {{<unknown func>|\(null\)}}: {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0]
-// CHECK-ACC:  The test ended.
 
 #include "assert_in_one_kernel.hpp"
diff --git a/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp b/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp
index 0a4760c36f60a..3e997347b77df 100644
--- a/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp
+++ b/sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp
@@ -16,14 +16,10 @@
 //
 // DEFINE: %{gpu_env} = env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1
 
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CHECK:      {{.*}}assert_in_simultaneous_kernels.hpp:16: void assertFunc(): {{.*}}[9,7,0], {{.*}}[0,0,0]
 // CHECK-SAME: Assertion `false && "from assert statement"` failed
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_simultaneous_kernels.hpp:16: void assertFunc(): {{.*}} [9,7,0], {{.*}} [0,0,0]
-// CHECK-ACC: The test ended.
 
 #include "assert_in_simultaneous_kernels.hpp"
diff --git a/sycl/test-e2e/Assert/assert_in_simultaneous_kernels_win.cpp b/sycl/test-e2e/Assert/assert_in_simultaneous_kernels_win.cpp
index 66a4075e776ba..c1141688de451 100644
--- a/sycl/test-e2e/Assert/assert_in_simultaneous_kernels_win.cpp
+++ b/sycl/test-e2e/Assert/assert_in_simultaneous_kernels_win.cpp
@@ -9,16 +9,12 @@
 //
 // DEFINE: %{gpu_env} = env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1
 
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
 // while for some insane reason.
 // CHECK:      {{.*}}assert_in_simultaneous_kernels.hpp:16: {{<unknown func>|\(null\)}}: global id: [9,7,0], local id: [0,0,0]
 // CHECK-SAME: Assertion `false && "from assert statement"` failed.
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_simultaneous_kernels.hpp:16: {{<unknown func>|\(null\)}}: global id: [9,7,0], local id: [0,0,0]
-// CHECK-ACC:  The test ended.
 
 #include "assert_in_simultaneous_kernels.hpp"
diff --git a/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp b/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp
index 0d123971ebff3..cf24f41034493 100644
--- a/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp
+++ b/sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp
@@ -16,14 +16,10 @@
 //
 // DEFINE: %{gpu_env} = env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1
 
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CHECK:      {{this message from file1|this message from file2}}
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{this message from file1|this message from file2}}
-// CHECK-ACC: The test ended.
 
 #include "Inputs/kernels_in_file2.hpp"
 #include <cstdio>
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
index 3f7159fa0f7da..5a736d184fd87 100644
--- 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
@@ -19,11 +19,6 @@
 // DEFINE: %{gpu_env} = env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1
 // RUN: %if gpu %{ %{gpu_env} %{run} %t.out &> %t.gpu.txt ; FileCheck %s --input-file %t.gpu.txt %}
 
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %if acc %{ %{run} %t.out &> %t.acc.txt ; FileCheck %s --check-prefix=CHECK-ACC --input-file %t.acc.txt %}
-//
 // CHECK:      this message from file1
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC: The test ended.