Skip to content

Commit 989dc84

Browse files
ayylolayylol
committed
Build to seperate files in e2e tests
1 parent c281475 commit 989dc84

File tree

9 files changed

+59
-59
lines changed

9 files changed

+59
-59
lines changed

‎sycl/test-e2e/BFloat16/bfloat16_type.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// 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 %}
2-
// RUN: %if cuda %{ %{run} %t.out %}
1+
// 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 %}
2+
// RUN: %if cuda %{ %{run} %t.cuda.out %}
33
// RUN: %{build} -o %t.out
44
// RUN: %{run} %t.out
55

‎sycl/test-e2e/Complex/sycl_complex_include_order.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
// RUN: %{build} -DINCLUDE_BEFORE -o %t.out
2-
// RUN: %{run} %t.out
3-
// RUN: %{build} -o %t.out
4-
// RUN: %{run} %t.out
5-
6-
// RUN: %if linux %{ %{build} -DINCLUDE_BEFORE -fsycl-host-compiler=g++ -fsycl-host-compiler-options="-std=c++17" -o %t.out %}
7-
// RUN: %if linux %{ %{run} %t.out %}
8-
// RUN: %if linux %{ %{build} -fsycl-host-compiler=g++ -fsycl-host-compiler-options="-std=c++17" -o %t.out %}
9-
// RUN: %if linux %{ %{run} %t.out %}
10-
11-
// RUN: %if windows %{ %{build} -DINCLUDE_BEFORE -fsycl-host-compiler=cl -fsycl-host-compiler-options="/std:c++17" -o %t.out %}
12-
// RUN: %if windows %{ %{run} %t.out %}
13-
// RUN: %if windows %{ %{build} -fsycl-host-compiler=cl -fsycl-host-compiler-options="/std:c++17" -o %t.out %}
14-
// RUN: %if windows %{ %{run} %t.out %}
1+
// RUN: %{build} -DINCLUDE_BEFORE -o %t1.out
2+
// RUN: %{run} %t1.out
3+
// RUN: %{build} -o %t2.out
4+
// RUN: %{run} %t2.out
5+
6+
// RUN: %if linux %{ %{build} -DINCLUDE_BEFORE -fsycl-host-compiler=g++ -fsycl-host-compiler-options="-std=c++17" -o %t3.out %}
7+
// RUN: %if linux %{ %{run} %t3.out %}
8+
// RUN: %if linux %{ %{build} -fsycl-host-compiler=g++ -fsycl-host-compiler-options="-std=c++17" -o %t4.out %}
9+
// RUN: %if linux %{ %{run} %t4.out %}
10+
11+
// RUN: %if windows %{ %{build} -DINCLUDE_BEFORE -fsycl-host-compiler=cl -fsycl-host-compiler-options="/std:c++17" -o %t5.out %}
12+
// RUN: %if windows %{ %{run} %t5.out %}
13+
// RUN: %if windows %{ %{build} -fsycl-host-compiler=cl -fsycl-host-compiler-options="/std:c++17" -o %t6.out %}
14+
// RUN: %if windows %{ %{run} %t6.out %}
1515

1616
// Test scenario when <complex> is included before SYCL headers.
1717
#ifdef INCLUDE_BEFORE

‎sycl/test-e2e/DeviceCodeSplit/grf.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515

1616
// REQUIRES: arch-intel_gpu_pvc
1717

18-
// RUN: %{build} -Wno-error=deprecated-declarations -o %t.out
19-
// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR
20-
// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR
21-
// RUN: %{build} -DUSE_NEW_API=1 -o %t.out
22-
// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR
23-
// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR
24-
// RUN: %{build} -DUSE_AUTO_GRF=1 -Wno-error=deprecated-declarations -o %t.out
25-
// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-NO-VAR
26-
// 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
27-
// RUN: %{build} -DUSE_NEW_API=1 -DUSE_AUTO_GRF=1 -o %t.out
28-
// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-NO-VAR
29-
// 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
18+
// RUN: %{build} -Wno-error=deprecated-declarations -o %t1.out
19+
// RUN: env SYCL_UR_TRACE=2 %{run} %t1.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR
20+
// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t1.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR
21+
// RUN: %{build} -DUSE_NEW_API=1 -o %t2.out
22+
// RUN: env SYCL_UR_TRACE=2 %{run} %t2.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR
23+
// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t2.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR
24+
// RUN: %{build} -DUSE_AUTO_GRF=1 -Wno-error=deprecated-declarations -o %t3.out
25+
// RUN: env SYCL_UR_TRACE=2 %{run} %t3.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-NO-VAR
26+
// 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
27+
// RUN: %{build} -DUSE_NEW_API=1 -DUSE_AUTO_GRF=1 -o %t4.out
28+
// RUN: env SYCL_UR_TRACE=2 %{run} %t4.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-NO-VAR
29+
// 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
3030
#include "../helpers.hpp"
3131
#include <iostream>
3232
#include <sycl/detail/core.hpp>

‎sycl/test-e2e/ESIMD/grf.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515

1616
// REQUIRES: arch-intel_gpu_pvc
1717
// invokes 'urProgramBuild'/'urKernelCreate'
18-
// RUN: %{build} -o %t.out
19-
// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR
20-
// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR
21-
// RUN: %{build} -DUSE_NEW_API=1 -o %t.out
22-
// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR
23-
// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR
24-
// RUN: %{build} -DUSE_AUTO -o %t.out
25-
// RUN: env SYCL_UR_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-NO-VAR
26-
// 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
18+
// RUN: %{build} -o %t1.out
19+
// RUN: env SYCL_UR_TRACE=2 %{run} %t1.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR
20+
// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t1.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR
21+
// RUN: %{build} -DUSE_NEW_API=1 -o %t2.out
22+
// RUN: env SYCL_UR_TRACE=2 %{run} %t2.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR
23+
// RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" SYCL_UR_TRACE=2 %{run} %t2.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR
24+
// RUN: %{build} -DUSE_AUTO -o %t3.out
25+
// RUN: env SYCL_UR_TRACE=2 %{run} %t3.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-NO-VAR
26+
// 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
2727
#include "esimd_test_utils.hpp"
2828

2929
#if defined(USE_NEW_API) || defined(USE_AUTO)

‎sycl/test-e2e/KernelAndProgram/kernel-bundle-merge-options-env.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// REQUIRES: gpu
22
// Disable fallback assert here so, that build process isn't affected
3-
// RUN: %{build} -DSYCL_DISABLE_FALLBACK_ASSERT=1 -o %t.out %debug_option
4-
// 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
3+
// RUN: %{build} -DSYCL_DISABLE_FALLBACK_ASSERT=1 -o %t1.out %debug_option
4+
// 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
55
// Check that options are overrided
6-
// 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
7-
// 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
6+
// 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
7+
// 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
88
// UNSUPPORTED: hip
99

1010
#include "kernel-bundle-merge-options.hpp"

‎sycl/test-e2e/PerformanceTests/ParallelFor/parallel_for_range_roundup.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// RUN: echo "Running parallel_for benchmark without range rounding"
2-
// RUN: %{build} -fsycl-range-rounding=disable -o %t.out
3-
// RUN: %{run} %t.out
2+
// RUN: %{build} -fsycl-range-rounding=disable -o %t1.out
3+
// RUN: %{run} %t1.out
44

55
// RUN: echo "Running parallel_for benchmark with normal range rounding"
6-
// RUN: %{build} -fsycl-range-rounding=force -o %t.out
7-
// RUN: %{run} %t.out
6+
// RUN: %{build} -fsycl-range-rounding=force -o %t2.out
7+
// RUN: %{run} %t2.out
88

99
// RUN: echo "Running parallel_for benchmark with experimental range rounding"
10-
// RUN: %{build} -fsycl-exp-range-rounding -fsycl-range-rounding=force -o %t.out
11-
// RUN: %{run} %t.out
10+
// RUN: %{build} -fsycl-exp-range-rounding -fsycl-range-rounding=force -o %t3.out
11+
// RUN: %{run} %t3.out
1212

1313
#include <chrono>
1414
#include <iostream>

‎sycl/test-e2e/SeparateCompile/sycl-external.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
// different object file.
33
// RUN: %{build} -DSOURCE1 -c -o %t1.o
44
// RUN: %{build} -DSOURCE2 -c -o %t2.o
5-
// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t1.o %t2.o -Wno-unused-command-line-argument -o %t.exe
6-
// RUN: %{run} %t.exe
5+
// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t1.o %t2.o -Wno-unused-command-line-argument -o %t1.exe
6+
// RUN: %{run} %t1.exe
77
//
88
// Test2 - check that kernel can call a SYCL_EXTERNAL function defined in a
99
// static library.
1010
// RUN: rm -f %t.a
1111
// RUN: llvm-ar crv %t.a %t1.o
12-
// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t2.o %t.a -Wno-unused-command-line-argument -o %t.exe
13-
// RUN: %{run} %t.exe
12+
// RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %t2.o %t.a -Wno-unused-command-line-argument -o %t2.exe
13+
// RUN: %{run} %t2.exe
1414

1515
#include <iostream>
1616
#include <sycl/detail/core.hpp>

‎sycl/test-e2e/SubGroup/sub_group_as.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
// RUN: %{build} -o %t.out -Wno-deprecated-declarations
2-
// RUN: %{run} %t.out
1+
// RUN: %{build} -o %t1.out -Wno-deprecated-declarations
2+
// RUN: %{run} %t1.out
33
//
4-
// RUN: %{build} -DUSE_DEPRECATED_LOCAL_ACC -o %t.out -Wno-deprecated-declarations
5-
// RUN: %{run} %t.out
4+
// RUN: %{build} -DUSE_DEPRECATED_LOCAL_ACC -o %t2.out -Wno-deprecated-declarations
5+
// RUN: %{run} %t2.out
66

77
#include <cassert>
88
#include <cstdint>

‎sycl/test-e2e/SubGroup/sub_group_as_vec.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
// RUN: %{build} -o %t.out -Wno-deprecated-declarations
2-
// RUN: %{run} %t.out
1+
// RUN: %{build} -o %t1.out -Wno-deprecated-declarations
2+
// RUN: %{run} %t1.out
33
//
4-
// RUN: %{build} -DUSE_DEPRECATED_LOCAL_ACC -o %t.out -Wno-deprecated-declarations
5-
// RUN: %{run} %t.out
4+
// RUN: %{build} -DUSE_DEPRECATED_LOCAL_ACC -o %t2.out -Wno-deprecated-declarations
5+
// RUN: %{run} %t2.out
66

77
#include "helper.hpp"
88
#include <cassert>

0 commit comments

Comments
 (0)