From 0cc88e19ad45fed36cc5af769a00aee4c5216be1 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Thu, 1 Aug 2024 12:39:48 -0700 Subject: [PATCH 01/13] Build to seperate files for tests with multiple builds --- sycl/test-e2e/AOT/cpu.cpp | 6 +++--- .../bad-free/bad-free-minus1.cpp | 12 +++++------ .../bad-free/bad-free-plus1.cpp | 12 +++++------ .../double-free/double-free.cpp | 12 +++++------ .../misaligned/misalign-int.cpp | 12 +++++------ .../misaligned/misalign-long.cpp | 12 +++++------ .../misaligned/misalign-short.cpp | 12 +++++------ .../DeviceGlobal/device_global.cpp | 12 +++++------ .../device_global_image_scope.cpp | 12 +++++------ .../device_global_image_scope_unaligned.cpp | 12 +++++------ .../out-of-bounds/USM/parallel_for_char.cpp | 20 +++++++++---------- .../out-of-bounds/USM/parallel_for_double.cpp | 20 +++++++++---------- .../out-of-bounds/USM/parallel_for_func.cpp | 20 +++++++++---------- .../out-of-bounds/USM/parallel_for_int.cpp | 20 +++++++++---------- .../out-of-bounds/USM/parallel_for_short.cpp | 20 +++++++++---------- .../USM/parallel_no_local_size.cpp | 20 +++++++++---------- .../USM/unaligned_shadow_memory.cpp | 8 ++++---- .../out-of-bounds/buffer/buffer.cpp | 12 +++++------ .../out-of-bounds/buffer/buffer_2d.cpp | 8 ++++---- .../out-of-bounds/buffer/buffer_3d.cpp | 8 ++++---- .../out-of-bounds/buffer/buffer_copy_fill.cpp | 12 +++++------ .../out-of-bounds/buffer/subbuffer.cpp | 12 +++++------ .../out-of-bounds/private/single_private.cpp | 12 +++++------ .../parallel_for_disable_range_roundup.cpp | 9 ++++----- .../Basic/parallel_for_range_roundup.cpp | 16 +++++++-------- sycl/test-e2e/SPVDumpUse/basic.cpp | 14 ++++++------- sycl/test-e2e/SPVDumpUse/kernel_bundle.cpp | 14 ++++++------- .../SharedLib/use_when_link_verify_cache.cpp | 8 ++++---- 28 files changed, 183 insertions(+), 184 deletions(-) diff --git a/sycl/test-e2e/AOT/cpu.cpp b/sycl/test-e2e/AOT/cpu.cpp index f0c71be2d481e..35739f33ef94d 100644 --- a/sycl/test-e2e/AOT/cpu.cpp +++ b/sycl/test-e2e/AOT/cpu.cpp @@ -8,12 +8,12 @@ // REQUIRES: opencl-aot, cpu -// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/Inputs/aot.cpp -o %t.out -// RUN: %{run} %t.out - // Test that opencl-aot can handle multiple build options. // RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/Inputs/aot.cpp -Xsycl-target-backend "--bo=-g" -Xsycl-target-backend "--bo=-cl-opt-disable" -o %t2.out // Test that opencl-aot can handle march option. // RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/Inputs/aot.cpp -Xsycl-target-backend "--march=avx512" // RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/Inputs/aot.cpp -Xsycl-target-backend "--march=wsm" + +// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/Inputs/aot.cpp -o %t.out +// RUN: %{run} %t.out diff --git a/sycl/test-e2e/AddressSanitizer/bad-free/bad-free-minus1.cpp b/sycl/test-e2e/AddressSanitizer/bad-free/bad-free-minus1.cpp index 87bc69308a9d8..9503ef4bb5af4 100644 --- a/sycl/test-e2e/AddressSanitizer/bad-free/bad-free-minus1.cpp +++ b/sycl/test-e2e/AddressSanitizer/bad-free/bad-free-minus1.cpp @@ -1,10 +1,10 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -O0 -g -o %t -// RUN: %force_device_asan_rt %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s -// RUN: %{build} %device_asan_flags -DMALLOC_HOST -O0 -g -o %t -// RUN: %force_device_asan_rt %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-HOST %s -// RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O0 -g -o %t -// RUN: %force_device_asan_rt %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-SHARED %s +// RUN: %{build} %device_asan_flags -O0 -g -o %t1.out +// RUN: %force_device_asan_rt %{run} not %t1.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s +// RUN: %{build} %device_asan_flags -DMALLOC_HOST -O0 -g -o %t2.out +// RUN: %force_device_asan_rt %{run} not %t2.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-HOST %s +// RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O0 -g -o %t3.out +// RUN: %force_device_asan_rt %{run} not %t3.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-SHARED %s #include constexpr size_t N = 64; diff --git a/sycl/test-e2e/AddressSanitizer/bad-free/bad-free-plus1.cpp b/sycl/test-e2e/AddressSanitizer/bad-free/bad-free-plus1.cpp index cd80e8baa77ad..17efe090d4cc5 100644 --- a/sycl/test-e2e/AddressSanitizer/bad-free/bad-free-plus1.cpp +++ b/sycl/test-e2e/AddressSanitizer/bad-free/bad-free-plus1.cpp @@ -1,10 +1,10 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -O0 -g -o %t -// RUN: %force_device_asan_rt %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s -// RUN: %{build} %device_asan_flags -DMALLOC_HOST -O0 -g -o %t -// RUN: %force_device_asan_rt %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-HOST %s -// RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O0 -g -o %t -// RUN: %force_device_asan_rt %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-SHARED %s +// RUN: %{build} %device_asan_flags -O0 -g -o %t1.out +// RUN: %force_device_asan_rt %{run} not %t1.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s +// RUN: %{build} %device_asan_flags -DMALLOC_HOST -O0 -g -o %t2.out +// RUN: %force_device_asan_rt %{run} not %t2.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-HOST %s +// RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O0 -g -o %t3.out +// RUN: %force_device_asan_rt %{run} not %t3.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-SHARED %s #include constexpr size_t N = 64; diff --git a/sycl/test-e2e/AddressSanitizer/double-free/double-free.cpp b/sycl/test-e2e/AddressSanitizer/double-free/double-free.cpp index 19255d852f352..c0e31d5336614 100644 --- a/sycl/test-e2e/AddressSanitizer/double-free/double-free.cpp +++ b/sycl/test-e2e/AddressSanitizer/double-free/double-free.cpp @@ -1,10 +1,10 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -O0 -g -o %t -// RUN: %force_device_asan_rt UR_LAYER_ASAN_OPTIONS="quarantine_size_mb:1;detect_kernel_arguments:0" %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s -// RUN: %{build} %device_asan_flags -DMALLOC_HOST -O0 -g -o %t -// RUN: %force_device_asan_rt UR_LAYER_ASAN_OPTIONS="quarantine_size_mb:1;detect_kernel_arguments:0" %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-HOST %s -// RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O0 -g -o %t -// RUN: %force_device_asan_rt UR_LAYER_ASAN_OPTIONS="quarantine_size_mb:1;detect_kernel_arguments:0" %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-SHARED %s +// RUN: %{build} %device_asan_flags -O0 -g -o %t1.out +// RUN: %force_device_asan_rt UR_LAYER_ASAN_OPTIONS="quarantine_size_mb:1;detect_kernel_arguments:0" %{run} not %t1.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s +// RUN: %{build} %device_asan_flags -DMALLOC_HOST -O0 -g -o %t2.out +// RUN: %force_device_asan_rt UR_LAYER_ASAN_OPTIONS="quarantine_size_mb:1;detect_kernel_arguments:0" %{run} not %t2.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-HOST %s +// RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O0 -g -o %t3.out +// RUN: %force_device_asan_rt UR_LAYER_ASAN_OPTIONS="quarantine_size_mb:1;detect_kernel_arguments:0" %{run} not %t3.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-SHARED %s #include constexpr size_t N = 64; diff --git a/sycl/test-e2e/AddressSanitizer/misaligned/misalign-int.cpp b/sycl/test-e2e/AddressSanitizer/misaligned/misalign-int.cpp index da6b64b626a91..9fac7f0f744c4 100644 --- a/sycl/test-e2e/AddressSanitizer/misaligned/misalign-int.cpp +++ b/sycl/test-e2e/AddressSanitizer/misaligned/misalign-int.cpp @@ -1,10 +1,10 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -O0 -g -o %t -// RUN: env SYCL_PREFER_UR=1 %{run} not %t 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O1 -g -o %t -// RUN: env SYCL_PREFER_UR=1 %{run} not %t 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O2 -g -o %t -// RUN: env SYCL_PREFER_UR=1 %{run} not %t 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O0 -g -o %t1.out +// RUN: env SYCL_PREFER_UR=1 %{run} not %t1.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O1 -g -o %t2.out +// RUN: env SYCL_PREFER_UR=1 %{run} not %t2.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O2 -g -o %t3.out +// RUN: env SYCL_PREFER_UR=1 %{run} not %t3.out 2>&1 | FileCheck %s #include #include diff --git a/sycl/test-e2e/AddressSanitizer/misaligned/misalign-long.cpp b/sycl/test-e2e/AddressSanitizer/misaligned/misalign-long.cpp index 69bebfd68a8f5..668fb413849a9 100644 --- a/sycl/test-e2e/AddressSanitizer/misaligned/misalign-long.cpp +++ b/sycl/test-e2e/AddressSanitizer/misaligned/misalign-long.cpp @@ -1,10 +1,10 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -O0 -g -o %t -// RUN: env SYCL_PREFER_UR=1 %{run} not %t 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O1 -g -o %t -// RUN: env SYCL_PREFER_UR=1 %{run} not %t 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O2 -g -o %t -// RUN: env SYCL_PREFER_UR=1 %{run} not %t 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O0 -g -o %t1.out +// RUN: env SYCL_PREFER_UR=1 %{run} not %t1.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O1 -g -o %t2.out +// RUN: env SYCL_PREFER_UR=1 %{run} not %t2.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O2 -g -o %t3.out +// RUN: env SYCL_PREFER_UR=1 %{run} not %t3.out 2>&1 | FileCheck %s #include #include diff --git a/sycl/test-e2e/AddressSanitizer/misaligned/misalign-short.cpp b/sycl/test-e2e/AddressSanitizer/misaligned/misalign-short.cpp index a7684d3bae740..e3b5565036fa1 100644 --- a/sycl/test-e2e/AddressSanitizer/misaligned/misalign-short.cpp +++ b/sycl/test-e2e/AddressSanitizer/misaligned/misalign-short.cpp @@ -1,10 +1,10 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -O0 -g -o %t -// RUN: env SYCL_PREFER_UR=1 %{run} not %t 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O1 -g -o %t -// RUN: env SYCL_PREFER_UR=1 %{run} not %t 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O2 -g -o %t -// RUN: env SYCL_PREFER_UR=1 %{run} not %t 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O0 -g -o %t1.out +// RUN: env SYCL_PREFER_UR=1 %{run} not %t1.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O1 -g -o %t2.out +// RUN: env SYCL_PREFER_UR=1 %{run} not %t2.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O2 -g -o %t3.out +// RUN: env SYCL_PREFER_UR=1 %{run} not %t3.out 2>&1 | FileCheck %s #include #include diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/DeviceGlobal/device_global.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/DeviceGlobal/device_global.cpp index 0294e7201915b..32a25f35db91d 100644 --- a/sycl/test-e2e/AddressSanitizer/out-of-bounds/DeviceGlobal/device_global.cpp +++ b/sycl/test-e2e/AddressSanitizer/out-of-bounds/DeviceGlobal/device_global.cpp @@ -1,10 +1,10 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -O0 -g -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O1 -g -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O2 -g -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O0 -g -o %t1.out +// RUN: %{run} not %t1.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O1 -g -o %t2.out +// RUN: %{run} not %t2.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O2 -g -o %t3.out +// RUN: %{run} not %t3.out 2>&1 | FileCheck %s #include diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/DeviceGlobal/device_global_image_scope.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/DeviceGlobal/device_global_image_scope.cpp index 2a30758819b12..5c88e8e792fc8 100644 --- a/sycl/test-e2e/AddressSanitizer/out-of-bounds/DeviceGlobal/device_global_image_scope.cpp +++ b/sycl/test-e2e/AddressSanitizer/out-of-bounds/DeviceGlobal/device_global_image_scope.cpp @@ -1,10 +1,10 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -O0 -g -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O1 -g -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O2 -g -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O0 -g -o %t1.out +// RUN: %{run} not %t1.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O1 -g -o %t2.out +// RUN: %{run} not %t2.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O2 -g -o %t3.out +// RUN: %{run} not %t3.out 2>&1 | FileCheck %s #include diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/DeviceGlobal/device_global_image_scope_unaligned.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/DeviceGlobal/device_global_image_scope_unaligned.cpp index 258ce9c849d4a..cfc41be7db479 100644 --- a/sycl/test-e2e/AddressSanitizer/out-of-bounds/DeviceGlobal/device_global_image_scope_unaligned.cpp +++ b/sycl/test-e2e/AddressSanitizer/out-of-bounds/DeviceGlobal/device_global_image_scope_unaligned.cpp @@ -1,10 +1,10 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -O0 -g -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O1 -g -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O2 -g -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O0 -g -o %t1.out +// RUN: %{run} not %t1.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O1 -g -o %t2.out +// RUN: %{run} not %t2.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O2 -g -o %t3.out +// RUN: %{run} not %t3.out 2>&1 | FileCheck %s #include diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_char.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_char.cpp index 6038752ca14c3..1173d76f71a5d 100644 --- a/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_char.cpp +++ b/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_char.cpp @@ -1,14 +1,14 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O0 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s -// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O1 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s -// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O2 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s -// RUN: %{build} %device_asan_flags -DMALLOC_HOST -O2 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-HOST %s -// RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O2 -g -o %t -// RUN: %{run} not %t &> %t.txt ; FileCheck --check-prefixes CHECK,CHECK-SHARED --input-file %t.txt %s +// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O0 -g -o %t1.out +// RUN: %{run} not %t1.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s +// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O1 -g -o %t2.out +// RUN: %{run} not %t2.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s +// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O2 -g -o %t3.out +// RUN: %{run} not %t3.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s +// RUN: %{build} %device_asan_flags -DMALLOC_HOST -O2 -g -o %t4.out +// RUN: %{run} not %t4.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-HOST %s +// RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O2 -g -o %t5.out +// RUN: %{run} not %t5.out &> %t.txt ; FileCheck --check-prefixes CHECK,CHECK-SHARED --input-file %t.txt %s #include diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_double.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_double.cpp index eb53f29dfb53e..68913ea479af0 100644 --- a/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_double.cpp +++ b/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_double.cpp @@ -1,14 +1,14 @@ // REQUIRES: linux, aspect-fp64 -// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O0 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s -// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O1 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s -// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O2 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s -// RUN: %{build} %device_asan_flags -DMALLOC_HOST -O2 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-HOST %s -// RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O2 -g -o %t -// RUN: %{run} not %t &> %t.txt ; FileCheck --check-prefixes CHECK,CHECK-SHARED --input-file %t.txt %s +// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O0 -g -o %t1.out +// RUN: %{run} not %t1.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s +// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O1 -g -o %t2.out +// RUN: %{run} not %t2.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s +// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O2 -g -o %t3.out +// RUN: %{run} not %t3.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s +// RUN: %{build} %device_asan_flags -DMALLOC_HOST -O2 -g -o %t4.out +// RUN: %{run} not %t4.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-HOST %s +// RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O2 -g -o %t5.out +// RUN: %{run} not %t5.out &> %t.txt ; FileCheck --check-prefixes CHECK,CHECK-SHARED --input-file %t.txt %s #include diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_func.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_func.cpp index 6627b26295234..6cc9835d092db 100644 --- a/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_func.cpp +++ b/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_func.cpp @@ -1,14 +1,14 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O0 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s -// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O1 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s -// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O2 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s -// RUN: %{build} %device_asan_flags -DMALLOC_HOST -O2 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-HOST %s -// RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O2 -g -o %t -// RUN: %{run} not %t &> %t.txt ; FileCheck --check-prefixes CHECK,CHECK-SHARED --input-file %t.txt %s +// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O0 -g -o %t1.out +// RUN: %{run} not %t1.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s +// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O1 -g -o %t2.out +// RUN: %{run} not %t2.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s +// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O2 -g -o %t3.out +// RUN: %{run} not %t3.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s +// RUN: %{build} %device_asan_flags -DMALLOC_HOST -O2 -g -o %t4.out +// RUN: %{run} not %t4.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-HOST %s +// RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O2 -g -o %t5.out +// RUN: %{run} not %t5.out &> %t.txt ; FileCheck --check-prefixes CHECK,CHECK-SHARED --input-file %t.txt %s #include diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_int.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_int.cpp index 178f578b2547e..676b59fc4e17d 100644 --- a/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_int.cpp +++ b/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_int.cpp @@ -1,14 +1,14 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O0 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s -// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O1 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s -// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O2 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s -// RUN: %{build} %device_asan_flags -DMALLOC_HOST -O2 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-HOST %s -// RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O2 -g -o %t -// RUN: %{run} not %t &> %t.txt ; FileCheck --check-prefixes CHECK,CHECK-SHARED --input-file %t.txt %s +// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O0 -g -o %t1.out +// RUN: %{run} not %t1.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s +// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O1 -g -o %t2.out +// RUN: %{run} not %t2.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s +// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O2 -g -o %t3.out +// RUN: %{run} not %t3.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s +// RUN: %{build} %device_asan_flags -DMALLOC_HOST -O2 -g -o %t4.out +// RUN: %{run} not %t4.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-HOST %s +// RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O2 -g -o %t5.out +// RUN: %{run} not %t5.out &> %t.txt ; FileCheck --check-prefixes CHECK,CHECK-SHARED --input-file %t.txt %s #include diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_short.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_short.cpp index cd488743453cc..32a094fa966ac 100644 --- a/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_short.cpp +++ b/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_for_short.cpp @@ -1,14 +1,14 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O0 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s -// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O1 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s -// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O2 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s -// RUN: %{build} %device_asan_flags -DMALLOC_HOST -O2 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-HOST %s -// RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O2 -g -o %t -// RUN: %{run} not %t &> %t.txt ; FileCheck --check-prefixes CHECK,CHECK-SHARED --input-file %t.txt %s +// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O0 -g -o %t1.out +// RUN: %{run} not %t1.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s +// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O1 -g -o %t2.out +// RUN: %{run} not %t2.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s +// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O2 -g -o %t3.out +// RUN: %{run} not %t3.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s +// RUN: %{build} %device_asan_flags -DMALLOC_HOST -O2 -g -o %t4.out +// RUN: %{run} not %t4.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-HOST %s +// RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O2 -g -o %t5.out +// RUN: %{run} not %t5.out &> %t.txt ; FileCheck --check-prefixes CHECK,CHECK-SHARED --input-file %t.txt %s #include diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_no_local_size.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_no_local_size.cpp index 9fb77d98766c6..06df087fd0915 100644 --- a/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_no_local_size.cpp +++ b/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/parallel_no_local_size.cpp @@ -1,14 +1,14 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O0 -g -o %t -// RUN: env SYCL_PREFER_UR=1 %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s -// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O1 -g -o %t -// RUN: env SYCL_PREFER_UR=1 %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s -// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O2 -g -o %t -// RUN: env SYCL_PREFER_UR=1 %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s -// RUN: %{build} %device_asan_flags -DMALLOC_HOST -O2 -g -o %t -// RUN: env SYCL_PREFER_UR=1 %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-HOST %s -// RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O2 -g -o %t -// RUN: env SYCL_PREFER_UR=1 %{run} not %t &> %t.txt ; FileCheck --check-prefixes CHECK,CHECK-SHARED --input-file %t.txt %s +// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O0 -g -o %t1.out +// RUN: env SYCL_PREFER_UR=1 %{run} not %t1.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s +// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O1 -g -o %t2.out +// RUN: env SYCL_PREFER_UR=1 %{run} not %t2.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s +// RUN: %{build} %device_asan_flags -DMALLOC_DEVICE -O2 -g -o %t3.out +// RUN: env SYCL_PREFER_UR=1 %{run} not %t3.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-DEVICE %s +// RUN: %{build} %device_asan_flags -DMALLOC_HOST -O2 -g -o %t4.out +// RUN: env SYCL_PREFER_UR=1 %{run} not %t4.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK-HOST %s +// RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O2 -g -o %t5.out +// RUN: env SYCL_PREFER_UR=1 %{run} not %t5.out &> %t.txt ; FileCheck --check-prefixes CHECK,CHECK-SHARED --input-file %t.txt %s #include diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/unaligned_shadow_memory.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/unaligned_shadow_memory.cpp index 5c4fecef63180..16c5e471c365d 100644 --- a/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/unaligned_shadow_memory.cpp +++ b/sycl/test-e2e/AddressSanitizer/out-of-bounds/USM/unaligned_shadow_memory.cpp @@ -1,8 +1,8 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -DTEST1 -O0 -g -o %t -// RUN: env SYCL_PREFER_UR=1 %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK1 %s -// RUN: %{build} %device_asan_flags -DTEST2 -O0 -g -o %t -// RUN: env SYCL_PREFER_UR=1 %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK2 %s +// RUN: %{build} %device_asan_flags -DTEST1 -O0 -g -o %t1.out +// RUN: env SYCL_PREFER_UR=1 %{run} not %t1.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK1 %s +// RUN: %{build} %device_asan_flags -DTEST2 -O0 -g -o %t2.out +// RUN: env SYCL_PREFER_UR=1 %{run} not %t2.out 2>&1 | FileCheck --check-prefixes CHECK,CHECK2 %s #include diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer.cpp index 57f16fd71cfa1..76f0a101c8ea3 100644 --- a/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer.cpp +++ b/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer.cpp @@ -1,10 +1,10 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -O0 -g -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O1 -g -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O2 -g -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O0 -g -o %t1.out +// RUN: %{run} not %t1.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O1 -g -o %t2.out +// RUN: %{run} not %t2.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O2 -g -o %t3.out +// RUN: %{run} not %t3.out 2>&1 | FileCheck %s #include diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer_2d.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer_2d.cpp index 416faacb90198..13adf2fb16d1b 100644 --- a/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer_2d.cpp +++ b/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer_2d.cpp @@ -1,8 +1,8 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -O0 -g -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O1 -g -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O0 -g -o %t1.out +// RUN: %{run} not %t1.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O1 -g -o %t2.out +// RUN: %{run} not %t2.out 2>&1 | FileCheck %s #include diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer_3d.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer_3d.cpp index d91be40fcd9d5..c497b64cad4b9 100644 --- a/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer_3d.cpp +++ b/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer_3d.cpp @@ -1,8 +1,8 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -O0 -g -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O1 -g -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O0 -g -o %t1.out +// RUN: %{run} not %t1.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O1 -g -o %t2.out +// RUN: %{run} not %t2.out 2>&1 | FileCheck %s #include diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer_copy_fill.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer_copy_fill.cpp index b695c3c4df835..ac50c0f00b836 100644 --- a/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer_copy_fill.cpp +++ b/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/buffer_copy_fill.cpp @@ -1,10 +1,10 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -O0 -g -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O1 -g -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O2 -g -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O0 -g -o %t1.out +// RUN: %{run} not %t1.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O1 -g -o %t2.out +// RUN: %{run} not %t2.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O2 -g -o %t3.out +// RUN: %{run} not %t3.out 2>&1 | FileCheck %s #include diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/subbuffer.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/subbuffer.cpp index 3b5862d860653..b873b2c83216f 100644 --- a/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/subbuffer.cpp +++ b/sycl/test-e2e/AddressSanitizer/out-of-bounds/buffer/subbuffer.cpp @@ -1,10 +1,10 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -O0 -g -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O1 -g -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O2 -g -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O0 -g -o %t1.out +// RUN: %{run} not %t1.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O1 -g -o %t2.out +// RUN: %{run} not %t2.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O2 -g -o %t3.out +// RUN: %{run} not %t3.out 2>&1 | FileCheck %s #include diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/private/single_private.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/private/single_private.cpp index 2f4f6ed6d7da1..5743c1d03d0e2 100644 --- a/sycl/test-e2e/AddressSanitizer/out-of-bounds/private/single_private.cpp +++ b/sycl/test-e2e/AddressSanitizer/out-of-bounds/private/single_private.cpp @@ -1,10 +1,10 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -O0 -g -o %t -// RUN: env SYCL_PREFER_UR=1 %{run} not %t 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O1 -g -o %t -// RUN: env SYCL_PREFER_UR=1 %{run} not %t 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O2 -g -o %t -// RUN: env SYCL_PREFER_UR=1 %{run} not %t 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O0 -g -o %t1.out +// RUN: env SYCL_PREFER_UR=1 %{run} not %t1.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O1 -g -o %t2.out +// RUN: env SYCL_PREFER_UR=1 %{run} not %t2.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O2 -g -o %t3.out +// RUN: env SYCL_PREFER_UR=1 %{run} not %t3.out 2>&1 | FileCheck %s #include #include diff --git a/sycl/test-e2e/Basic/parallel_for_disable_range_roundup.cpp b/sycl/test-e2e/Basic/parallel_for_disable_range_roundup.cpp index 5a3b95a12e471..8807bea71cd2a 100644 --- a/sycl/test-e2e/Basic/parallel_for_disable_range_roundup.cpp +++ b/sycl/test-e2e/Basic/parallel_for_disable_range_roundup.cpp @@ -1,10 +1,9 @@ // REQUIRES: gpu -// RUN: %{build} -D__SYCL_DISABLE_PARALLEL_FOR_RANGE_ROUNDING__ -o %t.out +// RUN: %{build} -D__SYCL_DISABLE_PARALLEL_FOR_RANGE_ROUNDING__ -o %t1.out +// RUN: env SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE=1 %{run} %t1.out | FileCheck %s --check-prefix CHECK-DISABLED -// RUN: env SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE=1 %{run} %t.out | FileCheck %s --check-prefix CHECK-DISABLED - -// RUN: %{build} -sycl-std=2020 -o %t.out -// RUN: env SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE=1 %{run} %t.out | FileCheck %s --check-prefix CHECK-ENABLED +// RUN: %{build} -sycl-std=2020 -o %t2.out +// RUN: env SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE=1 %{run} %t2.out | FileCheck %s --check-prefix CHECK-ENABLED #include #include diff --git a/sycl/test-e2e/Basic/parallel_for_range_roundup.cpp b/sycl/test-e2e/Basic/parallel_for_range_roundup.cpp index 5ade58b3da450..0a1d7e81fd054 100644 --- a/sycl/test-e2e/Basic/parallel_for_range_roundup.cpp +++ b/sycl/test-e2e/Basic/parallel_for_range_roundup.cpp @@ -1,15 +1,15 @@ // REQUIRES: gpu -// RUN: %{build} -o %t.out -// RUN: env SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE=1 %{run} %t.out | FileCheck %s --check-prefix=CHECK-DEFAULT +// RUN: %{build} -o %t1.out +// RUN: env SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE=1 %{run} %t1.out | FileCheck %s --check-prefix=CHECK-DEFAULT -// RUN: %{build} -fsycl-range-rounding=force -o %t.out -// RUN: env SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE=1 %{run} %t.out | FileCheck %s --check-prefix=CHECK-DEFAULT +// RUN: %{build} -fsycl-range-rounding=force -o %t2.out +// RUN: env SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE=1 %{run} %t2.out | FileCheck %s --check-prefix=CHECK-DEFAULT -// RUN: %{build} -fsycl-exp-range-rounding -o %t.out -// RUN: env SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE=1 %{run} %t.out | FileCheck %s --check-prefix=CHECK-EXP +// RUN: %{build} -fsycl-exp-range-rounding -o %t3.out +// RUN: env SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE=1 %{run} %t3.out | FileCheck %s --check-prefix=CHECK-EXP -// RUN: %{build} -fsycl-range-rounding=force -fsycl-exp-range-rounding -o %t.out -// RUN: env SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE=1 %{run} %t.out | FileCheck %s --check-prefix=CHECK-EXP +// RUN: %{build} -fsycl-range-rounding=force -fsycl-exp-range-rounding -o %t4.out +// RUN: env SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE=1 %{run} %t4.out | FileCheck %s --check-prefix=CHECK-EXP // // These tests test 3 things: // diff --git a/sycl/test-e2e/SPVDumpUse/basic.cpp b/sycl/test-e2e/SPVDumpUse/basic.cpp index d713e2cb53244..13b5bf0fa39c8 100644 --- a/sycl/test-e2e/SPVDumpUse/basic.cpp +++ b/sycl/test-e2e/SPVDumpUse/basic.cpp @@ -2,16 +2,16 @@ // // SYCL_USE_KERNEL_SPV assumes no dead arguments elimination, need to produce // SPV under the same conditions. -// RUN: %{build} -fno-sycl-dead-args-optimization -fno-sycl-instrument-device-code -DVALUE=1 -o %t.out -// RUN: %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefix ONE -// RUN: env SYCL_DUMP_IMAGES_PREFIX=%t.sycl_ SYCL_DUMP_IMAGES=1 %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefix ONE -// RUN: env SYCL_USE_KERNEL_SPV=%t.sycl_spir64.spv %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefix ONE +// RUN: %{build} -fno-sycl-dead-args-optimization -fno-sycl-instrument-device-code -DVALUE=1 -o %t1.out +// RUN: %{run-unfiltered-devices} %t1.out | FileCheck %s --check-prefix ONE +// RUN: env SYCL_DUMP_IMAGES_PREFIX=%t1.sycl_ SYCL_DUMP_IMAGES=1 %{run-unfiltered-devices} %t1.out | FileCheck %s --check-prefix ONE +// RUN: env SYCL_USE_KERNEL_SPV=%t1.sycl_spir64.spv %{run-unfiltered-devices} %t1.out | FileCheck %s --check-prefix ONE // // This can perform dead arguments elimination, SYCL RT will ignore the // ArgElimMask produced by the device compiler. -// RUN: %{build} -fno-sycl-instrument-device-code -DVALUE=2 -o %t.out -// RUN: %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefix TWO -// RUN: env SYCL_USE_KERNEL_SPV=%t.sycl_spir64.spv %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefix ONE +// RUN: %{build} -fno-sycl-instrument-device-code -DVALUE=2 -o %t2.out +// RUN: %{run-unfiltered-devices} %t2.out | FileCheck %s --check-prefix TWO +// RUN: env SYCL_USE_KERNEL_SPV=%t2.sycl_spir64.spv %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefix ONE #include using namespace sycl; diff --git a/sycl/test-e2e/SPVDumpUse/kernel_bundle.cpp b/sycl/test-e2e/SPVDumpUse/kernel_bundle.cpp index 5163c074c4044..e224c3887d6ab 100644 --- a/sycl/test-e2e/SPVDumpUse/kernel_bundle.cpp +++ b/sycl/test-e2e/SPVDumpUse/kernel_bundle.cpp @@ -2,17 +2,17 @@ // // SYCL_USE_KERNEL_SPV assumes no dead arguments elimination, need to produce // SPV under the same conditions. -// RUN: %{build} -fno-sycl-dead-args-optimization -fno-sycl-instrument-device-code -DVALUE=1 -o %t.out -// RUN: %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefix ONE -// RUN: env SYCL_DUMP_IMAGES_PREFIX=%t.sycl_ SYCL_DUMP_IMAGES=1 %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefix ONE -// RUN: env SYCL_USE_KERNEL_SPV=%t.sycl_spir64.spv %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefix ONE +// RUN: %{build} -fno-sycl-dead-args-optimization -fno-sycl-instrument-device-code -DVALUE=1 -o %t1.out +// RUN: %{run-unfiltered-devices} %t1.out | FileCheck %s --check-prefix ONE +// RUN: env SYCL_DUMP_IMAGES_PREFIX=%t1.sycl_ SYCL_DUMP_IMAGES=1 %{run-unfiltered-devices} %t1.out | FileCheck %s --check-prefix ONE +// RUN: env SYCL_USE_KERNEL_SPV=%t1.sycl_spir64.spv %{run-unfiltered-devices} %t1.out | FileCheck %s --check-prefix ONE // // This can perform dead arguments elimination, SYCL RT will ignore the // ArgElimMask produced by the device compiler. -// RUN: %{build} -fno-sycl-instrument-device-code -DVALUE=2 -o %t.out -// RUN: %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefix TWO +// RUN: %{build} -fno-sycl-instrument-device-code -DVALUE=2 -o %t2.out +// RUN: %{run-unfiltered-devices} %t2.out | FileCheck %s --check-prefix TWO // FIXME: SYCL_USE_KERNEL_SPV is ignored for kernel_bundles. -// RUN: env SYCL_USE_KERNEL_SPV=%t.sycl_spir64.spv %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefix TWO +// RUN: env SYCL_USE_KERNEL_SPV=%t2.sycl_spir64.spv %{run-unfiltered-devices} %t2.out | FileCheck %s --check-prefix TWO #include using namespace sycl; diff --git a/sycl/test-e2e/SharedLib/use_when_link_verify_cache.cpp b/sycl/test-e2e/SharedLib/use_when_link_verify_cache.cpp index effbf6cb81b0e..cac0c124d66a3 100644 --- a/sycl/test-e2e/SharedLib/use_when_link_verify_cache.cpp +++ b/sycl/test-e2e/SharedLib/use_when_link_verify_cache.cpp @@ -2,11 +2,11 @@ // // RUN: %{build} -DBUILD_LIB -fPIC -shared -o %T/lib%basename_t.so -// RUN: %{build} -DFOO_FIRST -L%T -o %t.out -l%basename_t -Wl,-rpath=%T -// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-FIRST,CHECK --implicit-check-not=piProgramBuild +// RUN: %{build} -DFOO_FIRST -L%T -o %t1.out -l%basename_t -Wl,-rpath=%T +// RUN: env SYCL_UR_TRACE=2 %{run} %t1.out 2>&1 | FileCheck %s --check-prefixes=CHECK-FIRST,CHECK --implicit-check-not=piProgramBuild -// RUN: %{build} -L%T -o %t.out -l%basename_t -Wl,-rpath=%T -// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-LAST,CHECK --implicit-check-not=piProgramBuild +// RUN: %{build} -L%T -o %t2.out -l%basename_t -Wl,-rpath=%T +// RUN: env SYCL_UR_TRACE=2 %{run} %t2.out 2>&1 | FileCheck %s --check-prefixes=CHECK-LAST,CHECK --implicit-check-not=piProgramBuild #include From 5acdec338fdc60904cd37a5dd4b6c5160bf5f000 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Tue, 6 Aug 2024 11:00:23 -0700 Subject: [PATCH 02/13] Fix more multi build tests --- sycl/test-e2e/SPVDumpUse/basic.cpp | 2 +- sycl/test-e2e/SPVDumpUse/kernel_bundle.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sycl/test-e2e/SPVDumpUse/basic.cpp b/sycl/test-e2e/SPVDumpUse/basic.cpp index 13b5bf0fa39c8..15cc0d2d8dd02 100644 --- a/sycl/test-e2e/SPVDumpUse/basic.cpp +++ b/sycl/test-e2e/SPVDumpUse/basic.cpp @@ -11,7 +11,7 @@ // ArgElimMask produced by the device compiler. // RUN: %{build} -fno-sycl-instrument-device-code -DVALUE=2 -o %t2.out // RUN: %{run-unfiltered-devices} %t2.out | FileCheck %s --check-prefix TWO -// RUN: env SYCL_USE_KERNEL_SPV=%t2.sycl_spir64.spv %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefix ONE +// RUN: env SYCL_USE_KERNEL_SPV=%t1.sycl_spir64.spv %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefix ONE #include using namespace sycl; diff --git a/sycl/test-e2e/SPVDumpUse/kernel_bundle.cpp b/sycl/test-e2e/SPVDumpUse/kernel_bundle.cpp index e224c3887d6ab..681508a553fba 100644 --- a/sycl/test-e2e/SPVDumpUse/kernel_bundle.cpp +++ b/sycl/test-e2e/SPVDumpUse/kernel_bundle.cpp @@ -12,7 +12,7 @@ // RUN: %{build} -fno-sycl-instrument-device-code -DVALUE=2 -o %t2.out // RUN: %{run-unfiltered-devices} %t2.out | FileCheck %s --check-prefix TWO // FIXME: SYCL_USE_KERNEL_SPV is ignored for kernel_bundles. -// RUN: env SYCL_USE_KERNEL_SPV=%t2.sycl_spir64.spv %{run-unfiltered-devices} %t2.out | FileCheck %s --check-prefix TWO +// RUN: env SYCL_USE_KERNEL_SPV=%t1.sycl_spir64.spv %{run-unfiltered-devices} %t2.out | FileCheck %s --check-prefix TWO #include using namespace sycl; From d7b20d8e90697fd502499e49884ffaff1051093a Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Fri, 9 Aug 2024 10:06:45 -0700 Subject: [PATCH 03/13] Fix SPVDumpUse run line --- sycl/test-e2e/SPVDumpUse/basic.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test-e2e/SPVDumpUse/basic.cpp b/sycl/test-e2e/SPVDumpUse/basic.cpp index 15cc0d2d8dd02..1d009acaa0c7d 100644 --- a/sycl/test-e2e/SPVDumpUse/basic.cpp +++ b/sycl/test-e2e/SPVDumpUse/basic.cpp @@ -11,7 +11,7 @@ // ArgElimMask produced by the device compiler. // RUN: %{build} -fno-sycl-instrument-device-code -DVALUE=2 -o %t2.out // RUN: %{run-unfiltered-devices} %t2.out | FileCheck %s --check-prefix TWO -// RUN: env SYCL_USE_KERNEL_SPV=%t1.sycl_spir64.spv %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefix ONE +// RUN: env SYCL_USE_KERNEL_SPV=%t1.sycl_spir64.spv %{run-unfiltered-devices} %t2.out | FileCheck %s --check-prefix ONE #include using namespace sycl; From 4bcca81d62096de0d5a8b9c6d4bc655cd196a33d Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Tue, 17 Sep 2024 08:46:29 -0700 Subject: [PATCH 04/13] Fix tests that build over the same binary --- sycl/test-e2e/DeviceLib/math_fp64_test.cpp | 8 ++++---- sycl/test-e2e/Regression/multiple-targets.cpp | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sycl/test-e2e/DeviceLib/math_fp64_test.cpp b/sycl/test-e2e/DeviceLib/math_fp64_test.cpp index 235029d766228..6d07628807a4d 100644 --- a/sycl/test-e2e/DeviceLib/math_fp64_test.cpp +++ b/sycl/test-e2e/DeviceLib/math_fp64_test.cpp @@ -2,11 +2,11 @@ // DEFINE: %{mathflags} = %if cl_options %{/clang:-fno-fast-math%} %else %{-fno-fast-math%} -// RUN: %{build} %{mathflags} -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} %{mathflags} -o %t1.out +// RUN: %{run} %t1.out -// RUN: %clangxx -Wno-error=unused-command-line-argument -fsycl -fsycl-device-lib-jit-link %{mathflags} %s -o %t.out -// RUN: %if !gpu %{ %{run} %t.out %} +// RUN: %clangxx -Wno-error=unused-command-line-argument -fsycl -fsycl-device-lib-jit-link %{mathflags} %s -o %t2.out +// RUN: %if !gpu %{ %{run} %t2.out %} #include "math_utils.hpp" #include diff --git a/sycl/test-e2e/Regression/multiple-targets.cpp b/sycl/test-e2e/Regression/multiple-targets.cpp index ec81465a5e61f..84bc68d6238bc 100644 --- a/sycl/test-e2e/Regression/multiple-targets.cpp +++ b/sycl/test-e2e/Regression/multiple-targets.cpp @@ -3,17 +3,17 @@ // The test is repeated for per_kernel device code splitting. // // REQUIRES: cuda || hip || native_cpu -// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple},spir64 -o %t.out %s -// RUN: %{run} %t.out +// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple},spir64 -o %t1.out %s +// RUN: %{run} %t1.out // -// RUN: %clangxx -fsycl -fsycl-targets=spir64,%{sycl_triple} -o %t.out %s -// RUN: %{run} %t.out +// RUN: %clangxx -fsycl -fsycl-targets=spir64,%{sycl_triple} -o %t2.out %s +// RUN: %{run} %t2.out // -// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple},spir64 -fsycl-device-code-split=per_kernel -o %t.out %s -// RUN: %{run} %t.out +// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple},spir64 -fsycl-device-code-split=per_kernel -o %t3.out %s +// RUN: %{run} %t3.out // -// RUN: %clangxx -fsycl -fsycl-targets=spir64,%{sycl_triple} -fsycl-device-code-split=per_kernel -o %t.out %s -// RUN: %{run} %t.out +// RUN: %clangxx -fsycl -fsycl-targets=spir64,%{sycl_triple} -fsycl-device-code-split=per_kernel -o %t4.out %s +// RUN: %{run} %t4.out // // XFAIL: hip_nvidia // From 8d677943e5633b4deb31cb52379e0080dd21d9a5 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Tue, 17 Sep 2024 11:08:59 -0700 Subject: [PATCH 05/13] Change sharedlib tests to not build over eachother --- sycl/test-e2e/SharedLib/use_when_link.cpp | 8 ++++---- sycl/test-e2e/SharedLib/use_with_dlopen.cpp | 18 +++++++++--------- .../SharedLib/use_with_dlopen_verify_cache.cpp | 18 +++++++++--------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/sycl/test-e2e/SharedLib/use_when_link.cpp b/sycl/test-e2e/SharedLib/use_when_link.cpp index 6c74149e60c89..e28ed008f02ea 100644 --- a/sycl/test-e2e/SharedLib/use_when_link.cpp +++ b/sycl/test-e2e/SharedLib/use_when_link.cpp @@ -2,11 +2,11 @@ // // RUN: %{build} -DBUILD_LIB -fPIC -shared -o %T/lib%basename_t.so -// RUN: %{build} -DFOO_FIRST -L%T -o %t.out -l%basename_t -Wl,-rpath=%T -// RUN: %{run} %t.out +// RUN: %{build} -DFOO_FIRST -L%T -o %t1.out -l%basename_t -Wl,-rpath=%T +// RUN: %{run} %t1.out -// RUN: %{build} -L%T -o %t.out -l%basename_t -Wl,-rpath=%T -// RUN: %{run} %t.out +// RUN: %{build} -L%T -o %t2.out -l%basename_t -Wl,-rpath=%T +// RUN: %{run} %t2.out #include diff --git a/sycl/test-e2e/SharedLib/use_with_dlopen.cpp b/sycl/test-e2e/SharedLib/use_with_dlopen.cpp index d5fd6f8fd5150..b904b8c3b1aa0 100644 --- a/sycl/test-e2e/SharedLib/use_with_dlopen.cpp +++ b/sycl/test-e2e/SharedLib/use_with_dlopen.cpp @@ -2,20 +2,20 @@ // // RUN: %{build} -DBUILD_LIB -fPIC -shared -o %T/lib%basename_t.so -// DEFINE: %{compile} = %{build} -DFNAME=%basename_t -o %t.out -ldl -Wl,-rpath=%T +// DEFINE: %{compile} = %{build} -DFNAME=%basename_t -ldl -Wl,-rpath=%T -// RUN: %{compile} -DRUN_FIRST -// RUN: %{run} %t.out +// RUN: %{compile} -o %t1.out -DRUN_FIRST +// RUN: %{run} %t1.out -// RUN: %{compile} -DRUN_MIDDLE_BEFORE -// RUN: %{run} %t.out +// RUN: %{compile} -o %t2.out -DRUN_MIDDLE_BEFORE +// RUN: %{run} %t2.out -// RUN: %{compile} -DRUN_MIDDLE_AFTER -// RUN: %{run} %t.out +// RUN: %{compile} -o %t3.out -DRUN_MIDDLE_AFTER +// RUN: %{run} %t3.out // This causes SEG. FAULT. -// RUNx: %{compile} -DRUN_LAST -// RUNx: %{run} %t.out +// RUNx: %{compile} -o %t4.out -DRUN_LAST +// RUNx: %{run} %t4.out #include diff --git a/sycl/test-e2e/SharedLib/use_with_dlopen_verify_cache.cpp b/sycl/test-e2e/SharedLib/use_with_dlopen_verify_cache.cpp index f0d77ea1cd815..fe53120bfe13a 100644 --- a/sycl/test-e2e/SharedLib/use_with_dlopen_verify_cache.cpp +++ b/sycl/test-e2e/SharedLib/use_with_dlopen_verify_cache.cpp @@ -2,21 +2,21 @@ // // RUN: %{build} -DBUILD_LIB -fPIC -shared -o %T/lib%basename_t.so -// DEFINE: %{compile} = %{build} -DFNAME=%basename_t -o %t.out -ldl -Wl,-rpath=%T +// DEFINE: %{compile} = %{build} -DFNAME=%basename_t-ldl -Wl,-rpath=%T -// RUN: %{compile} -DRUN_FIRST -// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-FIRST,CHECK --implicit-check-not=piProgramBuild +// RUN: %{compile} -o %t1.out -DRUN_FIRST +// RUN: env SYCL_UR_TRACE=2 %{run} %t1.out 2>&1 | FileCheck %s --check-prefixes=CHECK-FIRST,CHECK --implicit-check-not=piProgramBuild -// RUN: %{compile} -DRUN_MIDDLE_BEFORE -// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-MIDDLE-BEFORE,CHECK --implicit-check-not=piProgramBuild +// RUN: %{compile} -o %t2.out -DRUN_MIDDLE_BEFORE +// RUN: env SYCL_UR_TRACE=2 %{run} %t2.out 2>&1 | FileCheck %s --check-prefixes=CHECK-MIDDLE-BEFORE,CHECK --implicit-check-not=piProgramBuild -// RUN: %{compile} -DRUN_MIDDLE_AFTER -// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-MIDDLE-AFTER,CHECK --implicit-check-not=piProgramBuild +// RUN: %{compile} -o %t3.out -DRUN_MIDDLE_AFTER +// RUN: env SYCL_UR_TRACE=2 %{run} %t3.out 2>&1 | FileCheck %s --check-prefixes=CHECK-MIDDLE-AFTER,CHECK --implicit-check-not=piProgramBuild // clang-format off // This causes SEG. FAULT. -// RUNx: %{compile} -DRUN_LAST -// RUNx: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-LAST,CHECK --implicit-check-not=piProgramBuild +// RUNx: %{compile} -o %t4.out -DRUN_LAST +// RUNx: env SYCL_UR_TRACE=2 %{run} %t4.out 2>&1 | FileCheck %s --check-prefixes=CHECK-LAST,CHECK --implicit-check-not=piProgramBuild // clang-format on #include From 23a9cd0df94050c6521ea276b858939694744eda Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Mon, 7 Oct 2024 13:14:21 -0700 Subject: [PATCH 06/13] build on seperate files in asan e2e tests --- .../AddressSanitizer/common/option-redzone-size.cpp | 10 +++++----- .../AddressSanitizer/nullpointer/global_nullptr.cpp | 12 ++++++------ .../AddressSanitizer/nullpointer/private_nullptr.cpp | 12 ++++++------ .../out-of-bounds/local/group_local_memory.cpp | 12 ++++++------ .../out-of-bounds/local/local_accessor_basic.cpp | 12 ++++++------ .../out-of-bounds/local/local_accessor_function.cpp | 12 ++++++------ .../out-of-bounds/local/local_accessor_multiargs.cpp | 12 ++++++------ 7 files changed, 41 insertions(+), 41 deletions(-) diff --git a/sycl/test-e2e/AddressSanitizer/common/option-redzone-size.cpp b/sycl/test-e2e/AddressSanitizer/common/option-redzone-size.cpp index 424213c61b705..ac0cadf31b5a7 100644 --- a/sycl/test-e2e/AddressSanitizer/common/option-redzone-size.cpp +++ b/sycl/test-e2e/AddressSanitizer/common/option-redzone-size.cpp @@ -1,9 +1,9 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -DUNSAFE -O0 -g -o %t -// RUN: env UR_LAYER_ASAN_OPTIONS=redzone:64 %{run} not %t 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -DSAFE -O0 -g -o %t -// RUN: env UR_LOG_SANITIZER=level:debug UR_LAYER_ASAN_OPTIONS=redzone:8 %{run} %t 2>&1 | FileCheck --check-prefixes CHECK-MIN %s -// RUN: env UR_LOG_SANITIZER=level:debug UR_LAYER_ASAN_OPTIONS=max_redzone:4096 %{run} %t 2>&1 | FileCheck --check-prefixes CHECK-MAX %s +// RUN: %{build} %device_asan_flags -DUNSAFE -O0 -g -o %t1.out +// RUN: env UR_LAYER_ASAN_OPTIONS=redzone:64 %{run} not %t1.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -DSAFE -O0 -g -o %t2.out +// RUN: env UR_LOG_SANITIZER=level:debug UR_LAYER_ASAN_OPTIONS=redzone:8 %{run} %t2.out 2>&1 | FileCheck --check-prefixes CHECK-MIN %s +// RUN: env UR_LOG_SANITIZER=level:debug UR_LAYER_ASAN_OPTIONS=max_redzone:4096 %{run} %t2.out 2>&1 | FileCheck --check-prefixes CHECK-MAX %s #include diff --git a/sycl/test-e2e/AddressSanitizer/nullpointer/global_nullptr.cpp b/sycl/test-e2e/AddressSanitizer/nullpointer/global_nullptr.cpp index 6d436b58bfcee..598aa6aea4c6a 100644 --- a/sycl/test-e2e/AddressSanitizer/nullpointer/global_nullptr.cpp +++ b/sycl/test-e2e/AddressSanitizer/nullpointer/global_nullptr.cpp @@ -1,10 +1,10 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -O0 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O1 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O2 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O0 -g -o %t1.out +// RUN: %{run} not %t1.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O1 -g -o %t2.out +// RUN: %{run} not %t2.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O2 -g -o %t3.out +// RUN: %{run} not %t3.out 2>&1 | FileCheck %s // See https://github.com/intel/llvm/issues/15453 // UNSUPPORTED: gpu-intel-dg2 diff --git a/sycl/test-e2e/AddressSanitizer/nullpointer/private_nullptr.cpp b/sycl/test-e2e/AddressSanitizer/nullpointer/private_nullptr.cpp index 7d3455c43d4d8..6b013a2aee1e2 100644 --- a/sycl/test-e2e/AddressSanitizer/nullpointer/private_nullptr.cpp +++ b/sycl/test-e2e/AddressSanitizer/nullpointer/private_nullptr.cpp @@ -1,10 +1,10 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -O0 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O1 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -O2 -g -o %t -// RUN: %{run} not %t 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O0 -g -o %t1.out +// RUN: %{run} not %t1.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O1 -g -o %t2.out +// RUN: %{run} not %t2.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -O2 -g -o %t3.out +// RUN: %{run} not %t3.out 2>&1 | FileCheck %s // FIXME: There's an issue in gfx driver, so this test pending here. // XFAIL: * diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/group_local_memory.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/group_local_memory.cpp index 619bca302fcbf..0d18a06ba3945 100644 --- a/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/group_local_memory.cpp +++ b/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/group_local_memory.cpp @@ -1,10 +1,10 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -g -O0 -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -g -O1 -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -g -O2 -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -g -O0 -o %t1.out +// RUN: %{run} not %t1.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -g -O1 -o %t2.out +// RUN: %{run} not %t2.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -g -O2 -o %t3.out +// RUN: %{run} not %t3.out 2>&1 | FileCheck %s #include #include diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/local_accessor_basic.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/local_accessor_basic.cpp index 8ac696aafb466..2357300b685ba 100644 --- a/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/local_accessor_basic.cpp +++ b/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/local_accessor_basic.cpp @@ -1,10 +1,10 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -g -O0 -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -g -O1 -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -g -O2 -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -g -O0 -o %t1.out +// RUN: %{run} not %t1.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -g -O1 -o %t2.out +// RUN: %{run} not %t2.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -g -O2 -o %t3.out +// RUN: %{run} not %t3.out 2>&1 | FileCheck %s #include constexpr std::size_t N = 4; diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/local_accessor_function.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/local_accessor_function.cpp index 5d61bd5c95153..46f3e9093ba9e 100644 --- a/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/local_accessor_function.cpp +++ b/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/local_accessor_function.cpp @@ -1,10 +1,10 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -g -O0 -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -g -O1 -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -g -O2 -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -g -O0 -o %t1.out +// RUN: %{run} not %t1.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -g -O1 -o %t2.out +// RUN: %{run} not %t2.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -g -O2 -o %t3.out +// RUN: %{run} not %t3.out 2>&1 | FileCheck %s #include #include diff --git a/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/local_accessor_multiargs.cpp b/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/local_accessor_multiargs.cpp index 63c2c6ef14c68..2ae9408523a67 100644 --- a/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/local_accessor_multiargs.cpp +++ b/sycl/test-e2e/AddressSanitizer/out-of-bounds/local/local_accessor_multiargs.cpp @@ -1,10 +1,10 @@ // REQUIRES: linux -// RUN: %{build} %device_asan_flags -g -O0 -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -g -O1 -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s -// RUN: %{build} %device_asan_flags -g -O2 -o %t.out -// RUN: %{run} not %t.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -g -O0 -o %t1.out +// RUN: %{run} not %t1.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -g -O1 -o %t2.out +// RUN: %{run} not %t2.out 2>&1 | FileCheck %s +// RUN: %{build} %device_asan_flags -g -O2 -o %t3.out +// RUN: %{run} not %t3.out 2>&1 | FileCheck %s #include constexpr std::size_t N = 8; From ee7d39f5cbb0226a22aaefb1bb267a198cf77af4 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Mon, 7 Oct 2024 13:55:07 -0700 Subject: [PATCH 07/13] Build executables to different files for Basic e2e tests --- sycl/test-e2e/Basic/code_location_e2e.cpp | 8 +++--- sycl/test-e2e/Basic/multisource.cpp | 16 ++++++------ sycl/test-e2e/Basic/multisource_spv_obj.cpp | 27 ++++++++++----------- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/sycl/test-e2e/Basic/code_location_e2e.cpp b/sycl/test-e2e/Basic/code_location_e2e.cpp index a6d80ccbed799..1d7a66355b032 100644 --- a/sycl/test-e2e/Basic/code_location_e2e.cpp +++ b/sycl/test-e2e/Basic/code_location_e2e.cpp @@ -1,10 +1,10 @@ // UNSUPPORTED: cuda -// RUN: %{build} -DNDEBUG -o %t.out -// RUN: %{run} %t.out | FileCheck %s +// RUN: %{build} -DNDEBUG -o %t1.out +// RUN: %{run} %t1.out | FileCheck %s -// RUN: %{build} -o %t.out -// RUN: %{run} %t.out | FileCheck %s +// RUN: %{build} -o %t2.out +// RUN: %{run} %t2.out | FileCheck %s /* clang++ -fsycl -DNDEBUG -o smyl.bin code_location_e2e.cpp // <<--- NDEBUG diff --git a/sycl/test-e2e/Basic/multisource.cpp b/sycl/test-e2e/Basic/multisource.cpp index 87ac6ccfe4888..d29ce8ceca4ed 100644 --- a/sycl/test-e2e/Basic/multisource.cpp +++ b/sycl/test-e2e/Basic/multisource.cpp @@ -6,18 +6,18 @@ // //===----------------------------------------------------------------------===// -// Separate kernel sources and host code sources +// RUN: %{build} -c -o %t.init.o -DINIT_KERNEL +// RUN: %{build} -c -o %t.calc.o -DCALC_KERNEL // RUN: %{build} -c -o %t.kernel.o -DINIT_KERNEL -DCALC_KERNEL // RUN: %{build} -c -o %t.main.o -DMAIN_APP -// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t.kernel.o %t.main.o -Wno-unused-command-line-argument -o %t.fat -// RUN: %{run} %t.fat + +// Separate kernel sources and host code sources +// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t.kernel.o %t.main.o -Wno-unused-command-line-argument -o %t1.fat +// RUN: %{run} %t1.fat // Multiple sources with kernel code -// RUN: %{build} -c -o %t.init.o -DINIT_KERNEL -// RUN: %{build} -c -o %t.calc.o -DCALC_KERNEL -// RUN: %{build} -c -o %t.main.o -DMAIN_APP -// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t.init.o %t.calc.o %t.main.o -Wno-unused-command-line-argument -o %t.fat -// RUN: %{run} %t.fat +// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t.init.o %t.calc.o %t.main.o -Wno-unused-command-line-argument -o %t2.fat +// RUN: %{run} %t2.fat #include diff --git a/sycl/test-e2e/Basic/multisource_spv_obj.cpp b/sycl/test-e2e/Basic/multisource_spv_obj.cpp index 9756de3f24fd1..f0e38e22d88f1 100644 --- a/sycl/test-e2e/Basic/multisource_spv_obj.cpp +++ b/sycl/test-e2e/Basic/multisource_spv_obj.cpp @@ -7,26 +7,25 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: cuda || hip -// -// Separate kernel sources and host code sources -// RUN: %{build} -fsycl-device-obj=spirv -c -o %t.kernel.o -DINIT_KERNEL -DCALC_KERNEL -// RUN: %{build} -fsycl-device-obj=spirv -c -o %t.main.o -DMAIN_APP -// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t.kernel.o %t.main.o -Wno-unused-command-line-argument -o %t.fat -// RUN: %{run} %t.fat -// Multiple sources with kernel code +// RUN: %{build} -fsycl-device-obj=spirv -c -o %t.kernel.o -DINIT_KERNEL -DCALC_KERNEL // RUN: %{build} -fsycl-device-obj=spirv -c -o %t.init.o -DINIT_KERNEL // RUN: %{build} -fsycl-device-obj=spirv -c -o %t.calc.o -DCALC_KERNEL +// RUN: %{build} -fsycl-device-obj=llvmir -c -o %t.calc.llvmir.o -DCALC_KERNEL // RUN: %{build} -fsycl-device-obj=spirv -c -o %t.main.o -DMAIN_APP -// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t.init.o %t.calc.o %t.main.o -Wno-unused-command-line-argument -o %t.fat -// RUN: %{run} %t.fat +// RUN: %{build} -c -o %t.main.llvmir.o -DMAIN_APP + +// Separate kernel sources and host code sources +// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t.kernel.o %t.main.o -Wno-unused-command-line-argument -o %t1.fat +// RUN: %{run} %t1.fat + +// Multiple sources with kernel code +// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t.init.o %t.calc.o %t.main.o -Wno-unused-command-line-argument -o %t2.fat +// RUN: %{run} %t2.fat // Multiple sources with kernel code, mixed SPIR-V and LLVM-IR objects -// RUN: %{build} -fsycl-device-obj=spirv -c -o %t.init.o -DINIT_KERNEL -// RUN: %{build} -fsycl-device-obj=llvmir -c -o %t.calc.o -DCALC_KERNEL -// RUN: %{build} -c -o %t.main.o -DMAIN_APP -// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t.init.o %t.calc.o %t.main.o -Wno-unused-command-line-argument -o %t.fat -// RUN: %{run} %t.fat +// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t.init.o %t.calc.llvmir.o %t.main.llvmir.o -Wno-unused-command-line-argument -o %t3.fat +// RUN: %{run} %t3.fat #include From f28bbcd49048773d91d72253e777fbfd8acdca84 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Mon, 7 Oct 2024 14:13:51 -0700 Subject: [PATCH 08/13] Build to seperate files on DeviceLib e2e tests --- sycl/test-e2e/DeviceLib/cmath_fp64_test.cpp | 8 ++++---- sycl/test-e2e/DeviceLib/cmath_test.cpp | 12 ++++++------ .../DeviceLib/imf_bfloat16_integeral_convesions.cpp | 8 ++++---- sycl/test-e2e/DeviceLib/imf_double2half.cpp | 8 ++++---- sycl/test-e2e/DeviceLib/imf_float2bfloat16.cpp | 8 ++++---- sycl/test-e2e/DeviceLib/imf_fp32_rounding_test.cpp | 8 ++++---- sycl/test-e2e/DeviceLib/imf_fp32_test.cpp | 8 ++++---- sycl/test-e2e/DeviceLib/imf_fp64_rounding_test.cpp | 8 ++++---- sycl/test-e2e/DeviceLib/imf_fp64_test.cpp | 8 ++++---- sycl/test-e2e/DeviceLib/imf_fp64_test2.cpp | 8 ++++---- sycl/test-e2e/DeviceLib/imf_half_type_cast.cpp | 8 ++++---- sycl/test-e2e/DeviceLib/imf_simd_emulate_test.cpp | 8 ++++---- sycl/test-e2e/DeviceLib/math_test.cpp | 8 ++++---- .../DeviceLib/std_complex_math_fp64_test.cpp | 8 ++++---- sycl/test-e2e/DeviceLib/std_complex_math_test.cpp | 8 ++++---- sycl/test-e2e/DeviceLib/string_test.cpp | 8 ++++---- 16 files changed, 66 insertions(+), 66 deletions(-) diff --git a/sycl/test-e2e/DeviceLib/cmath_fp64_test.cpp b/sycl/test-e2e/DeviceLib/cmath_fp64_test.cpp index 1fa973bc4e65a..e46e93fb2a116 100644 --- a/sycl/test-e2e/DeviceLib/cmath_fp64_test.cpp +++ b/sycl/test-e2e/DeviceLib/cmath_fp64_test.cpp @@ -3,11 +3,11 @@ // DEFINE: %{mathflags} = %if cl_options %{/clang:-fno-fast-math%} %else %{-fno-fast-math%} -// RUN: %{build} %{mathflags} -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} %{mathflags} -o %t1.out +// RUN: %{run} %t1.out -// RUN: %{build} -fsycl-device-lib-jit-link %{mathflags} -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -fsycl-device-lib-jit-link %{mathflags} -o %t2.out +// RUN: %{run} %t2.out #include "math_utils.hpp" #include diff --git a/sycl/test-e2e/DeviceLib/cmath_test.cpp b/sycl/test-e2e/DeviceLib/cmath_test.cpp index 2fe760fff2a34..e45355b3d302b 100644 --- a/sycl/test-e2e/DeviceLib/cmath_test.cpp +++ b/sycl/test-e2e/DeviceLib/cmath_test.cpp @@ -1,14 +1,14 @@ // DEFINE: %{mathflags} = %if cl_options %{/clang:-fno-fast-math%} %else %{-fno-fast-math%} -// RUN: %{build} -fno-builtin %{mathflags} -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -fno-builtin %{mathflags} -o %t1.out +// RUN: %{run} %t1.out -// RUN: %{build} -Wno-error=unused-command-line-argument -fno-builtin -fsycl-device-lib-jit-link %{mathflags} -o %t.out -// RUN: %if !gpu %{ %{run} %t.out %} +// RUN: %{build} -Wno-error=unused-command-line-argument -fno-builtin -fsycl-device-lib-jit-link %{mathflags} -o %t2.out +// RUN: %if !gpu %{ %{run} %t2.out %} // // // Check that --fast-math works with cmath funcs for CUDA -// RUN: %if cuda %{ %{build} -fno-builtin %{mathflags} -o %t.out -ffast-math -DSYCL_E2E_FASTMATH %} -// RUN: %if cuda %{ %{run} %t.out %} +// RUN: %if cuda %{ %{build} -fno-builtin %{mathflags} -o %t3.out -ffast-math -DSYCL_E2E_FASTMATH %} +// RUN: %if cuda %{ %{run} %t3.out %} #include "math_utils.hpp" #include diff --git a/sycl/test-e2e/DeviceLib/imf_bfloat16_integeral_convesions.cpp b/sycl/test-e2e/DeviceLib/imf_bfloat16_integeral_convesions.cpp index 43a90d8d518bc..233d8ad57f9c4 100644 --- a/sycl/test-e2e/DeviceLib/imf_bfloat16_integeral_convesions.cpp +++ b/sycl/test-e2e/DeviceLib/imf_bfloat16_integeral_convesions.cpp @@ -1,8 +1,8 @@ -// RUN: %{build} -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -o %t1.out +// RUN: %{run} %t1.out -// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out +// RUN: %{run} %t2.out // // UNSUPPORTED: cuda || hip diff --git a/sycl/test-e2e/DeviceLib/imf_double2half.cpp b/sycl/test-e2e/DeviceLib/imf_double2half.cpp index bb20b0e982124..5099f7bb29cc4 100644 --- a/sycl/test-e2e/DeviceLib/imf_double2half.cpp +++ b/sycl/test-e2e/DeviceLib/imf_double2half.cpp @@ -1,11 +1,11 @@ // REQUIRES: gpu // REQUIRES: aspect-fp64, aspect-fp16 -// RUN: %{build} -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -o %t1.out +// RUN: %{run} %t1.out -// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out +// RUN: %{run} %t2.out // UNSUPPORTED: cuda, hip diff --git a/sycl/test-e2e/DeviceLib/imf_float2bfloat16.cpp b/sycl/test-e2e/DeviceLib/imf_float2bfloat16.cpp index 71236dcfa29f9..eb18ad7b6aeb9 100644 --- a/sycl/test-e2e/DeviceLib/imf_float2bfloat16.cpp +++ b/sycl/test-e2e/DeviceLib/imf_float2bfloat16.cpp @@ -1,8 +1,8 @@ -// RUN: %{build} -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -o %t1.out +// RUN: %{run} %t1.out -// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out +// RUN: %{run} %t2.out // // UNSUPPORTED: cuda || hip diff --git a/sycl/test-e2e/DeviceLib/imf_fp32_rounding_test.cpp b/sycl/test-e2e/DeviceLib/imf_fp32_rounding_test.cpp index fba246cf95b5c..09e1f33c9517e 100644 --- a/sycl/test-e2e/DeviceLib/imf_fp32_rounding_test.cpp +++ b/sycl/test-e2e/DeviceLib/imf_fp32_rounding_test.cpp @@ -1,8 +1,8 @@ -// RUN: %{build} -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -o %t1.out +// RUN: %{run} %t1.out -// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out +// RUN: %{run} %t2.out // // UNSUPPORTED: cuda || hip diff --git a/sycl/test-e2e/DeviceLib/imf_fp32_test.cpp b/sycl/test-e2e/DeviceLib/imf_fp32_test.cpp index 8260e8e039fa0..de9d7be781dbb 100644 --- a/sycl/test-e2e/DeviceLib/imf_fp32_test.cpp +++ b/sycl/test-e2e/DeviceLib/imf_fp32_test.cpp @@ -1,8 +1,8 @@ -// RUN: %{build} -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -o %t1.out +// RUN: %{run} %t1.out -// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out +// RUN: %{run} %t2.out // // UNSUPPORTED: cuda || hip diff --git a/sycl/test-e2e/DeviceLib/imf_fp64_rounding_test.cpp b/sycl/test-e2e/DeviceLib/imf_fp64_rounding_test.cpp index 95150a6b9f8fb..4952d959988a9 100644 --- a/sycl/test-e2e/DeviceLib/imf_fp64_rounding_test.cpp +++ b/sycl/test-e2e/DeviceLib/imf_fp64_rounding_test.cpp @@ -1,9 +1,9 @@ // REQUIRES: aspect-fp64 -// RUN: %{build} -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -o %t1.out +// RUN: %{run} %t1.out -// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out +// RUN: %{run} %t2.out // // UNSUPPORTED: cuda || hip diff --git a/sycl/test-e2e/DeviceLib/imf_fp64_test.cpp b/sycl/test-e2e/DeviceLib/imf_fp64_test.cpp index cccad216dd353..89b15997a59ad 100644 --- a/sycl/test-e2e/DeviceLib/imf_fp64_test.cpp +++ b/sycl/test-e2e/DeviceLib/imf_fp64_test.cpp @@ -1,9 +1,9 @@ // REQUIRES: aspect-fp64 -// RUN: %{build} -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -o %t1.out +// RUN: %{run} %t1.out -// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out +// RUN: %{run} %t2.out // // UNSUPPORTED: cuda || hip #include "imf_utils.hpp" diff --git a/sycl/test-e2e/DeviceLib/imf_fp64_test2.cpp b/sycl/test-e2e/DeviceLib/imf_fp64_test2.cpp index 4e4c66ccce601..bc35906192ac4 100644 --- a/sycl/test-e2e/DeviceLib/imf_fp64_test2.cpp +++ b/sycl/test-e2e/DeviceLib/imf_fp64_test2.cpp @@ -1,9 +1,9 @@ // REQUIRES: aspect-fp64 -// RUN: %{build} -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -o %t1.out +// RUN: %{run} %t1.out -// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out +// RUN: %{run} %t2.out // // UNSUPPORTED: cuda || hip diff --git a/sycl/test-e2e/DeviceLib/imf_half_type_cast.cpp b/sycl/test-e2e/DeviceLib/imf_half_type_cast.cpp index 1a04ba986144c..2491def1cff18 100644 --- a/sycl/test-e2e/DeviceLib/imf_half_type_cast.cpp +++ b/sycl/test-e2e/DeviceLib/imf_half_type_cast.cpp @@ -1,11 +1,11 @@ // REQUIRES: gpu // REQUIRES: aspect-fp16 -// RUN: %{build} -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -o %t1.out +// RUN: %{run} %t1.out -// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out +// RUN: %{run} %t2.out // UNSUPPORTED: cuda, hip diff --git a/sycl/test-e2e/DeviceLib/imf_simd_emulate_test.cpp b/sycl/test-e2e/DeviceLib/imf_simd_emulate_test.cpp index 9e1ff251e2208..241e8a15c681e 100644 --- a/sycl/test-e2e/DeviceLib/imf_simd_emulate_test.cpp +++ b/sycl/test-e2e/DeviceLib/imf_simd_emulate_test.cpp @@ -1,8 +1,8 @@ -// RUN: %{build} -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -o %t1.out +// RUN: %{run} %t1.out -// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out +// RUN: %{run} %t2.out // // UNSUPPORTED: cuda || hip #include "imf_utils.hpp" diff --git a/sycl/test-e2e/DeviceLib/math_test.cpp b/sycl/test-e2e/DeviceLib/math_test.cpp index aeda8550294da..cccfe1457d51a 100644 --- a/sycl/test-e2e/DeviceLib/math_test.cpp +++ b/sycl/test-e2e/DeviceLib/math_test.cpp @@ -1,10 +1,10 @@ // DEFINE: %{mathflags} = %if cl_options %{/clang:-fno-fast-math%} %else %{-fno-fast-math%} -// RUN: %{build} %{mathflags} -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} %{mathflags} -o %t1.out +// RUN: %{run} %t1.out -// RUN: %{build} -Wno-error=unused-command-line-argument -fsycl-device-lib-jit-link %{mathflags} -o %t.out -// RUN: %if !gpu %{ %{run} %t.out %} +// RUN: %{build} -Wno-error=unused-command-line-argument -fsycl-device-lib-jit-link %{mathflags} -o %t2.out +// RUN: %if !gpu %{ %{run} %t2.out %} #include "math_utils.hpp" #include diff --git a/sycl/test-e2e/DeviceLib/std_complex_math_fp64_test.cpp b/sycl/test-e2e/DeviceLib/std_complex_math_fp64_test.cpp index 9a9a307122e0e..f3aa3da05a3e2 100644 --- a/sycl/test-e2e/DeviceLib/std_complex_math_fp64_test.cpp +++ b/sycl/test-e2e/DeviceLib/std_complex_math_fp64_test.cpp @@ -1,10 +1,10 @@ // REQUIRES: aspect-fp64 // UNSUPPORTED: hip || cuda -// RUN: %{build} -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -o %t1.out +// RUN: %{run} %t1.out -// RUN: %{build} -fsycl-device-lib-jit-link -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -fsycl-device-lib-jit-link -o %t2.out +// RUN: %{run} %t2.out #include #include diff --git a/sycl/test-e2e/DeviceLib/std_complex_math_test.cpp b/sycl/test-e2e/DeviceLib/std_complex_math_test.cpp index 74ae0f677210c..3ae5cf3f9f5da 100644 --- a/sycl/test-e2e/DeviceLib/std_complex_math_test.cpp +++ b/sycl/test-e2e/DeviceLib/std_complex_math_test.cpp @@ -1,10 +1,10 @@ // DEFINE: %{mathflags} = %if cl_options %{/clang:-fno-fast-math%} %else %{-fno-fast-math%} // UNSUPPORTED: hip || cuda -// RUN: %{build} %{mathflags} -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} %{mathflags} -o %t1.out +// RUN: %{run} %t1.out -// RUN: %{build} -fsycl-device-lib-jit-link %{mathflags} -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -fsycl-device-lib-jit-link %{mathflags} -o %t2.out +// RUN: %{run} %t2.out #include #include diff --git a/sycl/test-e2e/DeviceLib/string_test.cpp b/sycl/test-e2e/DeviceLib/string_test.cpp index 6b61e0a51a043..2b7f2e904c470 100644 --- a/sycl/test-e2e/DeviceLib/string_test.cpp +++ b/sycl/test-e2e/DeviceLib/string_test.cpp @@ -1,8 +1,8 @@ -// RUN: %{build} -Wno-error=deprecated-declarations -Wno-error=pointer-to-int-cast -fno-builtin -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -Wno-error=deprecated-declarations -Wno-error=pointer-to-int-cast -fno-builtin -o %t1.out +// RUN: %{run} %t1.out // -// RUN: %{build} -Wno-error=unused-command-line-argument -Wno-error=deprecated-declarations -Wno-error=pointer-to-int-cast -fno-builtin -fsycl-device-lib-jit-link -o %t.out -// RUN: %if !gpu %{ %{run} %t.out %} +// RUN: %{build} -Wno-error=unused-command-line-argument -Wno-error=deprecated-declarations -Wno-error=pointer-to-int-cast -fno-builtin -fsycl-device-lib-jit-link -o %t2.out +// RUN: %if !gpu %{ %{run} %t2.out %} #include #include From c281475f73acdc880a13f6af8966e37efda1873d Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Tue, 8 Oct 2024 07:01:28 -0700 Subject: [PATCH 09/13] Build to different files on multisource tests --- sycl/test-e2e/Basic/multisource.cpp | 8 ++++---- sycl/test-e2e/Basic/multisource_spv_obj.cpp | 17 +++++++++-------- sycl/test-e2e/NewOffloadDriver/multisource.cpp | 16 ++++++++-------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/sycl/test-e2e/Basic/multisource.cpp b/sycl/test-e2e/Basic/multisource.cpp index d29ce8ceca4ed..23c95ce2eddd3 100644 --- a/sycl/test-e2e/Basic/multisource.cpp +++ b/sycl/test-e2e/Basic/multisource.cpp @@ -6,16 +6,16 @@ // //===----------------------------------------------------------------------===// -// RUN: %{build} -c -o %t.init.o -DINIT_KERNEL -// RUN: %{build} -c -o %t.calc.o -DCALC_KERNEL +// Separate kernel sources and host code sources // RUN: %{build} -c -o %t.kernel.o -DINIT_KERNEL -DCALC_KERNEL // RUN: %{build} -c -o %t.main.o -DMAIN_APP - -// Separate kernel sources and host code sources // RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t.kernel.o %t.main.o -Wno-unused-command-line-argument -o %t1.fat // RUN: %{run} %t1.fat // Multiple sources with kernel code +// RUN: %{build} -c -o %t.init.o -DINIT_KERNEL +// RUN: %{build} -c -o %t.calc.o -DCALC_KERNEL +// RUN: %{build} -c -o %t.main.o -DMAIN_APP // RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t.init.o %t.calc.o %t.main.o -Wno-unused-command-line-argument -o %t2.fat // RUN: %{run} %t2.fat diff --git a/sycl/test-e2e/Basic/multisource_spv_obj.cpp b/sycl/test-e2e/Basic/multisource_spv_obj.cpp index f0e38e22d88f1..0f097ce3cd5db 100644 --- a/sycl/test-e2e/Basic/multisource_spv_obj.cpp +++ b/sycl/test-e2e/Basic/multisource_spv_obj.cpp @@ -7,24 +7,25 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: cuda || hip - +// +// Separate kernel sources and host code sources // RUN: %{build} -fsycl-device-obj=spirv -c -o %t.kernel.o -DINIT_KERNEL -DCALC_KERNEL -// RUN: %{build} -fsycl-device-obj=spirv -c -o %t.init.o -DINIT_KERNEL -// RUN: %{build} -fsycl-device-obj=spirv -c -o %t.calc.o -DCALC_KERNEL -// RUN: %{build} -fsycl-device-obj=llvmir -c -o %t.calc.llvmir.o -DCALC_KERNEL // RUN: %{build} -fsycl-device-obj=spirv -c -o %t.main.o -DMAIN_APP -// RUN: %{build} -c -o %t.main.llvmir.o -DMAIN_APP - -// Separate kernel sources and host code sources // RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t.kernel.o %t.main.o -Wno-unused-command-line-argument -o %t1.fat // RUN: %{run} %t1.fat // Multiple sources with kernel code +// RUN: %{build} -fsycl-device-obj=spirv -c -o %t.init.o -DINIT_KERNEL +// RUN: %{build} -fsycl-device-obj=spirv -c -o %t.calc.o -DCALC_KERNEL +// RUN: %{build} -fsycl-device-obj=spirv -c -o %t.main.o -DMAIN_APP // RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t.init.o %t.calc.o %t.main.o -Wno-unused-command-line-argument -o %t2.fat // RUN: %{run} %t2.fat // Multiple sources with kernel code, mixed SPIR-V and LLVM-IR objects -// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t.init.o %t.calc.llvmir.o %t.main.llvmir.o -Wno-unused-command-line-argument -o %t3.fat +// RUN: %{build} -fsycl-device-obj=spirv -c -o %t.init.o -DINIT_KERNEL +// RUN: %{build} -fsycl-device-obj=llvmir -c -o %t.calc.o -DCALC_KERNEL +// RUN: %{build} -c -o %t.main.o -DMAIN_APP +// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t.init.o %t.calc.o %t.main.o -Wno-unused-command-line-argument -o %t3.fat // RUN: %{run} %t3.fat #include diff --git a/sycl/test-e2e/NewOffloadDriver/multisource.cpp b/sycl/test-e2e/NewOffloadDriver/multisource.cpp index 704f87c31c80f..73c7ab87f3222 100644 --- a/sycl/test-e2e/NewOffloadDriver/multisource.cpp +++ b/sycl/test-e2e/NewOffloadDriver/multisource.cpp @@ -10,24 +10,24 @@ // Test with `--offload-new-driver` // RUN: %{build} --offload-new-driver -c -o %t.kernel.o -DINIT_KERNEL -DCALC_KERNEL // RUN: %{build} --offload-new-driver -c -o %t.main.o -DMAIN_APP -// RUN: %clangxx -Wno-error=unused-command-line-argument -fsycl -fsycl-targets=%{sycl_triple} --offload-new-driver %t.kernel.o %t.main.o -o %t.fat -// RUN: %{run} %t.fat +// RUN: %clangxx -Wno-error=unused-command-line-argument -fsycl -fsycl-targets=%{sycl_triple} --offload-new-driver %t.kernel.o %t.main.o -o %t1.fat +// RUN: %{run} %t1.fat // Multiple sources with kernel code // Test with `--offload-new-driver` // RUN: %{build} --offload-new-driver -c -o %t.init.o -DINIT_KERNEL // RUN: %{build} --offload-new-driver -c -o %t.calc.o -DCALC_KERNEL // RUN: %{build} --offload-new-driver -c -o %t.main.o -DMAIN_APP -// RUN: %clangxx -Wno-error=unused-command-line-argument -fsycl -fsycl-targets=%{sycl_triple} --offload-new-driver %t.init.o %t.calc.o %t.main.o -o %t.fat -// RUN: %{run} %t.fat +// RUN: %clangxx -Wno-error=unused-command-line-argument -fsycl -fsycl-targets=%{sycl_triple} --offload-new-driver %t.init.o %t.calc.o %t.main.o -o %t2.fat +// RUN: %{run} %t2.fat // Multiple sources with kernel code with old-style objects // Test with `--offload-new-driver` // RUN: %{build} --no-offload-new-driver -c -o %t.init.o -DINIT_KERNEL // RUN: %{build} --no-offload-new-driver -c -o %t.calc.o -DCALC_KERNEL // RUN: %{build} --no-offload-new-driver -c -o %t.main.o -DMAIN_APP -// RUN: %clangxx -Wno-error=unused-command-line-argument -fsycl -fsycl-targets=%{sycl_triple} --offload-new-driver %t.init.o %t.calc.o %t.main.o -o %t.fat -// RUN: %{run} %t.fat +// RUN: %clangxx -Wno-error=unused-command-line-argument -fsycl -fsycl-targets=%{sycl_triple} --offload-new-driver %t.init.o %t.calc.o %t.main.o -o %t3.fat +// RUN: %{run} %t3.fat // Multiple sources with kernel code with old-style objects in a static archive // Test with `--offload-new-driver` @@ -35,8 +35,8 @@ // RUN: %{build} --no-offload-new-driver -c -o %t.calc.o -DCALC_KERNEL // RUN: %{build} --no-offload-new-driver -c -o %t.main.o -DMAIN_APP // RUN: llvm-ar r %t.a %t.init.o %t.calc.o -// RUN: %clangxx -Wno-error=unused-command-line-argument -fsycl -fsycl-targets=%{sycl_triple} --offload-new-driver %t.main.o %t.a -o %t.fat -// RUN: %{run} %t.fat +// RUN: %clangxx -Wno-error=unused-command-line-argument -fsycl -fsycl-targets=%{sycl_triple} --offload-new-driver %t.main.o %t.a -o %t4.fat +// RUN: %{run} %t4.fat #include From 989dc84e65de016267e5fcb7014dabeebbb01cae Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Tue, 8 Oct 2024 07:09:10 -0700 Subject: [PATCH 10/13] Build to seperate files in e2e tests --- sycl/test-e2e/BFloat16/bfloat16_type.cpp | 4 +-- .../Complex/sycl_complex_include_order.cpp | 28 +++++++++---------- sycl/test-e2e/DeviceCodeSplit/grf.cpp | 24 ++++++++-------- sycl/test-e2e/ESIMD/grf.cpp | 18 ++++++------ .../kernel-bundle-merge-options-env.cpp | 8 +++--- .../parallel_for_range_roundup.cpp | 12 ++++---- .../SeparateCompile/sycl-external.cpp | 8 +++--- sycl/test-e2e/SubGroup/sub_group_as.cpp | 8 +++--- sycl/test-e2e/SubGroup/sub_group_as_vec.cpp | 8 +++--- 9 files changed, 59 insertions(+), 59 deletions(-) diff --git a/sycl/test-e2e/BFloat16/bfloat16_type.cpp b/sycl/test-e2e/BFloat16/bfloat16_type.cpp index 53d2ad9bcafe9..7e7972f949522 100644 --- a/sycl/test-e2e/BFloat16/bfloat16_type.cpp +++ b/sycl/test-e2e/BFloat16/bfloat16_type.cpp @@ -1,5 +1,5 @@ -// RUN: %if any-device-is-cuda %{ %{build} -DUSE_CUDA_SM80=1 -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_80 -o %t.out %} -// RUN: %if cuda %{ %{run} %t.out %} +// RUN: %if any-device-is-cuda %{ %{build} -DUSE_CUDA_SM80=1 -Xsycl-target-backend=nvptx64-nvidia-cuda --cuda-gpu-arch=sm_80 -o %t.cuda.out %} +// RUN: %if cuda %{ %{run} %t.cuda.out %} // RUN: %{build} -o %t.out // RUN: %{run} %t.out diff --git a/sycl/test-e2e/Complex/sycl_complex_include_order.cpp b/sycl/test-e2e/Complex/sycl_complex_include_order.cpp index 52a7fd1f2ceb9..8eb80cd9797e4 100644 --- a/sycl/test-e2e/Complex/sycl_complex_include_order.cpp +++ b/sycl/test-e2e/Complex/sycl_complex_include_order.cpp @@ -1,17 +1,17 @@ -// RUN: %{build} -DINCLUDE_BEFORE -o %t.out -// RUN: %{run} %t.out -// RUN: %{build} -o %t.out -// RUN: %{run} %t.out - -// RUN: %if linux %{ %{build} -DINCLUDE_BEFORE -fsycl-host-compiler=g++ -fsycl-host-compiler-options="-std=c++17" -o %t.out %} -// RUN: %if linux %{ %{run} %t.out %} -// RUN: %if linux %{ %{build} -fsycl-host-compiler=g++ -fsycl-host-compiler-options="-std=c++17" -o %t.out %} -// RUN: %if linux %{ %{run} %t.out %} - -// RUN: %if windows %{ %{build} -DINCLUDE_BEFORE -fsycl-host-compiler=cl -fsycl-host-compiler-options="/std:c++17" -o %t.out %} -// RUN: %if windows %{ %{run} %t.out %} -// RUN: %if windows %{ %{build} -fsycl-host-compiler=cl -fsycl-host-compiler-options="/std:c++17" -o %t.out %} -// RUN: %if windows %{ %{run} %t.out %} +// RUN: %{build} -DINCLUDE_BEFORE -o %t1.out +// RUN: %{run} %t1.out +// RUN: %{build} -o %t2.out +// RUN: %{run} %t2.out + +// RUN: %if linux %{ %{build} -DINCLUDE_BEFORE -fsycl-host-compiler=g++ -fsycl-host-compiler-options="-std=c++17" -o %t3.out %} +// RUN: %if linux %{ %{run} %t3.out %} +// RUN: %if linux %{ %{build} -fsycl-host-compiler=g++ -fsycl-host-compiler-options="-std=c++17" -o %t4.out %} +// RUN: %if linux %{ %{run} %t4.out %} + +// RUN: %if windows %{ %{build} -DINCLUDE_BEFORE -fsycl-host-compiler=cl -fsycl-host-compiler-options="/std:c++17" -o %t5.out %} +// RUN: %if windows %{ %{run} %t5.out %} +// RUN: %if windows %{ %{build} -fsycl-host-compiler=cl -fsycl-host-compiler-options="/std:c++17" -o %t6.out %} +// RUN: %if windows %{ %{run} %t6.out %} // Test scenario when is included before SYCL headers. #ifdef INCLUDE_BEFORE diff --git a/sycl/test-e2e/DeviceCodeSplit/grf.cpp b/sycl/test-e2e/DeviceCodeSplit/grf.cpp index ba9ea0a3d74d4..b3d02a7fea35c 100644 --- a/sycl/test-e2e/DeviceCodeSplit/grf.cpp +++ b/sycl/test-e2e/DeviceCodeSplit/grf.cpp @@ -15,18 +15,18 @@ // REQUIRES: arch-intel_gpu_pvc -// RUN: %{build} -Wno-error=deprecated-declarations -o %t.out -// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR -// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR -// RUN: %{build} -DUSE_NEW_API=1 -o %t.out -// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR -// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR -// RUN: %{build} -DUSE_AUTO_GRF=1 -Wno-error=deprecated-declarations -o %t.out -// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-NO-VAR -// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-WITH-VAR -// RUN: %{build} -DUSE_NEW_API=1 -DUSE_AUTO_GRF=1 -o %t.out -// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-NO-VAR -// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-WITH-VAR +// RUN: %{build} -Wno-error=deprecated-declarations -o %t1.out +// RUN: env SYCL_UR_TRACE=2 %{run} %t1.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR +// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t1.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR +// RUN: %{build} -DUSE_NEW_API=1 -o %t2.out +// RUN: env SYCL_UR_TRACE=2 %{run} %t2.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR +// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t2.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR +// RUN: %{build} -DUSE_AUTO_GRF=1 -Wno-error=deprecated-declarations -o %t3.out +// RUN: env SYCL_UR_TRACE=2 %{run} %t3.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-NO-VAR +// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t3.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-WITH-VAR +// RUN: %{build} -DUSE_NEW_API=1 -DUSE_AUTO_GRF=1 -o %t4.out +// RUN: env SYCL_UR_TRACE=2 %{run} %t4.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-NO-VAR +// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t4.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-WITH-VAR #include "../helpers.hpp" #include #include diff --git a/sycl/test-e2e/ESIMD/grf.cpp b/sycl/test-e2e/ESIMD/grf.cpp index 8185adcf7c174..6ac896717e5bb 100644 --- a/sycl/test-e2e/ESIMD/grf.cpp +++ b/sycl/test-e2e/ESIMD/grf.cpp @@ -15,15 +15,15 @@ // REQUIRES: arch-intel_gpu_pvc // invokes 'urProgramBuild'/'urKernelCreate' -// RUN: %{build} -o %t.out -// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR -// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR -// RUN: %{build} -DUSE_NEW_API=1 -o %t.out -// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR -// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR -// RUN: %{build} -DUSE_AUTO -o %t.out -// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-NO-VAR -// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-WITH-VAR +// RUN: %{build} -o %t1.out +// RUN: env SYCL_UR_TRACE=2 %{run} %t1.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR +// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t1.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR +// RUN: %{build} -DUSE_NEW_API=1 -o %t2.out +// RUN: env SYCL_UR_TRACE=2 %{run} %t2.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR +// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t2.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR +// RUN: %{build} -DUSE_AUTO -o %t3.out +// RUN: env SYCL_UR_TRACE=2 %{run} %t3.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-NO-VAR +// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t3.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-WITH-VAR #include "esimd_test_utils.hpp" #if defined(USE_NEW_API) || defined(USE_AUTO) diff --git a/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options-env.cpp b/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options-env.cpp index 371336fe83b7c..aec55eceddfe6 100644 --- a/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options-env.cpp +++ b/sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options-env.cpp @@ -1,10 +1,10 @@ // REQUIRES: gpu // Disable fallback assert here so, that build process isn't affected -// RUN: %{build} -DSYCL_DISABLE_FALLBACK_ASSERT=1 -o %t.out %debug_option -// RUN: env SYCL_UR_TRACE=2 SYCL_PROGRAM_COMPILE_OPTIONS=-DENV_COMPILE_OPTS SYCL_PROGRAM_LINK_OPTIONS=-DENV_LINK_OPTS SYCL_PROGRAM_APPEND_COMPILE_OPTIONS=-DENV_APPEND_COMPILE_OPTS SYCL_PROGRAM_APPEND_LINK_OPTIONS=-DENV_APPEND_LINK_OPTS %{run} %t.out | FileCheck %s +// RUN: %{build} -DSYCL_DISABLE_FALLBACK_ASSERT=1 -o %t1.out %debug_option +// RUN: env SYCL_UR_TRACE=2 SYCL_PROGRAM_COMPILE_OPTIONS=-DENV_COMPILE_OPTS SYCL_PROGRAM_LINK_OPTIONS=-DENV_LINK_OPTS SYCL_PROGRAM_APPEND_COMPILE_OPTIONS=-DENV_APPEND_COMPILE_OPTS SYCL_PROGRAM_APPEND_LINK_OPTIONS=-DENV_APPEND_LINK_OPTS %{run} %t1.out | FileCheck %s // Check that options are overrided -// RUN: %{build} -Wno-error=unused-command-line-argument -DSYCL_DISABLE_FALLBACK_ASSERT=1 -Xsycl-target-linker=spir64 -DBAR -Xsycl-target-frontend=spir64 -DBAR_COMPILE -o %t.out -// RUN: env SYCL_UR_TRACE=2 SYCL_PROGRAM_COMPILE_OPTIONS=-DENV_COMPILE_OPTS SYCL_PROGRAM_LINK_OPTIONS=-DENV_LINK_OPTS SYCL_PROGRAM_APPEND_COMPILE_OPTIONS=-DENV_APPEND_COMPILE_OPTS SYCL_PROGRAM_APPEND_LINK_OPTIONS=-DENV_APPEND_LINK_OPTS %{run} %t.out | FileCheck %s +// RUN: %{build} -Wno-error=unused-command-line-argument -DSYCL_DISABLE_FALLBACK_ASSERT=1 -Xsycl-target-linker=spir64 -DBAR -Xsycl-target-frontend=spir64 -DBAR_COMPILE -o %t2.out +// RUN: env SYCL_UR_TRACE=2 SYCL_PROGRAM_COMPILE_OPTIONS=-DENV_COMPILE_OPTS SYCL_PROGRAM_LINK_OPTIONS=-DENV_LINK_OPTS SYCL_PROGRAM_APPEND_COMPILE_OPTIONS=-DENV_APPEND_COMPILE_OPTS SYCL_PROGRAM_APPEND_LINK_OPTIONS=-DENV_APPEND_LINK_OPTS %{run} %t2.out | FileCheck %s // UNSUPPORTED: hip #include "kernel-bundle-merge-options.hpp" diff --git a/sycl/test-e2e/PerformanceTests/ParallelFor/parallel_for_range_roundup.cpp b/sycl/test-e2e/PerformanceTests/ParallelFor/parallel_for_range_roundup.cpp index 7ad9132038553..26689fd119047 100644 --- a/sycl/test-e2e/PerformanceTests/ParallelFor/parallel_for_range_roundup.cpp +++ b/sycl/test-e2e/PerformanceTests/ParallelFor/parallel_for_range_roundup.cpp @@ -1,14 +1,14 @@ // RUN: echo "Running parallel_for benchmark without range rounding" -// RUN: %{build} -fsycl-range-rounding=disable -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -fsycl-range-rounding=disable -o %t1.out +// RUN: %{run} %t1.out // RUN: echo "Running parallel_for benchmark with normal range rounding" -// RUN: %{build} -fsycl-range-rounding=force -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -fsycl-range-rounding=force -o %t2.out +// RUN: %{run} %t2.out // RUN: echo "Running parallel_for benchmark with experimental range rounding" -// RUN: %{build} -fsycl-exp-range-rounding -fsycl-range-rounding=force -o %t.out -// RUN: %{run} %t.out +// RUN: %{build} -fsycl-exp-range-rounding -fsycl-range-rounding=force -o %t3.out +// RUN: %{run} %t3.out #include #include diff --git a/sycl/test-e2e/SeparateCompile/sycl-external.cpp b/sycl/test-e2e/SeparateCompile/sycl-external.cpp index 8b6fc12382198..37facb7ecfc57 100644 --- a/sycl/test-e2e/SeparateCompile/sycl-external.cpp +++ b/sycl/test-e2e/SeparateCompile/sycl-external.cpp @@ -2,15 +2,15 @@ // different object file. // RUN: %{build} -DSOURCE1 -c -o %t1.o // RUN: %{build} -DSOURCE2 -c -o %t2.o -// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t1.o %t2.o -Wno-unused-command-line-argument -o %t.exe -// RUN: %{run} %t.exe +// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t1.o %t2.o -Wno-unused-command-line-argument -o %t1.exe +// RUN: %{run} %t1.exe // // Test2 - check that kernel can call a SYCL_EXTERNAL function defined in a // static library. // RUN: rm -f %t.a // RUN: llvm-ar crv %t.a %t1.o -// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t2.o %t.a -Wno-unused-command-line-argument -o %t.exe -// RUN: %{run} %t.exe +// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t2.o %t.a -Wno-unused-command-line-argument -o %t2.exe +// RUN: %{run} %t2.exe #include #include diff --git a/sycl/test-e2e/SubGroup/sub_group_as.cpp b/sycl/test-e2e/SubGroup/sub_group_as.cpp index 8a04961a3f513..6924ff8686004 100644 --- a/sycl/test-e2e/SubGroup/sub_group_as.cpp +++ b/sycl/test-e2e/SubGroup/sub_group_as.cpp @@ -1,8 +1,8 @@ -// RUN: %{build} -o %t.out -Wno-deprecated-declarations -// RUN: %{run} %t.out +// RUN: %{build} -o %t1.out -Wno-deprecated-declarations +// RUN: %{run} %t1.out // -// RUN: %{build} -DUSE_DEPRECATED_LOCAL_ACC -o %t.out -Wno-deprecated-declarations -// RUN: %{run} %t.out +// RUN: %{build} -DUSE_DEPRECATED_LOCAL_ACC -o %t2.out -Wno-deprecated-declarations +// RUN: %{run} %t2.out #include #include diff --git a/sycl/test-e2e/SubGroup/sub_group_as_vec.cpp b/sycl/test-e2e/SubGroup/sub_group_as_vec.cpp index 9af4477d8a7c2..210c147d6a776 100644 --- a/sycl/test-e2e/SubGroup/sub_group_as_vec.cpp +++ b/sycl/test-e2e/SubGroup/sub_group_as_vec.cpp @@ -1,8 +1,8 @@ -// RUN: %{build} -o %t.out -Wno-deprecated-declarations -// RUN: %{run} %t.out +// RUN: %{build} -o %t1.out -Wno-deprecated-declarations +// RUN: %{run} %t1.out // -// RUN: %{build} -DUSE_DEPRECATED_LOCAL_ACC -o %t.out -Wno-deprecated-declarations -// RUN: %{run} %t.out +// RUN: %{build} -DUSE_DEPRECATED_LOCAL_ACC -o %t2.out -Wno-deprecated-declarations +// RUN: %{run} %t2.out #include "helper.hpp" #include From 66d12dd7006d468ac70b6c394421b736310a2e10 Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Tue, 8 Oct 2024 07:23:01 -0700 Subject: [PATCH 11/13] undo changes to AOT/cpu.cpp --- sycl/test-e2e/AOT/cpu.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sycl/test-e2e/AOT/cpu.cpp b/sycl/test-e2e/AOT/cpu.cpp index 35739f33ef94d..f0c71be2d481e 100644 --- a/sycl/test-e2e/AOT/cpu.cpp +++ b/sycl/test-e2e/AOT/cpu.cpp @@ -8,12 +8,12 @@ // REQUIRES: opencl-aot, cpu +// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/Inputs/aot.cpp -o %t.out +// RUN: %{run} %t.out + // Test that opencl-aot can handle multiple build options. // RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/Inputs/aot.cpp -Xsycl-target-backend "--bo=-g" -Xsycl-target-backend "--bo=-cl-opt-disable" -o %t2.out // Test that opencl-aot can handle march option. // RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/Inputs/aot.cpp -Xsycl-target-backend "--march=avx512" // RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/Inputs/aot.cpp -Xsycl-target-backend "--march=wsm" - -// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/Inputs/aot.cpp -o %t.out -// RUN: %{run} %t.out From 77821d4ca2400b87072311330f52e80025f65c6f Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Tue, 8 Oct 2024 07:25:47 -0700 Subject: [PATCH 12/13] Undo whitespace change in Basic/parallel_for_disable_range_roundup.cpp --- sycl/test-e2e/Basic/parallel_for_disable_range_roundup.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/sycl/test-e2e/Basic/parallel_for_disable_range_roundup.cpp b/sycl/test-e2e/Basic/parallel_for_disable_range_roundup.cpp index 8807bea71cd2a..509172de63f03 100644 --- a/sycl/test-e2e/Basic/parallel_for_disable_range_roundup.cpp +++ b/sycl/test-e2e/Basic/parallel_for_disable_range_roundup.cpp @@ -1,5 +1,6 @@ // REQUIRES: gpu // RUN: %{build} -D__SYCL_DISABLE_PARALLEL_FOR_RANGE_ROUNDING__ -o %t1.out + // RUN: env SYCL_PARALLEL_FOR_RANGE_ROUNDING_TRACE=1 %{run} %t1.out | FileCheck %s --check-prefix CHECK-DISABLED // RUN: %{build} -sycl-std=2020 -o %t2.out From 375f99004925b1b9f8360b748caccb76a8d50c2d Mon Sep 17 00:00:00 2001 From: "Garcia Orozco, David" Date: Tue, 8 Oct 2024 13:38:03 -0700 Subject: [PATCH 13/13] Fix pre-commit cuda failures --- sycl/test-e2e/DeviceLib/cmath_test.cpp | 2 +- sycl/test-e2e/SharedLib/use_with_dlopen_verify_cache.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sycl/test-e2e/DeviceLib/cmath_test.cpp b/sycl/test-e2e/DeviceLib/cmath_test.cpp index e45355b3d302b..97a92bc2b3885 100644 --- a/sycl/test-e2e/DeviceLib/cmath_test.cpp +++ b/sycl/test-e2e/DeviceLib/cmath_test.cpp @@ -7,7 +7,7 @@ // RUN: %if !gpu %{ %{run} %t2.out %} // // // Check that --fast-math works with cmath funcs for CUDA -// RUN: %if cuda %{ %{build} -fno-builtin %{mathflags} -o %t3.out -ffast-math -DSYCL_E2E_FASTMATH %} +// RUN: %if any-device-is-cuda %{ %{build} -Wno-nan-infinity-disabled -fno-builtin %{mathflags} -o %t3.out -ffast-math -DSYCL_E2E_FASTMATH %} // RUN: %if cuda %{ %{run} %t3.out %} #include "math_utils.hpp" diff --git a/sycl/test-e2e/SharedLib/use_with_dlopen_verify_cache.cpp b/sycl/test-e2e/SharedLib/use_with_dlopen_verify_cache.cpp index fe53120bfe13a..fcc50a6acaaf4 100644 --- a/sycl/test-e2e/SharedLib/use_with_dlopen_verify_cache.cpp +++ b/sycl/test-e2e/SharedLib/use_with_dlopen_verify_cache.cpp @@ -2,7 +2,7 @@ // // RUN: %{build} -DBUILD_LIB -fPIC -shared -o %T/lib%basename_t.so -// DEFINE: %{compile} = %{build} -DFNAME=%basename_t-ldl -Wl,-rpath=%T +// DEFINE: %{compile} = %{build} -DFNAME=%basename_t -ldl -Wl,-rpath=%T // RUN: %{compile} -o %t1.out -DRUN_FIRST // RUN: env SYCL_UR_TRACE=2 %{run} %t1.out 2>&1 | FileCheck %s --check-prefixes=CHECK-FIRST,CHECK --implicit-check-not=piProgramBuild @@ -15,8 +15,8 @@ // clang-format off // This causes SEG. FAULT. -// RUNx: %{compile} -o %t4.out -DRUN_LAST -// RUNx: env SYCL_UR_TRACE=2 %{run} %t4.out 2>&1 | FileCheck %s --check-prefixes=CHECK-LAST,CHECK --implicit-check-not=piProgramBuild +// RUNx: %{compile} -DRUN_LAST +// RUNx: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK-LAST,CHECK --implicit-check-not=piProgramBuild // clang-format on #include