Skip to content

Commit cccff98

Browse files
jinge90jinge90
committed
Add -fno-sycl-devicelib to disable device lib auto link
Signed-off-by: gejin <[email protected]>
1 parent 49845e5 commit cccff98

File tree

7 files changed

+60
-57
lines changed

7 files changed

+60
-57
lines changed

‎clang/include/clang/Driver/Options.td‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3531,7 +3531,8 @@ def fsycl_esimd : Flag<["-"], "fsycl-explicit-simd">, Group<sycl_Group>, Flags<[
35313531
def fno_sycl_esimd : Flag<["-"], "fno-sycl-explicit-simd">, Group<sycl_Group>,
35323532
HelpText<"Disable SYCL explicit SIMD extension">, Flags<[NoArgumentUnused, CoreOption]>;
35333533
defm sycl_std_optimizations : OptOutFFlag<"sycl-std-optimizations", "Enable", "Disable", " standard optimization pipeline for SYCL device compiler">;
3534-
3534+
def fno_sycl_devicelib : Flag<["-"], "fno-sycl-devicelib">, Group<sycl_Group>,
3535+
HelpText<"Disable SYCL device library link with kernel code">, Flags<[NoArgumentUnused, CoreOption]>;
35353536
//===----------------------------------------------------------------------===//
35363537
// CC1 Options
35373538
//===----------------------------------------------------------------------===//

‎clang/lib/Driver/Driver.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3924,7 +3924,8 @@ class OffloadingActionBuilder final {
39243924
}
39253925

39263926
// For SYCL compilation, add SYCL device libraries as default.
3927-
if (!isNVPTX && !Args.hasArg(options::OPT_fintelfpga)) {
3927+
if (!isNVPTX && !Args.hasArg(options::OPT_fintelfpga) &&
3928+
!Args.hasArg(options::OPT_fno_sycl_devicelib)) {
39283929
addSYCLDeviceLibs(
39293930
*TC, LinkObjects, isSpirvAOT,
39303931
C.getDefaultToolChain().getTriple().isWindowsMSVCEnvironment());
@@ -4008,7 +4009,8 @@ class OffloadingActionBuilder final {
40084009
: types::TY_Tempfiletable;
40094010
SYCLPostLinkJobAction *PostLinkDCRAction = nullptr;
40104011
SYCLPostLinkJobAction *PostLinkAction = nullptr;
4011-
if (isNVPTX || Args.hasArg(options::OPT_fintelfpga)) {
4012+
if (isNVPTX || Args.hasArg(options::OPT_fintelfpga) ||
4013+
Args.hasArg(options::OPT_fno_sycl_devicelib)) {
40124014
PostLinkAction = C.MakeAction<SYCLPostLinkJobAction>(DeviceLinkAction,
40134015
PostLinkOutType);
40144016
} else {

‎clang/test/Driver/sycl-offload-static-lib-2.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@
9999
/// ###########################################################################
100100

101101
/// test behaviors of static lib with no source/object
102-
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -L/dummy/dir %t.a -### 2>&1 \
102+
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-devicelib -L/dummy/dir %t.a -### 2>&1 \
103103
// RUN: | FileCheck %s -check-prefix=STATIC_LIB_NOSRC -DINPUTLIB=%t.a
104-
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -L/dummy/dir %t.lo -### 2>&1 \
104+
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-devicelib -L/dummy/dir %t.lo -### 2>&1 \
105105
// RUN: | FileCheck %s -check-prefix=STATIC_LIB_NOSRC -DINPUTLIB=%t.lo
106106
// STATIC_LIB_NOSRC: clang-offload-bundler{{.*}} "-type=ao" "-targets=host-x86_64-unknown-linux-gnu" "-inputs=[[INPUTLIB]]" "-check-section"
107107
// STATIC_LIB_NOSRC: ld{{.*}} "-r" "-o" "[[PARTIALOBJ:.+\.o]]" "{{.*}}crt1.o" {{.*}} "-L/dummy/dir" {{.*}} "[[INPUTLIB]]"

‎clang/test/Driver/sycl-offload-static-lib.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
/// test behaviors of -foffload-static-lib=<lib> from source
4949
// RUN: touch %t.a
50-
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -foffload-static-lib=%t.a -ccc-print-phases %s 2>&1 \
50+
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-devicelib -foffload-static-lib=%t.a -ccc-print-phases %s 2>&1 \
5151
// RUN: | FileCheck %s -check-prefix=FOFFLOAD_STATIC_LIB_SRC
5252

5353
// FOFFLOAD_STATIC_LIB_SRC: 0: input, "[[INPUTA:.+\.a]]", object, (host-sycl)
@@ -122,9 +122,9 @@
122122
/// ###########################################################################
123123

124124
/// test behaviors of -foffload-static-lib with no source/object
125-
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -L/dummy/dir -foffload-static-lib=%t.a -### -ccc-print-phases 2>&1 \
125+
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-devicelib -L/dummy/dir -foffload-static-lib=%t.a -### -ccc-print-phases 2>&1 \
126126
// RUN: | FileCheck %s -check-prefixes=FOFFLOAD_STATIC_LIB_NOSRC_PHASES,FOFFLOAD_STATIC_LIB_NOSRC_PHASES_1
127-
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -L/dummy/dir -foffload-whole-static-lib=%t.a -### -ccc-print-phases 2>&1 \
127+
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-devicelib -L/dummy/dir -foffload-whole-static-lib=%t.a -### -ccc-print-phases 2>&1 \
128128
// RUN: | FileCheck %s -check-prefixes=FOFFLOAD_STATIC_LIB_NOSRC_PHASES,FOFFLOAD_STATIC_LIB_NOSRC_PHASES_2
129129
// FOFFLOAD_STATIC_LIB_NOSRC_PHASES: 0: input, "[[INPUTA:.+\.a]]", object, (host-sycl)
130130
// FOFFLOAD_STATIC_LIB_NOSRC_PHASES: 1: linker, {0}, image, (host-sycl)

‎clang/test/Driver/sycl-offload-win.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757

5858
/// Test behaviors of -foffload-static-lib=<lib> from source.
5959
// RUN: touch %t.lib
60-
// RUN: %clang --target=x86_64-pc-windows-msvc -fsycl -foffload-static-lib=%t.lib -ccc-print-phases %s 2>&1 \
60+
// RUN: %clang --target=x86_64-pc-windows-msvc -fsycl -fno-sycl-devicelib -foffload-static-lib=%t.lib -ccc-print-phases %s 2>&1 \
6161
// RUN: | FileCheck -DLIB=%t.lib %s -check-prefix=FOFFLOAD_STATIC_LIB_SRC
62-
// RUN: %clang_cl --target=x86_64-pc-windows-msvc -fsycl -foffload-static-lib=%t.lib -ccc-print-phases %s 2>&1 \
62+
// RUN: %clang_cl --target=x86_64-pc-windows-msvc -fsycl -fno-sycl-devicelib -foffload-static-lib=%t.lib -ccc-print-phases %s 2>&1 \
6363
// RUN: | FileCheck -DLIB=%t.lib %s -check-prefix=FOFFLOAD_STATIC_LIB_SRC
6464

6565
// FOFFLOAD_STATIC_LIB_SRC: 0: input, "[[INPUTLIB:.+\.lib]]", object, (host-sycl)

‎clang/test/Driver/sycl-offload-with-split.c‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212
/// preprocessor and another one joining the device linking outputs to the host
1313
/// action. The same graph should be generated when no -fsycl-targets is used
1414
/// The same phase graph will be used with -fsycl-use-bitcode
15-
// RUN: %clang -ccc-print-phases -target x86_64-unknown-linux-gnu -fsycl -fsycl-device-code-split -fsycl-targets=spir64-unknown-unknown-sycldevice %s 2>&1 \
15+
// RUN: %clang -ccc-print-phases -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-devicelib -fsycl-device-code-split -fsycl-targets=spir64-unknown-unknown-sycldevice %s 2>&1 \
1616
// RUN: | FileCheck -check-prefixes=CHK-PHASES,CHK-PHASES-DEFAULT-MODE %s
17-
// RUN: %clang_cl -ccc-print-phases -fsycl -fsycl-device-code-split=per_source -fsycl-targets=spir64-unknown-unknown-sycldevice %s 2>&1 \
17+
// RUN: %clang_cl -ccc-print-phases -fsycl -fno-sycl-devicelib -fsycl-device-code-split=per_source -fsycl-targets=spir64-unknown-unknown-sycldevice %s 2>&1 \
1818
// RUN: | FileCheck -check-prefixes=CHK-PHASES,CHK-PHASES-CL-MODE %s
19-
// RUN: %clang -ccc-print-phases -target x86_64-unknown-linux-gnu -fsycl -fsycl-device-code-split=per_source -fno-sycl-use-bitcode %s 2>&1 \
19+
// RUN: %clang -ccc-print-phases -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-devicelib -fsycl-device-code-split=per_source -fno-sycl-use-bitcode %s 2>&1 \
2020
// RUN: | FileCheck -check-prefixes=CHK-PHASES,CHK-PHASES-DEFAULT-MODE %s
21-
// RUN: %clang_cl -ccc-print-phases -fsycl -fsycl-device-code-split=per_source -fno-sycl-use-bitcode %s 2>&1 \
21+
// RUN: %clang_cl -ccc-print-phases -fsycl -fno-sycl-devicelib -fsycl-device-code-split=per_source -fno-sycl-use-bitcode %s 2>&1 \
2222
// RUN: | FileCheck -check-prefixes=CHK-PHASES,CHK-PHASES-CL-MODE %s
23-
// RUN: %clang -ccc-print-phases -target x86_64-unknown-linux-gnu -fsycl -fsycl-device-code-split=per_source -fsycl-use-bitcode %s 2>&1 \
23+
// RUN: %clang -ccc-print-phases -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-devicelib -fsycl-device-code-split=per_source -fsycl-use-bitcode %s 2>&1 \
2424
// RUN: | FileCheck -check-prefixes=CHK-PHASES,CHK-PHASES-DEFAULT-MODE %s
25-
// RUN: %clang_cl -ccc-print-phases -fsycl -fsycl-device-code-split=per_source -fsycl-use-bitcode %s 2>&1 \
25+
// RUN: %clang_cl -ccc-print-phases -fsycl -fno-sycl-devicelib -fsycl-device-code-split=per_source -fsycl-use-bitcode %s 2>&1 \
2626
// RUN: | FileCheck -check-prefixes=CHK-PHASES,CHK-PHASES-CL-MODE %s
2727
// CHK-PHASES: 0: input, "[[INPUT:.+\.c]]", c, (host-sycl)
2828
// CHK-PHASES: 1: preprocessor, {0}, cpp-output, (host-sycl)
@@ -49,7 +49,7 @@
4949

5050
/// Check the phases also add a library to make sure it is treated as input by
5151
/// the device.
52-
// RUN: %clang -ccc-print-phases -target x86_64-unknown-linux-gnu -lsomelib -fsycl -fsycl-device-code-split -fsycl-targets=spir64-unknown-unknown-sycldevice %s 2>&1 \
52+
// RUN: %clang -ccc-print-phases -target x86_64-unknown-linux-gnu -lsomelib -fsycl -fno-sycl-devicelib -fsycl-device-code-split -fsycl-targets=spir64-unknown-unknown-sycldevice %s 2>&1 \
5353
// RUN: | FileCheck -check-prefix=CHK-PHASES-LIB %s
5454
// CHK-PHASES-LIB: 0: input, "somelib", object, (host-sycl)
5555
// CHK-PHASES-LIB: 1: input, "[[INPUT:.+\.c]]", c, (host-sycl)
@@ -75,7 +75,7 @@
7575

7676
/// Check the phases when using and multiple source files
7777
// RUN: echo " " > %t.c
78-
// RUN: %clang -ccc-print-phases -lsomelib -target x86_64-unknown-linux-gnu -fsycl -fsycl-device-code-split -fsycl-targets=spir64-unknown-unknown-sycldevice %s %t.c 2>&1 \
78+
// RUN: %clang -ccc-print-phases -lsomelib -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-devicelib -fsycl-device-code-split -fsycl-targets=spir64-unknown-unknown-sycldevice %s %t.c 2>&1 \
7979
// RUN: | FileCheck -check-prefix=CHK-PHASES-FILES %s
8080

8181
// CHK-PHASES-FILES: 0: input, "somelib", object, (host-sycl)
@@ -112,11 +112,11 @@
112112

113113
/// Check separate compilation with offloading - unbundling actions
114114
// RUN: touch %t.o
115-
// RUN: %clang -### -ccc-print-phases -target x86_64-unknown-linux-gnu -fsycl -fsycl-device-code-split -o %t.out -lsomelib -fsycl-targets=spir64-unknown-unknown-sycldevice %t.o 2>&1 \
115+
// RUN: %clang -### -ccc-print-phases -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-devicelib -fsycl-device-code-split -o %t.out -lsomelib -fsycl-targets=spir64-unknown-unknown-sycldevice %t.o 2>&1 \
116116
// RUN: | FileCheck -DINPUT=%t.o -check-prefix=CHK-UBACTIONS %s
117117
// RUN: mkdir -p %t_dir
118118
// RUN: touch %t_dir/dummy
119-
// RUN: %clang -### -ccc-print-phases -target x86_64-unknown-linux-gnu -fsycl -fsycl-device-code-split -o %t.out -lsomelib -fsycl-targets=spir64-unknown-unknown-sycldevice %t_dir/dummy 2>&1 \
119+
// RUN: %clang -### -ccc-print-phases -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-devicelib -fsycl-device-code-split -o %t.out -lsomelib -fsycl-targets=spir64-unknown-unknown-sycldevice %t_dir/dummy 2>&1 \
120120
// RUN: | FileCheck -DINPUT=%t_dir/dummy -check-prefix=CHK-UBACTIONS %s
121121
// CHK-UBACTIONS: 0: input, "somelib", object, (host-sycl)
122122
// CHK-UBACTIONS: 1: input, "[[INPUT]]", object, (host-sycl)
@@ -134,7 +134,7 @@
134134

135135
/// Check separate compilation with offloading - unbundling with source
136136
// RUN: touch %t.o
137-
// RUN: %clang -### -ccc-print-phases -target x86_64-unknown-linux-gnu -lsomelib -fsycl -fsycl-device-code-split %t.o -fsycl-targets=spir64-unknown-unknown-sycldevice %s 2>&1 \
137+
// RUN: %clang -### -ccc-print-phases -target x86_64-unknown-linux-gnu -lsomelib -fsycl -fno-sycl-devicelib -fsycl-device-code-split %t.o -fsycl-targets=spir64-unknown-unknown-sycldevice %s 2>&1 \
138138
// RUN: | FileCheck -check-prefix=CHK-UBUACTIONS %s
139139
// CHK-UBUACTIONS: 0: input, "somelib", object, (host-sycl)
140140
// CHK-UBUACTIONS: 1: input, "[[INPUT1:.+\.o]]", object, (host-sycl)
@@ -161,11 +161,11 @@
161161
/// ###########################################################################
162162

163163
/// Ahead of Time compilation for fpga, gen, cpu
164-
// RUN: %clang -target x86_64-unknown-linux-gnu -ccc-print-phases -fsycl -fsycl-device-code-split -fsycl-targets=spir64_fpga-unknown-unknown-sycldevice %s 2>&1 \
164+
// RUN: %clang -target x86_64-unknown-linux-gnu -ccc-print-phases -fsycl -fno-sycl-devicelib -fsycl-device-code-split -fsycl-targets=spir64_fpga-unknown-unknown-sycldevice %s 2>&1 \
165165
// RUN: | FileCheck %s -check-prefixes=CHK-PHASES-AOT,CHK-PHASES-FPGA
166-
// RUN: %clang -target x86_64-unknown-linux-gnu -ccc-print-phases -fsycl -fsycl-device-code-split -fsycl-targets=spir64_gen-unknown-unknown-sycldevice %s 2>&1 \
166+
// RUN: %clang -target x86_64-unknown-linux-gnu -ccc-print-phases -fsycl -fno-sycl-devicelib -fsycl-device-code-split -fsycl-targets=spir64_gen-unknown-unknown-sycldevice %s 2>&1 \
167167
// RUN: | FileCheck %s -check-prefixes=CHK-PHASES-AOT,CHK-PHASES-GEN
168-
// RUN: %clang -target x86_64-unknown-linux-gnu -ccc-print-phases -fsycl -fsycl-device-code-split -fsycl-targets=spir64_x86_64-unknown-unknown-sycldevice %s 2>&1 \
168+
// RUN: %clang -target x86_64-unknown-linux-gnu -ccc-print-phases -fsycl -fno-sycl-devicelib -fsycl-device-code-split -fsycl-targets=spir64_x86_64-unknown-unknown-sycldevice %s 2>&1 \
169169
// RUN: | FileCheck %s -check-prefixes=CHK-PHASES-AOT,CHK-PHASES-CPU
170170
// CHK-PHASES-AOT: 0: input, "[[INPUT:.+\.c]]", c, (host-sycl)
171171
// CHK-PHASES-AOT: 1: preprocessor, {0}, cpp-output, (host-sycl)
@@ -196,13 +196,13 @@
196196
/// ###########################################################################
197197

198198
/// Ahead of Time compilation for fpga, gen, cpu - tool invocation
199-
// RUN: %clang -target x86_64-unknown-linux-gnu -fsycl -fsycl-device-code-split -fsycl-targets=spir64_fpga-unknown-unknown-sycldevice %s -### 2>&1 \
199+
// RUN: %clang -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-devicelib -fsycl-device-code-split -fsycl-targets=spir64_fpga-unknown-unknown-sycldevice %s -### 2>&1 \
200200
// RUN: | FileCheck %s -check-prefixes=CHK-TOOLS-AOT,CHK-TOOLS-FPGA
201-
// RUN: %clang -target x86_64-unknown-linux-gnu -fsycl -fsycl-device-code-split -fintelfpga %s -### 2>&1 \
201+
// RUN: %clang -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-devicelib -fsycl-device-code-split -fintelfpga %s -### 2>&1 \
202202
// RUN: | FileCheck %s -check-prefixes=CHK-TOOLS-AOT,CHK-TOOLS-FPGA
203-
// RUN: %clang -target x86_64-unknown-linux-gnu -fsycl -fsycl-device-code-split -fsycl-targets=spir64_gen-unknown-unknown-sycldevice %s -### 2>&1 \
203+
// RUN: %clang -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-devicelib -fsycl-device-code-split -fsycl-targets=spir64_gen-unknown-unknown-sycldevice %s -### 2>&1 \
204204
// RUN: | FileCheck %s -check-prefixes=CHK-TOOLS-AOT,CHK-TOOLS-GEN
205-
// RUN: %clang -target x86_64-unknown-linux-gnu -fsycl -fsycl-device-code-split -fsycl-targets=spir64_x86_64-unknown-unknown-sycldevice %s -### 2>&1 \
205+
// RUN: %clang -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-devicelib -fsycl-device-code-split -fsycl-targets=spir64_x86_64-unknown-unknown-sycldevice %s -### 2>&1 \
206206
// RUN: | FileCheck %s -check-prefixes=CHK-TOOLS-AOT,CHK-TOOLS-CPU
207207
// CHK-TOOLS-AOT: clang{{.*}} "-fsycl-is-device" {{.*}} "-o" "[[OUTPUT1:.+\.bc]]"
208208
// CHK-TOOLS-AOT: llvm-link{{.*}} "[[OUTPUT1]]" "-o" "[[OUTPUT2:.+\.bc]]"
@@ -226,7 +226,7 @@
226226
/// ###########################################################################
227227

228228
/// offload with multiple targets, including AOT
229-
// RUN: %clang -target x86_64-unknown-linux-gnu -fsycl -fsycl-device-code-split -fsycl-targets=spir64-unknown-unknown-sycldevice,spir64_fpga-unknown-unknown-sycldevice,spir64_gen-unknown-unknown-sycldevice -### -ccc-print-phases %s 2>&1 \
229+
// RUN: %clang -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-devicelib -fsycl-device-code-split -fsycl-targets=spir64-unknown-unknown-sycldevice,spir64_fpga-unknown-unknown-sycldevice,spir64_gen-unknown-unknown-sycldevice -### -ccc-print-phases %s 2>&1 \
230230
// RUN: | FileCheck -check-prefix=CHK-PHASE-MULTI-TARG %s
231231
// CHK-PHASE-MULTI-TARG: 0: input, "[[INPUT:.+\.c]]", c, (host-sycl)
232232
// CHK-PHASE-MULTI-TARG: 1: preprocessor, {0}, cpp-output, (host-sycl)

0 commit comments

Comments
 (0)