Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions sycl/test-e2e/Assert/assert_in_kernels.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
20 changes: 0 additions & 20 deletions sycl/test-e2e/Assert/assert_in_kernels_non_native.cpp

This file was deleted.

6 changes: 1 addition & 5 deletions sycl/test-e2e/Assert/assert_in_kernels_win.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"
6 changes: 1 addition & 5 deletions sycl/test-e2e/Assert/assert_in_multiple_tus.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,13 @@
// 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.
// CHECK: {{.*}}kernels_in_file2.cpp:15: int calculus(int): {{global id: \[5|block: \[1}},0,0], {{local id|thread}}: [1,0,0]
// 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"
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.
6 changes: 1 addition & 5 deletions sycl/test-e2e/Assert/assert_in_multiple_tus_win.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
// 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.
// CHECK: {{.*}}kernels_in_file2.cpp:15: {{<unknown func>|\(null\)}}: {{.*}} [5,0,0], {{.*}} [1,0,0]
// 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"
6 changes: 1 addition & 5 deletions sycl/test-e2e/Assert/assert_in_one_kernel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 1 addition & 5 deletions sycl/test-e2e/Assert/assert_in_one_kernel_win.cpp
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 1 addition & 5 deletions sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.