Skip to content

[Driver][SYCL] Fix -Xsycl option triple check with multiple -fsycl-targets #4789

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

Merged
merged 2 commits into from
Oct 23, 2021
Merged

[Driver][SYCL] Fix -Xsycl option triple check with multiple -fsycl-targets #4789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67d2084
[Driver][SYCL] -Xsycl option triple check incorrect with multiple -fs…
mdtoguchi Oct 20, 2021
e1bf0cb
Additional fixes for -Xsycl-target-frontend and update testing
mdtoguchi Oct 20, 2021
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
13 changes: 10 additions & 3 deletions clang/lib/Driver/ToolChain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,12 +1247,19 @@ llvm::opt::DerivedArgList *ToolChain::TranslateOffloadTargetArgs(
if (XOffloadTargetNoTriple && XOffloadTargetArg) {
// TODO: similar behaviors with OpenMP and SYCL offloading, can be
// improved upon
auto SingleTargetTripleCount = [&Args](OptSpecifier Opt) {
const Arg *TargetArg = Args.getLastArg(Opt);
if (TargetArg && TargetArg->getValues().size() == 1)
return true;
return false;
};
if (DeviceOffloadKind == Action::OFK_OpenMP &&
Args.getAllArgValues(options::OPT_fopenmp_targets_EQ).size() != 1) {
!SingleTargetTripleCount(options::OPT_fopenmp_targets_EQ)) {
getDriver().Diag(diag::err_drv_Xopenmp_target_missing_triple);
continue;
} else if (DeviceOffloadKind == Action::OFK_SYCL &&
Args.getAllArgValues(options::OPT_fsycl_targets_EQ).size() > 1) {
}
if (DeviceOffloadKind == Action::OFK_SYCL &&
!SingleTargetTripleCount(options::OPT_fsycl_targets_EQ)) {
getDriver().Diag(diag::err_drv_Xsycl_target_missing_triple)
<< A->getSpelling();
continue;
Expand Down
3 changes: 2 additions & 1 deletion clang/lib/Driver/ToolChains/SYCL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,8 @@ void SYCLToolChain::TranslateTargetOpt(const llvm::opt::ArgList &Args,
if (OptNoTriple) {
// With multiple -fsycl-targets, a triple is required so we know where
// the options should go.
if (Args.getAllArgValues(options::OPT_fsycl_targets_EQ).size() != 1) {
const Arg *TargetArg = Args.getLastArg(options::OPT_fsycl_targets_EQ);
if (TargetArg && TargetArg->getValues().size() != 1) {
getDriver().Diag(diag::err_drv_Xsycl_target_missing_triple)
<< A->getSpelling();
continue;
Expand Down
10 changes: 10 additions & 0 deletions clang/test/Driver/sycl-offload.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,16 @@
// RUN: | FileCheck -check-prefix=CHK-FSYCL-TARGET-AMBIGUOUS-ERROR %s
// CHK-FSYCL-TARGET-AMBIGUOUS-ERROR: clang{{.*}} error: cannot deduce implicit triple value for '-Xsycl-target-backend', specify triple using '-Xsycl-target-backend=<triple>'

/// Check -Xsycl-target-* does not trigger an error when multiple instances of
/// -fsycl-targets is used.
// RUN: %clang -### -fsycl -fsycl-targets=spir64-unknown-unknown -fsycl-targets=spir64_gen-unknown-unknown -Xsycl-target-backend -DFOO %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-FSYCL-TARGET-2X-ERROR %s
// RUN: %clang -### -fsycl -fsycl-targets=spir64-unknown-unknown -fsycl-targets=spir64_gen-unknown-unknown -Xsycl-target-frontend -DFOO %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-FSYCL-TARGET-2X-ERROR %s
// RUN: %clang -### -fsycl -fsycl-targets=spir64-unknown-unknown -fsycl-targets=spir64_gen-unknown-unknown -Xsycl-target-linker -DFOO %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-FSYCL-TARGET-2X-ERROR %s
// CHK-FSYCL-TARGET-2X-ERROR-NOT: clang{{.*}} error: cannot deduce implicit triple value for '-Xsycl-target{{.*}}', specify triple using '-Xsycl-target{{.*}}=<triple>'

/// ###########################################################################

/// Ahead of Time compilation for fpga, gen, cpu
Expand Down