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

[Driver][SYCL][FPGA] Adjust the output location for the project report #1278

Merged
merged 4 commits into from
Mar 12, 2020
Merged

[Driver][SYCL][FPGA] Adjust the output location for the project report #1278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e3124c
[Driver][SYCL][FPGA] Adjust the output location for the project report
mdtoguchi Mar 5, 2020
c1794ed
[Driver] Address review comments, improved var names and arg checks
mdtoguchi Mar 11, 2020
765d88a
[NFC] remove unneeded invalid type check
mdtoguchi Mar 11, 2020
09689dd
[NFC] Applied suggested changes, and add back in invalid type check
mdtoguchi Mar 11, 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
27 changes: 16 additions & 11 deletions clang/lib/Driver/ToolChains/SYCL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,17 +271,22 @@ void SYCL::fpga::BackendCompiler::ConstructJob(Compilation &C,
} else {
// Output directory is based off of the first object name
for (Arg * Cur : Args) {
SmallString<128> AN = Cur->getSpelling();
StringRef Ext(llvm::sys::path::extension(AN));
if (!Ext.empty()) {
types::ID Ty = getToolChain().LookupTypeForExtension(Ext.drop_front());
if (Ty == types::TY_INVALID)
continue;
if (types::isSrcFile(Ty) || Ty == types::TY_Object) {
llvm::sys::path::replace_extension(AN, "prj");
ReportOptArg += Args.MakeArgString(AN);
break;
}
if (Cur->getOption().getKind() != Option::InputClass)
continue;
SmallString<128> ArgName = Cur->getSpelling();
StringRef Ext(llvm::sys::path::extension(ArgName));
if (Ext.empty())
continue;
types::ID Ty = getToolChain().LookupTypeForExtension(Ext.drop_front());
if (Ty == types::TY_INVALID)
continue;
if (types::isSrcFile(Ty) || Ty == types::TY_Object) {
// Project report should be saved into CWD, so strip off any
// directory information if provided with the input file.
ArgName = llvm::sys::path::filename(ArgName);
llvm::sys::path::replace_extension(ArgName, "prj");
ReportOptArg += Args.MakeArgString(ArgName);
break;
}
}
}
Expand Down
10 changes: 10 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 @@ -171,6 +171,16 @@
// RUN: | FileCheck -DOUTDIR=%t_dir -check-prefix=CHK-FPGA-REPORT-OPT %s
// CHK-FPGA-REPORT-OPT: aoc{{.*}} "-sycl" {{.*}} "-output-report-folder=[[OUTDIR]]{{/|\\\\}}file.prj"

/// -fintelfpga output report file from dir/source
AGindinson marked this conversation as resolved.
Show resolved Hide resolved
// RUN: mkdir -p %t_dir
// RUN: touch %t_dir/dummy.cpp
// RUN: %clangxx -### -fsycl -fintelfpga %t_dir/dummy.cpp 2>&1 \
// RUN: | FileCheck -DOUTDIR=%t_dir -check-prefix=CHK-FPGA-REPORT-OPT2 %s
// RUN: %clang_cl -### -fsycl -fintelfpga %t_dir/dummy.cpp 2>&1 \
// RUN: | FileCheck -DOUTDIR=%t_dir -check-prefix=CHK-FPGA-REPORT-OPT2 %s
// CHK-FPGA-REPORT-OPT2: aoc{{.*}} "-sycl" {{.*}} "-output-report-folder=dummy.prj"
// CHK-FPGA-REPORT-OPT2-NOT: aoc{{.*}} "-sycl" {{.*}} "-output-report-folder=[[OUTDIR]]{{.*}}"

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