diff --git a/SYCL/Assert/assert_in_kernels.cpp b/SYCL/Assert/assert_in_kernels.cpp index 675411f314..16dd6be138 100644 --- a/SYCL/Assert/assert_in_kernels.cpp +++ b/SYCL/Assert/assert_in_kernels.cpp @@ -1,12 +1,12 @@ // REQUIRES: linux // RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.txt || true -// RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt -// RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true -// RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt +// RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.cpu.txt || true +// RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.cpu.txt +// RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.gpu.txt || true +// RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.gpu.txt // Shouldn't fail on ACC as fallback assert isn't enqueued there -// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt -// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.txt +// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.acc.txt +// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.acc.txt // // CHECK-NOT: One shouldn't see this message // CHECK: {{.*}}assert_in_kernels.hpp:25: void kernelFunc2(int *, int): {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0] diff --git a/SYCL/Assert/assert_in_multiple_tus.cpp b/SYCL/Assert/assert_in_multiple_tus.cpp index 275ee960e0..d47c95a43b 100644 --- a/SYCL/Assert/assert_in_multiple_tus.cpp +++ b/SYCL/Assert/assert_in_multiple_tus.cpp @@ -1,12 +1,12 @@ // REQUIRES: linux // RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl -fsycl-targets=%sycl_triple -I %S/Inputs %s %S/Inputs/kernels_in_file2.cpp -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.txt || true -// RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt -// RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true -// RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt +// RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.cpu.txt || true +// RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.cpu.txt +// RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.gpu.txt || true +// RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.gpu.txt // Shouldn't fail on ACC as fallback assert isn't enqueued there -// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt -// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.txt +// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.acc.txt +// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.acc.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. diff --git a/SYCL/Assert/assert_in_multiple_tus_one_ndebug.cpp b/SYCL/Assert/assert_in_multiple_tus_one_ndebug.cpp index 5984cad082..bfee5e0e9e 100644 --- a/SYCL/Assert/assert_in_multiple_tus_one_ndebug.cpp +++ b/SYCL/Assert/assert_in_multiple_tus_one_ndebug.cpp @@ -1,12 +1,12 @@ // REQUIRES: linux // RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl -fsycl-targets=%sycl_triple -DDEFINE_NDEBUG_INFILE2 -I %S/Inputs %S/assert_in_multiple_tus.cpp %S/Inputs/kernels_in_file2.cpp -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.txt || true -// RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt -// RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true -// RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt +// RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.cpu.txt || true +// RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.cpu.txt +// RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.gpu.txt || true +// RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.gpu.txt // Shouldn't fail on ACC as fallback assert isn't enqueued there -// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt -// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.txt +// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.acc.txt +// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.acc.txt // // CHECK-NOT: this message from calculus // CUDA uses block/thread vs global/local id for SYCL, also it shows the diff --git a/SYCL/Assert/assert_in_one_kernel.cpp b/SYCL/Assert/assert_in_one_kernel.cpp index fb9b111894..ea5fb74c34 100644 --- a/SYCL/Assert/assert_in_one_kernel.cpp +++ b/SYCL/Assert/assert_in_one_kernel.cpp @@ -1,12 +1,12 @@ // REQUIRES: linux // RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.txt || true -// RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt -// RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true -// RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt +// RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.cpu.txt || true +// RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.cpu.txt +// RUN: %GPU_RUN_PLACEHOLDER %t.out &> %t.gpu.txt || true +// RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.gpu.txt // Shouldn't fail on ACC as fallback assert isn't enqueued there -// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt -// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.txt +// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.acc.txt +// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.acc.txt // // CHECK: {{.*}}assert_in_one_kernel.hpp:10: void kernelFunc(int *, int): {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0] // CHECK-SAME: Assertion `Buf[wiID] != 0 && "from assert statement"` failed. diff --git a/SYCL/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp b/SYCL/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp index 6958189ab7..b392e50de1 100644 --- a/SYCL/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp +++ b/SYCL/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp @@ -1,8 +1,8 @@ // FIXME flaky fail on CUDA // UNSUPPORTED: cuda // RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl -fsycl-targets=%sycl_triple -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: %CPU_RUN_PLACEHOLDER %t.out &> %t.txt || true -// RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt +// RUN: %CPU_RUN_PLACEHOLDER %t.out &> %t.cpu.txt || true +// RUN: %CPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.cpu.txt // // Since this is a multi-threaded application enable memory tracking and // deferred release feature in the Level Zero plugin to avoid releasing memory @@ -11,11 +11,11 @@ // release yet. // Suppress runtime from printing out error messages, so that the test can // match on assert message generated by the toolchains. -// RUN: env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1 %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true -// RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt +// RUN: env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1 %GPU_RUN_PLACEHOLDER %t.out &> %t.gpu.txt || true +// RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.gpu.txt // Shouldn't fail on ACC as fallback assert isn't enqueued there -// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt -// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.txt +// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.acc.txt +// RUN: %ACC_RUN_PLACEHOLDER FileCheck %s --check-prefix=CHECK-ACC --input-file %t.acc.txt // // CHECK: this message from file1 // CHECK-NOT: this message from file2