Skip to content

Commit ad08ff2

Browse files
jinge90jinge90
authored
[SYCL] Remove fpga related Assert tests (#20108)
Signed-off-by: jinge90 <[email protected]>
1 parent 9375f35 commit ad08ff2

13 files changed

+11
-80
lines changed

‎sycl/test-e2e/Assert/assert_in_kernels.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,12 @@
1111
// UNSUPPORTED-TRACKER: GSD-11097
1212

1313
// RUN: %{build} -o %t.out
14-
// Shouldn't fail on ACC as fallback assert isn't enqueued there
15-
// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
14+
// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
1615
//
1716
// CHECK-NOT: One shouldn't see this message
1817
// CHECK: {{.*}}assert_in_kernels.hpp:27: void kernelFunc2(int *, int): {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
1918
// CHECK-SAME: Assertion `Buf[wiID] == 0 && "from assert statement"` failed
2019
// CHECK-NOT: test aborts earlier, one shouldn't see this message
2120
// CHECK-NOT: The test ended.
22-
//
23-
// CHECK-ACC-NOT: {{.*}}assert_in_kernels.hpp:27: void kernelFunc2(int *, int): {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
24-
// CHECK-ACC: The test ended.
2521

2622
#include "assert_in_kernels.hpp"

‎sycl/test-e2e/Assert/assert_in_kernels_non_native.cpp‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎sycl/test-e2e/Assert/assert_in_kernels_win.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// REQUIRES: windows
22
// RUN: %{build} -o %t.out
3-
// Shouldn't fail on ACC as fallback assert isn't enqueued there
4-
// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
3+
// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
54
//
65
// CHECK-NOT: One shouldn't see this message
76
// FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
@@ -10,8 +9,5 @@
109
// CHECK-SAME: Assertion `Buf[wiID] == 0 && "from assert statement"` failed.
1110
// CHECK-NOT: test aborts earlier, one shouldn't see this message
1211
// CHECK-NOT: The test ended.
13-
//
14-
// CHECK-ACC-NOT: {{.*}}assert_in_kernels.hpp:27: {{<unknown func>|\(null\)}}: {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
15-
// CHECK-ACC: The test ended.
1612

1713
#include "assert_in_kernels.hpp"

‎sycl/test-e2e/Assert/assert_in_multiple_tus.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,13 @@
1414
// UNSUPPORTED-TRACKER: GSD-11097
1515

1616
// RUN: %{build} -I %S/Inputs %S/Inputs/kernels_in_file2.cpp -o %t.out
17-
// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
18-
// Shouldn't fail on ACC as fallback assert isn't enqueued there
17+
// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
1918
//
2019
// CUDA uses block/thread vs global/local id for SYCL, also it shows the
2120
// position of a thread within the block, not the absolute ID.
2221
// CHECK: {{.*}}kernels_in_file2.cpp:15: int calculus(int): {{global id: \[5|block: \[1}},0,0], {{local id|thread}}: [1,0,0]
2322
// CHECK-SAME: Assertion `X && "this message from calculus"` failed
2423
// CHECK-NOT: this message from file2
2524
// CHECK-NOT: The test ended.
26-
//
27-
// CHECK-ACC-NOT: {{.*}}kernels_in_file2.cpp:15: int calculus(int): global id: [5,0,0], local id: [1,0,0]
28-
// CHECK-ACC: The test ended.
2925

3026
#include "assert_in_multiple_tus.hpp"

‎sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/11364
1111

1212
// 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
13-
// Shouldn't fail on ACC as fallback assert isn't enqueued there
14-
// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
13+
// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
1514
//
1615
// CHECK-NOT: this message from calculus
1716
// CUDA uses block/thread vs global/local id for SYCL, also it shows the
@@ -20,6 +19,3 @@
2019
// CHECK-SAME: {{.*}} [1,0,0] Assertion `X && "Nil in result"` failed
2120
// CHECK-NOT: this message from file2
2221
// CHECK-NOT: The test ended.
23-
//
24-
// CHECK-ACC-NOT: {{.*}}assert_in_multiple_tus.hpp:23: int checkFunction(): {{.*}}
25-
// CHECK-ACC: The test ended.

‎sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug_win.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// REQUIRES: windows
22
// 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
3-
// Shouldn't fail on ACC as fallback assert isn't enqueued there
4-
// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
3+
// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
54
//
65
// CHECK-NOT: this message from calculus
76
// FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
@@ -10,6 +9,3 @@
109
// CHECK-SAME: {{.*}} [1,0,0] Assertion `X && "Nil in result"` failed.
1110
// CHECK-NOT: this message from file2
1211
// CHECK-NOT: The test ended.
13-
//
14-
// CHECK-ACC-NOT: {{.*}}assert_in_multiple_tus.hpp:23: {{<unknown func>|\(null\)}}: {{.*}} [5,0,0],
15-
// CHECK-ACC: The test ended.

‎sycl/test-e2e/Assert/assert_in_multiple_tus_win.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,13 @@
55
// UNSUPPORTED-TRACKER: GSD-11097
66
//
77
// RUN: %{build} -I %S/Inputs %S/Inputs/kernels_in_file2.cpp -o %t.out
8-
// Shouldn't fail on ACC as fallback assert isn't enqueued there
9-
// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
8+
// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
109
//
1110
// FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
1211
// while for some insane reason.
1312
// CHECK: {{.*}}kernels_in_file2.cpp:15: {{<unknown func>|\(null\)}}: {{.*}} [5,0,0], {{.*}} [1,0,0]
1413
// CHECK-SAME: Assertion `X && "this message from calculus"` failed.
1514
// CHECK-NOT: this message from file2
1615
// CHECK-NOT: The test ended.
17-
//
18-
// CHECK-ACC-NOT: {{.*}}kernels_in_file2.cpp:15: {{<unknown func>|\(null\)}}: {{.*}} [5,0,0], {{.*}} [1,0,0]
19-
// CHECK-ACC: The test ended.
2016

2117
#include "assert_in_multiple_tus.hpp"

‎sycl/test-e2e/Assert/assert_in_one_kernel.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,10 @@
77
// XFAIL-TRACKER: https://github.com/intel/llvm/issues/11364
88

99
// RUN: %{build} -o %t.out
10-
// Shouldn't fail on ACC as fallback assert isn't enqueued there
11-
// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
10+
// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
1211
//
1312
// CHECK: {{.*}}assert_in_one_kernel.hpp:12: void kernelFunc(int *, int): {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0]
1413
// CHECK-SAME: Assertion `Buf[wiID] != 0 && "from assert statement"` failed
1514
// CHECK-NOT: The test ended.
16-
//
17-
// CHECK-ACC-NOT: {{.*}}assert_in_one_kernel.hpp:12: void kernelFunc(int *, int): {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0]
18-
// CHECK-ACC: The test ended.
1915

2016
#include "assert_in_one_kernel.hpp"

‎sycl/test-e2e/Assert/assert_in_one_kernel_win.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
// REQUIRES: windows
22
// RUN: %{build} -o %t.out
3-
// Shouldn't fail on ACC as fallback assert isn't enqueued there
4-
// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
3+
// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
54
//
65
// FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
76
// while for some insane reason.
87
// CHECK: {{.*}}assert_in_one_kernel.hpp:12: {{<unknown func>|\(null\)}}: {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0]
98
// CHECK-SAME: Assertion `Buf[wiID] != 0 && "from assert statement"` failed.
109
// CHECK-NOT: The test ended.
11-
//
12-
// CHECK-ACC-NOT: {{.*}}assert_in_one_kernel.hpp:12: {{<unknown func>|\(null\)}}: {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0]
13-
// CHECK-ACC: The test ended.
1410

1511
#include "assert_in_one_kernel.hpp"

‎sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,10 @@
1616
//
1717
// DEFINE: %{gpu_env} = env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1
1818

19-
// Shouldn't fail on ACC as fallback assert isn't enqueued there
20-
// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
19+
// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
2120
//
2221
// CHECK: {{.*}}assert_in_simultaneous_kernels.hpp:16: void assertFunc(): {{.*}}[9,7,0], {{.*}}[0,0,0]
2322
// CHECK-SAME: Assertion `false && "from assert statement"` failed
2423
// CHECK-NOT: The test ended.
25-
//
26-
// CHECK-ACC-NOT: {{.*}}assert_in_simultaneous_kernels.hpp:16: void assertFunc(): {{.*}} [9,7,0], {{.*}} [0,0,0]
27-
// CHECK-ACC: The test ended.
2824

2925
#include "assert_in_simultaneous_kernels.hpp"

0 commit comments

Comments
 (0)