Skip to content

Commit f498bd5

Browse files
committed
Clear tests using fsycl-device-lib-jit-link
Signed-off-by: jinge90 <[email protected]>
1 parent ec63ea9 commit f498bd5

26 files changed

+11
-152
lines changed

clang/test/Driver/sycl-device-lib-old-model.cpp

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66

77
/// ###########################################################################
88

9-
/// test behavior of device library default link and fno-sycl-device-lib-jit-link
9+
/// test behavior of device library default link
1010
// RUN: %clangxx -fsycl --no-offload-new-driver %s --sysroot=%S/Inputs/SYCL -### 2>&1 \
1111
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT
12-
// RUN: %clangxx -fsycl --no-offload-new-driver -fno-sycl-device-lib-jit-link %s --sysroot=%S/Inputs/SYCL -### 2>&1 \
12+
// RUN: %clangxx -fsycl --no-offload-new-driver %s --sysroot=%S/Inputs/SYCL -### 2>&1 \
1313
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT
1414
// RUN: %clangxx -fsycl --no-offload-new-driver %s -fsycl-device-lib=libc --sysroot=%S/Inputs/SYCL -### 2>&1 \
1515
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT
16-
// RUN: %clangxx -fsycl --no-offload-new-driver -fno-sycl-device-lib-jit-link %s -fsycl-device-lib=libc --sysroot=%S/Inputs/SYCL -### 2>&1 \
16+
// RUN: %clangxx -fsycl --no-offload-new-driver %s -fsycl-device-lib=libc --sysroot=%S/Inputs/SYCL -### 2>&1 \
1717
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT
1818
// RUN: %clangxx -fsycl --no-offload-new-driver %s -fsycl-device-lib=libm-fp32 --sysroot=%S/Inputs/SYCL -### 2>&1 \
1919
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT
@@ -37,13 +37,6 @@
3737
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: "{{.*}}libsycl-fallback-imf-fp64.bc"
3838
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: "{{.*}}libsycl-fallback-imf-bf16.bc"
3939

40-
/// ###########################################################################
41-
/// test sycl fallback device libraries are not linked by default
42-
// RUN: %clangxx -fsycl --no-offload-new-driver -fsycl-device-lib-jit-link %s --sysroot=%S/Inputs/SYCL -### 2>&1 \
43-
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_NO_FALLBACK
44-
// SYCL_DEVICE_LIB_NO_FALLBACK: llvm-link{{.*}} "{{.*}}libsycl-crt.bc"
45-
// SYCL_DEVICE_LIB_NO_FALLBACK-NOT: "{{.*}}libsycl-fallback-{{.*}}.bc"
46-
4740
/// ###########################################################################
4841
/// test behavior of device library link with libm-fp64
4942
// RUN: %clangxx -fsycl --no-offload-new-driver %s -fsycl-device-lib=libm-fp64 --sysroot=%S/Inputs/SYCL -### 2>&1 \

clang/test/Driver/sycl-device-lib-win.cpp

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66

77
/// ###########################################################################
88

9-
/// test behavior of device library default link and fno-sycl-device-lib-jit-link
9+
/// test behavior of device library default link
1010
// RUN: %clangxx -fsycl %s --sysroot=%S/Inputs/SYCL -### 2>&1 \
1111
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT
12-
// RUN: %clangxx -fsycl -fno-sycl-device-lib-jit-link %s --sysroot=%S/Inputs/SYCL -### 2>&1 \
12+
// RUN: %clangxx -fsycl %s --sysroot=%S/Inputs/SYCL -### 2>&1 \
1313
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT
1414
// RUN: %clangxx -fsycl %s -fsycl-device-lib=libc --sysroot=%S/Inputs/SYCL -### 2>&1 \
1515
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT
16-
// RUN: %clangxx -fsycl -fno-sycl-device-lib-jit-link %s -fsycl-device-lib=libc --sysroot=%S/Inputs/SYCL -### 2>&1 \
16+
// RUN: %clangxx -fsycl %s -fsycl-device-lib=libc --sysroot=%S/Inputs/SYCL -### 2>&1 \
1717
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT
1818
// RUN: %clangxx -fsycl %s -fsycl-device-lib=libm-fp32 --sysroot=%S/Inputs/SYCL -### 2>&1 \
1919
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT
@@ -37,13 +37,6 @@
3737
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: "{{.*}}libsycl-fallback-imf-fp64.bc"
3838
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: "{{.*}}libsycl-fallback-imf-bf16.bc"
3939

40-
/// ###########################################################################
41-
/// test sycl fallback device libraries are not linked when using jit link.
42-
// RUN: %clangxx -fsycl -fsycl-device-lib-jit-link %s --sysroot=%S/Inputs/SYCL -### 2>&1 \
43-
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_NO_FALLBACK
44-
// SYCL_DEVICE_LIB_NO_FALLBACK: llvm-link{{.*}} "{{.*}}libsycl-crt.bc"
45-
// SYCL_DEVICE_LIB_NO_FALLBACK-NOT: "{{.*}}libsycl-fallback-{{.*}}.bc"
46-
4740
/// ###########################################################################
4841
/// test behavior of device library link with libm-fp64
4942
// RUN: %clangxx -fsycl %s -fsycl-device-lib=libm-fp64 --sysroot=%S/Inputs/SYCL -### 2>&1 \

clang/test/Driver/sycl-device-lib.cpp

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66

77
/// ###########################################################################
88

9-
/// test behavior of device library default link and fno-sycl-device-lib-jit-link
9+
/// test behavior of device library default link
1010
// RUN: %clangxx -fsycl --offload-new-driver %s --sysroot=%S/Inputs/SYCL -### 2>&1 \
1111
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT
12-
// RUN: %clangxx -fsycl --offload-new-driver -fno-sycl-device-lib-jit-link %s --sysroot=%S/Inputs/SYCL -### 2>&1 \
12+
// RUN: %clangxx -fsycl --offload-new-driver %s --sysroot=%S/Inputs/SYCL -### 2>&1 \
1313
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT
1414
// RUN: %clangxx -fsycl --offload-new-driver %s -fsycl-device-lib=libc --sysroot=%S/Inputs/SYCL -### 2>&1 \
1515
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT
16-
// RUN: %clangxx -fsycl --offload-new-driver -fno-sycl-device-lib-jit-link %s -fsycl-device-lib=libc --sysroot=%S/Inputs/SYCL -### 2>&1 \
16+
// RUN: %clangxx -fsycl --offload-new-driver %s -fsycl-device-lib=libc --sysroot=%S/Inputs/SYCL -### 2>&1 \
1717
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT
1818
// RUN: %clangxx -fsycl --offload-new-driver %s -fsycl-device-lib=libm-fp32 --sysroot=%S/Inputs/SYCL -### 2>&1 \
1919
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_LINK_DEFAULT
@@ -37,13 +37,6 @@
3737
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: {{.*}}libsycl-fallback-imf-fp64.new.o
3838
// SYCL_DEVICE_LIB_LINK_DEFAULT-SAME: {{.*}}libsycl-fallback-imf-bf16.new.o
3939

40-
/// ###########################################################################
41-
/// test sycl fallback device libraries are not linked by default
42-
// RUN: %clangxx -fsycl --offload-new-driver -fsycl-device-lib-jit-link %s --sysroot=%S/Inputs/SYCL -### 2>&1 \
43-
// RUN: | FileCheck %s -check-prefix=SYCL_DEVICE_LIB_NO_FALLBACK
44-
// SYCL_DEVICE_LIB_NO_FALLBACK: clang-linker-wrapper{{.*}} "-sycl-device-libraries=libsycl-crt.new.o
45-
// SYCL_DEVICE_LIB_NO_FALLBACK-NOT: libsycl-fallback
46-
4740
/// ###########################################################################
4841
/// test behavior of device library link with libm-fp64
4942
// RUN: %clangxx -fsycl --offload-new-driver %s -fsycl-device-lib=libm-fp64 --sysroot=%S/Inputs/SYCL -### 2>&1 \

clang/test/Driver/sycl-specific-args-diagnostics.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@
2222
// RUN: %clang_cl -### -fsycl-dead-args-optimization %s 2>&1 \
2323
// RUN: | FileCheck -check-prefix=WARNING-UNUSED-ARG -DOPT=-fsycl-dead-args-optimization %s
2424

25-
// Warning should be emitted when using -fsycl-device-lib-jit-link without -fsycl
26-
// RUN: %clang -### -fsycl-device-lib-jit-link %s 2>&1 \
27-
// RUN: | FileCheck -check-prefix=WARNING-UNUSED-ARG -DOPT=-fsycl-device-lib-jit-link %s
28-
// RUN: %clang_cl -### -fsycl-device-lib-jit-link %s 2>&1 \
29-
// RUN: | FileCheck -check-prefix=WARNING-UNUSED-ARG -DOPT=-fsycl-device-lib-jit-link %s
30-
3125
// Warning should be emitted when using -fsycl-default-sub-group-size= without -fsycl
3226
// RUN: %clang -### -fsycl-default-sub-group-size=10 %s 2>&1 \
3327
// RUN: | FileCheck -check-prefix=WARNING-UNUSED-ARG -DOPT=-fsycl-default-sub-group-size=10 %s

sycl/test-e2e/DeviceImageDependencies/NewOffloadDriver/math_device_lib.cpp

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

sycl/test-e2e/DeviceImageDependencies/math_device_lib.cpp

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

sycl/test-e2e/DeviceLib/cmath_fp64_test.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
// RUN: %{build} %{mathflags} -o %t1.out
99
// RUN: %{run} %t1.out
1010

11-
// RUN: %{build} -fsycl-device-lib-jit-link %{mathflags} -o %t2.out
12-
// RUN: %{run} %t2.out
13-
1411
#include "math_utils.hpp"
1512
#include <cmath>
1613
#include <cstdint>

sycl/test-e2e/DeviceLib/cmath_test.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,9 @@
55
// RUN: %{build} -fno-builtin %{mathflags} -o %t1.out
66
// RUN: %{run} %t1.out
77

8-
// RUN: %{build} -Wno-error=unused-command-line-argument -fno-builtin -fsycl-device-lib-jit-link %{mathflags} -o %t2.out
9-
// RUN: %if !gpu %{ %{run} %t2.out %}
10-
//
118
// // Check that --fast-math works with cmath funcs for CUDA
12-
// RUN: %if target-nvidia %{ %clangxx -fsycl -fsycl-targets=nvptx64-nvidia-cuda %s -Wno-nan-infinity-disabled -fno-builtin %{mathflags} -o %t3.out -ffast-math -DSYCL_E2E_FASTMATH %}
13-
// RUN: %if cuda %{ %{run} %t3.out %}
9+
// RUN: %if target-nvidia %{ %clangxx -fsycl -fsycl-targets=nvptx64-nvidia-cuda %s -Wno-nan-infinity-disabled -fno-builtin %{mathflags} -o %t2.out -ffast-math -DSYCL_E2E_FASTMATH %}
10+
// RUN: %if cuda %{ %{run} %t2.out %}
1411

1512
#include "math_utils.hpp"
1613
#include <cmath>

sycl/test-e2e/DeviceLib/imf_bfloat16_integeral_convesions.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
// RUN: %{build} -o %t1.out
22
// RUN: %{run} %t1.out
33

4-
// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out
5-
// RUN: %{run} %t2.out
6-
//
74
// UNSUPPORTED: target-nvidia || target-amd
85

96
// Windows doesn't yet have full shutdown().

sycl/test-e2e/DeviceLib/imf_double2bfloat16.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
// RUN: %{build} -o %t.out
44
// RUN: %{run} %t.out
55

6-
// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t1.out
7-
// RUN: %{run} %t1.out
8-
//
96
// UNSUPPORTED: target-nvidia || target-amd
107

118
#include "imf_utils.hpp"

sycl/test-e2e/DeviceLib/imf_double2half.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
// RUN: %{build} -o %t1.out
55
// RUN: %{run} %t1.out
66

7-
// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out
8-
// RUN: %{run} %t2.out
9-
107
// UNSUPPORTED: target-nvidia, target-amd
118

129
#include "imf_utils.hpp"

sycl/test-e2e/DeviceLib/imf_float2bfloat16.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
// RUN: %{build} -o %t1.out
22
// RUN: %{run} %t1.out
33

4-
// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out
5-
// RUN: %{run} %t2.out
6-
//
74
// UNSUPPORTED: target-nvidia || target-amd
85

96
// All __imf_* bf16 functions are implemented via fp32 emulation, so we don't

sycl/test-e2e/DeviceLib/imf_fp32_rounding_test.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
// RUN: %{build} -o %t1.out
22
// RUN: %{run} %t1.out
33

4-
// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out
5-
// RUN: %{run} %t2.out
6-
//
74
// UNSUPPORTED: target-nvidia || target-amd
85

96
#include "imf_utils.hpp"

sycl/test-e2e/DeviceLib/imf_fp32_test.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
// RUN: %{build} -o %t1.out
22
// RUN: %{run} %t1.out
33

4-
// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out
5-
// RUN: %{run} %t2.out
6-
//
74
// UNSUPPORTED: target-nvidia || target-amd
85

96
// Windows doesn't yet have full shutdown().

sycl/test-e2e/DeviceLib/imf_fp64_rounding_test.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
// RUN: %{build} -o %t1.out
33
// RUN: %{run} %t1.out
44

5-
// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out
6-
// RUN: %{run} %t2.out
7-
//
85
// UNSUPPORTED: target-nvidia || target-amd
96

107
// Depends on SPIR-V Backend & run-time drivers version.

sycl/test-e2e/DeviceLib/imf_fp64_test.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
// RUN: %{build} -o %t1.out
33
// RUN: %{run} %t1.out
44

5-
// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out
6-
// RUN: %{run} %t2.out
7-
//
85
// UNSUPPORTED: target-nvidia || target-amd
96
#include "imf_utils.hpp"
107
#include <sycl/ext/intel/math.hpp>

sycl/test-e2e/DeviceLib/imf_fp64_test2.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
// RUN: %{build} -o %t1.out
33
// RUN: %{run} %t1.out
44

5-
// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out
6-
// RUN: %{run} %t2.out
7-
//
85
// UNSUPPORTED: target-nvidia || target-amd
96

107
#include "imf_utils.hpp"

sycl/test-e2e/DeviceLib/imf_half_type_cast.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
// RUN: %{build} -o %t1.out
55
// RUN: %{run} %t1.out
66

7-
// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out
8-
// RUN: %{run} %t2.out
9-
107
// UNSUPPORTED: target-nvidia, target-amd
118

129
// Windows doesn't yet have full shutdown().

sycl/test-e2e/DeviceLib/imf_simd_emulate_test.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
// RUN: %{build} -o %t1.out
22
// RUN: %{run} %t1.out
33

4-
// RUN: %{build} -fno-builtin -fsycl-device-lib-jit-link -o %t2.out
5-
// RUN: %{run} %t2.out
6-
//
74
// UNSUPPORTED: target-nvidia || target-amd
85

96
// UNSUPPORTED: igc-dev

sycl/test-e2e/DeviceLib/math_fp64_test.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
// RUN: %{build} %{mathflags} -o %t1.out
88
// RUN: %{run} %t1.out
99

10-
// RUN: %clangxx -Wno-error=unused-command-line-argument -fsycl -fsycl-device-lib-jit-link %{mathflags} %s -o %t2.out
11-
// RUN: %if !gpu %{ %{run} %t2.out %}
12-
1310
#include "math_utils.hpp"
1411
#include <cstdint>
1512
#include <iostream>

sycl/test-e2e/DeviceLib/math_fp64_windows_test.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
// RUN: %{build} %{mathflags} -o %t.out
66
// RUN: %{run} %t.out
77

8-
// RUN: %clangxx -fsycl -fsycl-device-lib-jit-link %{mathflags} %s -o %t.out
9-
// RUN: %if !gpu %{ %{run} %t.out %}
10-
118
#include "math_utils.hpp"
129
#include <iostream>
1310
#include <math.h>

sycl/test-e2e/DeviceLib/math_test.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
// RUN: %{build} %{mathflags} -o %t1.out
66
// RUN: %{run} %t1.out
77

8-
// RUN: %{build} -Wno-error=unused-command-line-argument -fsycl-device-lib-jit-link %{mathflags} -o %t2.out
9-
// RUN: %if !gpu %{ %{run} %t2.out %}
10-
118
#include "math_utils.hpp"
129
#include <cstdint>
1310
#include <iostream>

sycl/test-e2e/DeviceLib/math_windows_test.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
// RUN: %{build} %{mathflags} -o %t.out
88
// RUN: %{run} %t.out
99

10-
// RUN: %clangxx -fsycl -fsycl-device-lib-jit-link %{mathflags} %s -o %t.out
11-
// RUN: %if !gpu %{ %{run} %t.out %}
12-
1310
#include "math_utils.hpp"
1411
#include <iostream>
1512
#include <math.h>

sycl/test-e2e/DeviceLib/std_complex_math_fp64_test.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
// RUN: %{build} -o %t1.out
55
// RUN: %{run} %t1.out
66

7-
// RUN: %{build} -fsycl-device-lib-jit-link -o %t2.out
8-
// RUN: %{run} %t2.out
9-
107
#include <array>
118
#include <cassert>
129
#include <complex>

sycl/test-e2e/DeviceLib/std_complex_math_test.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// RUN: %{build} %{mathflags} -o %t1.out
33
// RUN: %{run} %t1.out
44

5-
// RUN: %{build} -fsycl-device-lib-jit-link %{mathflags} -o %t2.out
6-
// RUN: %{run} %t2.out
75

86
#include <array>
97
#include <cassert>

sycl/test-e2e/DeviceLib/string_test.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
// RUN: %{build} -Wno-error=deprecated-declarations -Wno-error=pointer-to-int-cast -fno-builtin -o %t1.out
22
// RUN: %{run} %t1.out
33
//
4-
// 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
5-
// RUN: %if !gpu %{ %{run} %t2.out %}
6-
74
#include <cassert>
85
#include <cstdint>
96
#include <cstring>

0 commit comments

Comments
 (0)