Skip to content

[Driver][SYCL][FPGA] Proper dependency output location when given /Fo… #1346

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
Mar 26, 2020
Merged

[Driver][SYCL][FPGA] Proper dependency output location when given /Fo… #1346

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4a6146
[Driver][SYCL][FPGA] Proper dependency output location when given /Fo…
mdtoguchi Mar 18, 2020
5d330eb
[NFC] Address review comments (rename var)
mdtoguchi Mar 23, 2020
d5a7bb7
[NFC] Test update based on review
mdtoguchi Mar 25, 2020
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
3 changes: 3 additions & 0 deletions clang/lib/Driver/ToolChains/Clang.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6793,6 +6793,9 @@ const char *Clang::getDependencyFileName(const ArgList &Args,
if (Arg *OutputOpt =
Args.getLastArg(options::OPT_o, options::OPT__SLASH_Fo)) {
SmallString<128> OutputFilename(OutputOpt->getValue());
if (llvm::sys::path::is_separator(OutputFilename.back()))
// If the argument is a directory, output to BaseName in that dir.
llvm::sys::path::append(OutputFilename, getBaseInputStem(Args, Inputs));
llvm::sys::path::replace_extension(OutputFilename, llvm::Twine('d'));
return Args.MakeArgString(OutputFilename);
}
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 @@ -252,6 +252,13 @@
// CHK-FPGA-REPORT-OPT2: aoc{{.*}} "-sycl" {{.*}} "-output-report-folder=dummy.prj"
// CHK-FPGA-REPORT-OPT2-NOT: aoc{{.*}} "-sycl" {{.*}} "-output-report-folder=[[OUTDIR]]{{.*}}"

/// -fintelfpga output dep file using -Fo<dir>
// RUN: mkdir -p %t_dir
// RUN: %clang_cl -### -c -fsycl -fintelfpga -Fo%t_dir/ %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-FPGA-DEP-DIR %s
// CHK-FPGA-DEP-DIR: clang{{.*}} "-dependency-file" "[[DEPFILE:.+\.d]]"
// CHK-FPGA-DEP-DIR: clang-offload-bundler{{.*}} "-inputs={{.*}}.bc,{{.*}}.obj,[[DEPFILE]]"

/// -fintelfpga static lib (aoco)
// RUN: echo "Dummy AOCO image" > %t.aoco
// RUN: echo "void foo() {}" > %t.c
Expand Down