Skip to content

Commit 76d4f3d

Browse files
committed
Address code review feedback.
1 parent d0d8337 commit 76d4f3d

File tree

3 files changed

+20
-7
lines changed

3 files changed

+20
-7
lines changed

clang/lib/Driver/ToolChains/Clang.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11486,12 +11486,11 @@ void LinkerWrapper::ConstructJob(Compilation &C, const JobAction &JA,
1148611486
if (Args.hasArg(options::OPT_fsycl_embed_ir))
1148711487
CmdArgs.push_back(Args.MakeArgString("-sycl-embed-ir"));
1148811488

11489-
if (Args.hasArg(options::OPT_fsycl_allow_device_image_dependencies))
11489+
if (Args.hasArg(options::OPT_fsycl_allow_device_image_dependencies,
11490+
options::OPT_fno_sycl_allow_device_image_dependencies,
11491+
false))
1149011492
CmdArgs.push_back(
1149111493
Args.MakeArgString("-sycl-allow-device-image-dependencies"));
11492-
if (Args.hasArg(options::OPT_fno_sycl_allow_device_image_dependencies))
11493-
CmdArgs.push_back(
11494-
Args.MakeArgString("-no-sycl-allow-device-image-dependencies"));
1149511494

1149611495
// Formulate and add any offload-wrapper and AOT specific options. These
1149711496
// are additional options passed in via -Xsycl-target-linker and

clang/test/Driver/sycl-offload-new-driver.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,3 +195,20 @@
195195
// RUN: --offload-new-driver 2>&1 \
196196
// RUN: | FileCheck -check-prefix NVPTX_CUDA_PATH %s
197197
// NVPTX_CUDA_PATH: clang-linker-wrapper{{.*}} "--cuda-path={{.*}}Inputs/CUDA_80/usr/local/cuda"
198+
199+
/// Check for -sycl-allow-device-image-dependencies transmission to clang-linker-wrapper tool
200+
// RUN: %clangxx -fsycl -### --offload-new-driver \
201+
// RUN: -fsycl-allow-device-image-dependencies %s 2>&1 \
202+
// RUN: | FileCheck -check-prefix CHECK_DYNAMIC_LINKING %s
203+
// CHECK_DYNAMIC_LINKING: clang-linker-wrapper{{.*}} "-sycl-allow-device-image-dependencies"
204+
205+
/// Check for -sycl-allow-device-image-dependencies transmission to clang-linker-wrapper tool
206+
// RUN: %clangxx -fsycl -### --offload-new-driver \
207+
// RUN: -fno-sycl-allow-device-image-dependencies %s 2>&1 \
208+
// RUN: | FileCheck -check-prefix CHECK_NO_DYNAMIC_LINKING %s
209+
// CHECK_NO_DYNAMIC_LINKING-NOT: clang-linker-wrapper{{.*}} "-sycl-allow-device-image-dependencies"
210+
211+
/// Check for -sycl-allow-device-image-dependencies transmission to clang-linker-wrapper tool
212+
// RUN: %clangxx -fsycl -### --offload-new-driver %s 2>&1 \
213+
// RUN: | FileCheck -check-prefix CHECK_NO_DYNAMIC_LINKING %s
214+
// CHECK_NO_DYNAMIC_LINKING-NOT: clang-linker-wrapper{{.*}} "-sycl-allow-device-image-dependencies"

clang/tools/clang-linker-wrapper/LinkerWrapperOpts.td

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,3 @@ def sycl_dump_device_code_EQ : Joined<["--", "-"], "sycl-dump-device-code=">,
248248
def sycl_allow_device_image_dependencies : Flag<["--", "-"], "sycl-allow-device-image-dependencies">,
249249
Flags<[WrapperOnlyOption, HelpHidden]>,
250250
HelpText<"Allow dependencies between device code images">;
251-
def no_sycl_allow_device_image_dependencies : Flag<["--", "-"], "no-sycl-allow-device-image-dependencies">,
252-
Flags<[WrapperOnlyOption, HelpHidden]>,
253-
HelpText<"Dno not allow dependencies between device code images (default)">;

0 commit comments

Comments
 (0)