Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Driver][SYCL] Diagnose SYCL options in non-sycl mode. #10502

Merged
merged 7 commits into from
Jul 25, 2023
Merged

[Driver][SYCL] Diagnose SYCL options in non-sycl mode. #10502

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2f11fab
[Driver][SYCL] Disgnose SYCL options in non-sycl mode.
srividya-sundaram Jul 20, 2023
480aada
Address review comments.
srividya-sundaram Jul 21, 2023
deb33ff
Fix unnecessary parenthesis.
srividya-sundaram Jul 21, 2023
48417af
Update test.
srividya-sundaram Jul 21, 2023
447ae2e
Address review comments.
srividya-sundaram Jul 21, 2023
5e9c88b
Fix naming.
srividya-sundaram Jul 22, 2023
5d0be17
Merge branch 'sycl' into restrict-sycl-specific-option
srividya-sundaram Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions clang/include/clang/Basic/DiagnosticDriverKinds.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,8 @@ def err_drv_fsycl_with_pch : Error<
"Precompiled header generation is not supported with '-fsycl'">;
def err_drv_fsycl_unsupported_with_opt
: Error<"'%0' is not supported with '-fsycl'">;
def err_drv_fsycl_host_compiler_options
: Warning<"'%0' should be used only in conjunction with '-fsycl-host-compiler'">;
def err_drv_sycl_missing_amdgpu_arch : Error<
"missing AMDGPU architecture for SYCL offloading; specify it with '-Xsycl-target-backend --offload-arch'">;
def warn_drv_sycl_offload_target_duplicate : Warning<
Expand Down
25 changes: 23 additions & 2 deletions clang/lib/Driver/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1106,6 +1106,11 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
getArgRequiringSYCLRuntime(options::OPT_fsycl_add_targets_EQ);
Arg *SYCLLink = getArgRequiringSYCLRuntime(options::OPT_fsycl_link_EQ);
Arg *SYCLfpga = getArgRequiringSYCLRuntime(options::OPT_fintelfpga);
// Check if -fsycl-host-compiler is used in conjunction with -fsycl.
Arg *SYCLHostCompiler =
getArgRequiringSYCLRuntime(options::OPT_fsycl_host_compiler_EQ);
Arg *SYCLHostCompilerOptions =
getArgRequiringSYCLRuntime(options::OPT_fsycl_host_compiler_options_EQ);

// -fsycl-targets cannot be used with -fsycl-link-targets
if (SYCLTargets && SYCLLinkTargets)
Expand All @@ -1123,6 +1128,10 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
if (SYCLTargets && SYCLfpga)
Diag(clang::diag::err_drv_option_conflict)
<< SYCLTargets->getSpelling() << SYCLfpga->getSpelling();
// -fsycl-host-compiler-options cannot be used without -fsycl-host-compiler
if (SYCLHostCompilerOptions && !SYCLHostCompiler)
Diag(clang::diag::err_drv_fsycl_host_compiler_options)
<< SYCLHostCompilerOptions->getSpelling();

auto argSYCLIncompatible = [&](OptSpecifier OptId) {
if (!HasValidSYCLRuntime)
Expand Down Expand Up @@ -7970,6 +7979,11 @@ void Driver::BuildJobs(Compilation &C) const {
C.getArgs().hasArg(options::OPT_Qunused_arguments))
return;

bool HasValidSYCLRuntime =
C.getInputArgs().hasFlag(options::OPT_fsycl, options::OPT_fno_sycl,
false) ||
C.getInputArgs().hasArg(options::OPT_fsycl_device_only);

// Claim -fdriver-only here.
(void)C.getArgs().hasArg(options::OPT_fdriver_only);
// Claim -### here.
Expand All @@ -7984,8 +7998,15 @@ void Driver::BuildJobs(Compilation &C) const {
// DiagnosticsEngine, so that extra values, position, and so on could be
// printed.
if (!A->isClaimed()) {
if (A->getOption().hasFlag(options::NoArgumentUnused))
continue;
if (A->getOption().hasFlag(options::NoArgumentUnused)) {
if ((A->getOption().matches(
options::OPT_fsycl_dead_args_optimization) ||
A->getOption().matches(options::OPT_fsycl_device_lib_jit_link)) &&
!HasValidSYCLRuntime)
;
else
continue;
}
srividya-sundaram marked this conversation as resolved.
Show resolved Hide resolved

// Suppress the warning automatically if this is just a flag, and it is an
// instance of an argument we already claimed.
Expand Down
167 changes: 167 additions & 0 deletions clang/test/Driver/sycl-specific-args-diagnostics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
// This test emits an error or a warning if -fsycl-* options are not used in
// conjunction with -fsycl.

// Error should be emitted when using -fsycl-host-compiler without -fsycl

// RUN: %clang -### -fsycl-host-compiler=g++ %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-NO-FSYCL %s
// RUN: %clang_cl -### -fsycl-host-compiler=g++ %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-NO-FSYCL %s
// CHK-NO-FSYCL: error: '-fsycl-host-compiler' must be used in conjunction with '-fsycl' to enable offloading

// Warning should be emitted when using -fsycl-host-compiler-options without -fsycl-host-compiler

// RUN: %clang -### -fsycl -fsycl-host-compiler-options="-g" %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-FSYCL-WARNING %s
// RUN: %clang_cl -### -fsycl -fsycl-host-compiler-options="-g" %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-FSYCL-WARNING %s
// CHK-FSYCL-WARNING: warning: '-fsycl-host-compiler-options=' should be used only in conjunction with '-fsycl-host-compiler'

// Warning should be emitted when using -fsycl-dead-args-optimization without -fsycl
// RUN: %clang -### -fsycl-dead-args-optimization %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-DEAD-ARGS %s
// WARNING-DEAD-ARGS: warning: argument unused during compilation: '-fsycl-dead-args-optimization' [-Wunused-command-line-argument]
// RUN: %clang_cl -### -fsycl-dead-args-optimization %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-DEAD-ARGS-CL %s
// WARNING-DEAD-ARGS-CL: warning: argument unused during compilation: '-fsycl-dead-args-optimization' [-Wunused-command-line-argument]

// Warning should be emitted when using -fsycl-device-lib-jit-link without -fsycl
// RUN: %clang -### -fsycl-device-lib-jit-link %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-JIT-LINK %s
// WARNING-JIT-LINK: warning: argument unused during compilation: '-fsycl-device-lib-jit-link' [-Wunused-command-line-argument]
// RUN: %clang_cl -### -fsycl-device-lib-jit-link %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-JIT-LINK-CL %s
// WARNING-JIT-LINK-CL: warning: argument unused during compilation: '-fsycl-device-lib-jit-link' [-Wunused-command-line-argument]

// Warning should be emitted when using -fsycl-default-sub-group-size= without -fsycl
// RUN: %clang -### -fsycl-default-sub-group-size=10 %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-DSS %s
// WARNING-DSS: warning: argument unused during compilation: '-fsycl-default-sub-group-size=10' [-Wunused-command-line-argument]
// RUN: %clang_cl -### -fsycl-default-sub-group-size=10 %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-DSS-CL %s
// WARNING-DSS-CL: unknown argument ignored in clang-cl: '-fsycl-default-sub-group-size=10' [-Wunknown-argument]

// Warning should be emitted when using -fsycl-device-code-split-esimd without -fsycl
// RUN: %clang -### -fsycl-device-code-split-esimd %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-DCSE %s
// WARNING-DCSE: warning: argument unused during compilation: '-fsycl-device-code-split-esimd' [-Wunused-command-line-argument]

// Warning should be emitted when using -fsycl-device-lib=libc without -fsycl
// RUN: %clang -### -fsycl-device-lib=libc %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-DEVICE-LIB %s
// WARNING-DEVICE-LIB: warning: argument unused during compilation: '-fsycl-device-lib=libc' [-Wunused-command-line-argument]
srividya-sundaram marked this conversation as resolved.
Show resolved Hide resolved
// RUN: %clang_cl -### -fsycl-device-lib=libc %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-DEVICE-LIB-CL %s
// WARNING-DEVICE-LIB-CL: warning: argument unused during compilation: '-fsycl-device-lib=libc' [-Wunused-command-line-argument]

// Warning should be emitted when using -fsycl-device-obj=spirv without -fsycl
// RUN: %clang -### -fsycl-device-obj=spirv %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-DEVICE-OBJ %s
// WARNING-DEVICE-OBJ: warning: argument unused during compilation: '-fsycl-device-obj=spirv' [-Wunused-command-line-argument]
srividya-sundaram marked this conversation as resolved.
Show resolved Hide resolved
// RUN: %clang_cl -### -fsycl-device-obj=spirv %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-DEVICE-OBJ-CL %s
// WARNING-DEVICE-OBJ-CL: warning: argument unused during compilation: '-fsycl-device-obj=spirv' [-Wunused-command-line-argument]

// Warning should be emitted when using -fsycl-device-only without -fsycl
// RUN: %clang -### -fsycl-device-only %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-DEVICE-ONLY %s
// WARNING-DEVICE-ONLY-NOT: warning: argument unused during compilation: '-fsycl-device-only' [-Wunused-command-line-argument]
// RUN: %clang_cl -### -fsycl-device-only %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-DEVICE-ONLY %s
// WARNING-DEVICE-ONLY-NOT: warning: argument unused during compilation: '-fsycl-device-only' [-Wunused-command-line-argument]

// Warning should be emitted when using -fsycl-early-optimizations without -fsycl
// RUN: %clang -### -fsycl-early-optimizations %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-EARLY-OPT %s
// WARNING-EARLY-OPT: warning: argument unused during compilation: '-fsycl-early-optimizations' [-Wunused-command-line-argument]
// RUN: %clang_cl -### -fsycl-early-optimizations %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-EARLY-OPT-CL %s
// WARNING-EARLY-OPT-CL: warning: argument unused during compilation: '-fsycl-early-optimizations' [-Wunused-command-line-argument]

// Warning should be emitted when using -fsycl-embed-ir without -fsycl
// RUN: %clang -### -fsycl-embed-ir %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-EMBED-IR %s
// WARNING-EMBED-IR: warning: argument unused during compilation: '-fsycl-embed-ir' [-Wunused-command-line-argument]
// RUN: %clang_cl -### -fsycl-embed-ir %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-EMBED-IR-CL %s
// WARNING-EMBED-IR-CL: warning: argument unused during compilation: '-fsycl-embed-ir' [-Wunused-command-line-argument]

// Warning should be emitted when using -fsycl-esimd-force-stateless-mem without -fsycl
// RUN: %clang -### -fsycl-esimd-force-stateless-mem %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-FSM %s
// WARNING-FSM: warning: argument unused during compilation: '-fsycl-esimd-force-stateless-mem' [-Wunused-command-line-argument]
// RUN: %clang_cl -### -fsycl-esimd-force-stateless-mem %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-FSM-CL %s
// WARNING-FSM-CL: warning: argument unused during compilation: '-fsycl-esimd-force-stateless-mem' [-Wunused-command-line-argument]

// Warning should be emitted when using -fsycl-force-inline-kernel-lambda without -fsycl
// RUN: %clang -### -fsycl-force-inline-kernel-lambda %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-FORCE-INLINE %s
// WARNING-FORCE-INLINE: warning: argument unused during compilation: '-fsycl-force-inline-kernel-lambda' [-Wunused-command-line-argument]
// RUN: %clang_cl -### -fsycl-force-inline-kernel-lambda %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-FORCE-INLINE-CL %s
// WARNING-FORCE-INLINE-CL: warning: argument unused during compilation: '-fsycl-force-inline-kernel-lambda' [-Wunused-command-line-argument]

// Warning should be emitted when using -fsycl-fp32-prec-sqrt without -fsycl
// RUN: %clang -### -fsycl-fp32-prec-sqrt %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-FP32 %s
// WARNING-FP32: warning: argument unused during compilation: '-fsycl-fp32-prec-sqrt' [-Wunused-command-line-argument]
// RUN: %clang_cl -### -fsycl-fp32-prec-sqrt %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-FP32-CL %s
// WARNING-FP32-CL: warning: unknown argument ignored in clang-cl: '-fsycl-fp32-prec-sqrt' [-Wunknown-argument]

// Warning should be emitted when using -fsycl-id-queries-fit-in-int without -fsycl
// RUN: %clang -### -fsycl-id-queries-fit-in-int %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-ID %s
// WARNING-ID: warning: argument unused during compilation: '-fsycl-id-queries-fit-in-int' [-Wunused-command-line-argument]
// RUN: %clang_cl -### -fsycl-id-queries-fit-in-int %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-ID-CL %s
// WARNING-ID-CL: warning: argument unused during compilation: '-fsycl-id-queries-fit-in-int' [-Wunused-command-line-argument]

// Warning should be emitted when using -fsycl-instrument-device-code without -fsycl
// RUN: %clang -### -fsycl-instrument-device-code %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-INS-DEV %s
// WARNING-INS-DEV: warning: argument unused during compilation: '-fsycl-instrument-device-code' [-Wunused-command-line-argument]
// RUN: %clang_cl -### -fsycl-instrument-device-code %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-INS-DEV-CL %s
// WARNING-INS-DEV-CL: warning: argument unused during compilation: '-fsycl-instrument-device-code' [-Wunused-command-line-argument]

// Warning should be emitted when using -fsycl-libspirv-path without -fsycl
// RUN: %clang -### -fsycl-libspirv-path=libspirv.bc %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-LIBSPRIV %s
// WARNING-LIBSPRIV: warning: argument unused during compilation: '-fsycl-libspirv-path=libspirv.bc' [-Wunused-command-line-argument]
srividya-sundaram marked this conversation as resolved.
Show resolved Hide resolved
// RUN: %clang_cl -### -fsycl-libspirv-path=libspirv.bc %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-LIBSPRIV-CL %s
// WARNING-LIBSPRIV-CL: warning: argument unused during compilation: '-fsycl-libspirv-path=libspirv.bc' [-Wunused-command-line-argument]

// Warning should be emitted when using -fsycl-max-parallel-link-jobs without -fyscl
// RUN: %clang -### -fsycl-max-parallel-link-jobs=4 %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-PARALLEL %s
// WARNING-PARALLEL: warning: argument unused during compilation: '-fsycl-max-parallel-link-jobs=4' [-Wunused-command-line-argument]
srividya-sundaram marked this conversation as resolved.
Show resolved Hide resolved
// RUN: %clang_cl -### -fsycl-max-parallel-link-jobs=4 %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-PARALLEL-CL %s
// WARNING-PARALLEL-CL: warning: argument unused during compilation: '-fsycl-max-parallel-link-jobs=4' [-Wunused-command-line-argument]

// Warning should be emitted when using -fsycl-optimize-non-user-code without -fsycl
// RUN: %clang -### -fsycl-optimize-non-user-code %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-OPTIMIZE %s
// WARNING-OPTIMIZE: warning: argument unused during compilation: '-fsycl-optimize-non-user-code' [-Wunused-command-line-argument]
// RUN: %clang_cl -### -fsycl-optimize-non-user-code %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-OPTIMIZE-CL %s
// WARNING-OPTIMIZE-CL: warning: argument unused during compilation: '-fsycl-optimize-non-user-code' [-Wunused-command-line-argument]

// Warning should be emitted when using -fsycl-unnamed-lambda without -fsycl
// RUN: %clang -### -fsycl-unnamed-lambda %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-UNNAMED-LAMBDA %s
// WARNING-UNNAMED-LAMBDA: warning: argument unused during compilation: '-fsycl-unnamed-lambda' [-Wunused-command-line-argument]
// RUN: %clang_cl -### -fsycl-unnamed-lambda %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-UNNAMED-LAMBDA-CL %s
// WARNING-UNNAMED-LAMBDA-CL: warning: argument unused during compilation: '-fsycl-unnamed-lambda' [-Wunused-command-line-argument]

// Warning should be emitted when using -fsycl-use-bitcode without -fsycl
// RUN: %clang -### -fsycl-use-bitcode %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-USE-BITCODE %s
// WARNING-USE-BITCODE: warning: argument unused during compilation: '-fsycl-use-bitcode' [-Wunused-command-line-argument]
// RUN: %clang_cl -### -fsycl-use-bitcode %s 2>&1 \
// RUN: | FileCheck -check-prefix=WARNING-USE-BITCODE-CL %s
// WARNING-USE-BITCODE-CL: warning: argument unused during compilation: '-fsycl-use-bitcode' [-Wunused-command-line-argument]
srividya-sundaram marked this conversation as resolved.
Show resolved Hide resolved
Loading