Skip to content

[Driver][SYCL][FPGA] implied default device forces emulation #4801

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 3 commits into from
Oct 25, 2021
Merged

[Driver][SYCL][FPGA] implied default device forces emulation #4801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd3b316
[Driver][SYCL][FPGA] implied default device forces emulation
mdtoguchi Oct 21, 2021
f9ea93f
Adjust logic to use continue out of for loop
mdtoguchi Oct 24, 2021
712fd92
clang format adjustments
mdtoguchi Oct 25, 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
25 changes: 15 additions & 10 deletions clang/lib/Driver/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1473,17 +1473,22 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
// Determine FPGA emulation status.
if (C->hasOffloadToolChain<Action::OFK_SYCL>()) {
auto SYCLTCRange = C->getOffloadToolChains<Action::OFK_SYCL>();
ArgStringList TargetArgs;
const ToolChain *TC = SYCLTCRange.first->second;
const toolchains::SYCLToolChain *SYCLTC =
static_cast<const toolchains::SYCLToolChain *>(TC);
SYCLTC->TranslateBackendTargetArgs(SYCLTC->getTriple(), *TranslatedArgs,
TargetArgs);
for (StringRef ArgString : TargetArgs) {
if (ArgString.equals("-hardware") || ArgString.equals("-simulation")) {
setFPGAEmulationMode(false);
break;
for (auto TI = SYCLTCRange.first, TE = SYCLTCRange.second; TI != TE; ++TI) {
if (TI->second->getTriple().getSubArch() !=
llvm::Triple::SPIRSubArch_fpga)
continue;
ArgStringList TargetArgs;
const toolchains::SYCLToolChain *FPGATC =
static_cast<const toolchains::SYCLToolChain *>(TI->second);
FPGATC->TranslateBackendTargetArgs(FPGATC->getTriple(), *TranslatedArgs,
TargetArgs);
for (StringRef ArgString : TargetArgs) {
if (ArgString.equals("-hardware") || ArgString.equals("-simulation")) {
setFPGAEmulationMode(false);
break;
}
}
break;
}
}

Expand Down
7 changes: 7 additions & 0 deletions clang/test/Driver/sycl-offload-intelfpga.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,3 +504,10 @@
// RUN: | FileCheck -check-prefix=ERROR_BUNDLE_CHECK %s
// ERROR_BUNDLE_CHECK-NOT: clang-offload-bundler{{.*}} "-targets=sycl-fpga_aoc{{(x|r|r_emu|o)}}-intel-unknown"{{.*}} "-check-section"
// ERROR_BUNDLE_CHECK-NOT: error: file too small to be an archive

/// Implied default device should not prevent hardware/simulation
// RUN: %clangxx -### -target x86_64-unknown-linux-gnu -fsycl -fintelfpga -Xshardware %S/Inputs/SYCL/liblin64.a %s 2>&1 \
// RUN: | FileCheck -check-prefix IMPLIED_DEVICE_HARDWARE -DBEOPT=hardware %s
// RUN: %clangxx -### -target x86_64-unknown-linux-gnu -fsycl -fintelfpga -Xssimulation %S/Inputs/SYCL/liblin64.a %s 2>&1 \
// RUN: | FileCheck -check-prefix IMPLIED_DEVICE_HARDWARE -DBEOPT=simulation %s
// IMPLIED_DEVICE_HARDWARE: aoc{{.*}} "-[[BEOPT]]"