Skip to content

[SYCL][Driver] Fix autodetection of the -Xsycl-target-backend triple #4463

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 5 commits into from
Sep 6, 2021
Merged

[SYCL][Driver] Fix autodetection of the -Xsycl-target-backend triple #4463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4aeb0ee
[SYCL][Driver] Fix autodetection of the -Xsycl-target-backend triple
Sep 2, 2021
e618aa9
Merge remote-tracking branch 'intel/sycl' into target-backend-triple
Sep 2, 2021
3f58f7a
Add LIT coverage
Sep 2, 2021
4e846da
Merge remote-tracking branch 'intel/sycl' into target-backend-triple
Sep 3, 2021
902376d
Rework to add the default triple after GPU Arch initialization
Sep 3, 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
9 changes: 6 additions & 3 deletions clang/lib/Driver/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4776,6 +4776,7 @@ class OffloadingActionBuilder final {
bool HasValidSYCLRuntime = C.getInputArgs().hasFlag(
options::OPT_fsycl, options::OPT_fno_sycl, false);
bool SYCLfpgaTriple = false;
bool ShouldAddDefaultTriple = true;
if (SYCLTargets || SYCLAddTargets) {
if (SYCLTargets) {
llvm::StringMap<StringRef> FoundNormalizedTriples;
Expand All @@ -4796,7 +4797,6 @@ class OffloadingActionBuilder final {
if (TT.getSubArch() == llvm::Triple::SPIRSubArch_fpga)
SYCLfpgaTriple = true;
}
addSYCLDefaultTriple(C, SYCLTripleList);
}
if (SYCLAddTargets) {
for (StringRef Val : SYCLAddTargets->getValues()) {
Expand All @@ -4810,6 +4810,7 @@ class OffloadingActionBuilder final {

// populate the AOT binary inputs vector.
SYCLAOTInputs.push_back(std::make_pair(TT, TF));
ShouldAddDefaultTriple = false;
}
}
} else if (HasValidSYCLRuntime) {
Expand All @@ -4819,7 +4820,6 @@ class OffloadingActionBuilder final {
const char *SYCLTargetArch = SYCLfpga ? "spir64_fpga" : "spir64";
SYCLTripleList.push_back(
C.getDriver().MakeSYCLDeviceTriple(SYCLTargetArch));
addSYCLDefaultTriple(C, SYCLTripleList);
if (SYCLfpga)
SYCLfpgaTriple = true;
}
Expand Down Expand Up @@ -4856,7 +4856,10 @@ class OffloadingActionBuilder final {
}

DeviceLinkerInputs.resize(ToolChains.size());
return initializeGpuArchMap();
bool GpuInitHasErrors = initializeGpuArchMap();
if (ShouldAddDefaultTriple)
addSYCLDefaultTriple(C, SYCLTripleList);
return GpuInitHasErrors;
}

bool canUseBundlerUnbundler() const override {
Expand Down
11 changes: 10 additions & 1 deletion clang/test/Driver/sycl-offload.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,18 @@
// NO_IMPLIED_DEVICE: clang-offload-bundler{{.*}} "-type=o" "-targets=sycl-spir64-unknown-unknown"{{.*}} "-check-section"
// NO_IMPLIED_DEVICE-NOT: clang-offload-bundler{{.*}} "-targets={{.*}}spir64-unknown-unknown{{.*}}" "-unbundle"

/// Passing in the default triple should allow for -Xsycl-target options
/// Passing in the default triple should allow for -Xsycl-target options, both the
/// "=<triple>" and the default spelling
// RUN: %clangxx -### -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64 -Xsycl-target-backend=spir64 -DFOO -Xsycl-target-linker=spir64 -DFOO2 %S/Inputs/SYCL/objlin64.o 2>&1 \
// RUN: | FileCheck -check-prefixes=SYCL_TARGET_OPT %s
// RUN: %clangxx -### -target x86_64-unknown-linux-gnu -fsycl -Xsycl-target-backend=spir64 -DFOO -Xsycl-target-linker=spir64 -DFOO2 %S/Inputs/SYCL/objlin64.o 2>&1 \
// RUN: | FileCheck -check-prefixes=SYCL_TARGET_OPT %s
// SYCL_TARGET_OPT: clang-offload-wrapper{{.*}} "-compile-opts=-DFOO" "-link-opts=-DFOO2"
// RUN: %clangxx -### -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64_x86_64 -Xsycl-target-backend -DFOO %S/Inputs/SYCL/objlin64.o 2>&1 \
// RUN: | FileCheck -check-prefixes=SYCL_TARGET_OPT_AOT %s
// RUN: %clangxx -### -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend -DFOO %S/Inputs/SYCL/objlin64.o 2>&1 \
// RUN: | FileCheck -check-prefixes=SYCL_TARGET_OPT_AOT %s
// RUN: %clangxx -### -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64_fpga -Xsycl-target-backend -DFOO %S/Inputs/SYCL/objlin64.o 2>&1 \
// RUN: | FileCheck -check-prefixes=SYCL_TARGET_OPT_AOT %s
// SYCL_TARGET_OPT_AOT-NOT: error: cannot deduce implicit triple value for '-Xsycl-target-backend'
// SYCL_TARGET_OPT_AOT: {{opencl-aot|ocloc|aoc}}{{.*}} "-DFOO"