Skip to content

[Driver][SYCL] Enable way to emit int-footer source to a specific dir #4167

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 6 commits into from
Jul 24, 2021
Merged

[Driver][SYCL] Enable way to emit int-footer source to a specific dir #4167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e6ada38
[Driver][SYCL] Enable way to emit int-footer source to a specific dir
mdtoguchi Jul 22, 2021
4421920
clang format
mdtoguchi Jul 22, 2021
ec9a2f9
[NFC] Update test for Windows
mdtoguchi Jul 22, 2021
02d811d
Update help and honor output dir with -save-temps
mdtoguchi Jul 23, 2021
f733b3d
clang format
mdtoguchi Jul 23, 2021
d8d1fe5
Address review comment
mdtoguchi Jul 23, 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
3 changes: 3 additions & 0 deletions clang/include/clang/Driver/Options.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2635,6 +2635,9 @@ def fsycl_host_compiler_options_EQ : Joined<["-"], "fsycl-host-compiler-options=
def fno_sycl_use_footer : Flag<["-"], "fno-sycl-use-footer">, Flags<[CoreOption]>,
HelpText<"Disable usage of the integration footer during SYCL enabled "
"compilations.">;
def fsycl_footer_path_EQ : Joined<["-"], "fsycl-footer-path=">,
Flags<[CoreOption]>, HelpText<"Specify the location of the temporary "
"source file with the included integration footer.">;
def fsyntax_only : Flag<["-"], "fsyntax-only">,
Flags<[NoXarchOption,CoreOption,CC1Option,FC1Option]>, Group<Action_Group>;
def ftabstop_EQ : Joined<["-"], "ftabstop=">, Group<f_Group>;
Expand Down
26 changes: 26 additions & 0 deletions clang/lib/Driver/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6753,6 +6753,32 @@ const char *Driver::GetNamedOutputPath(Compilation &C, const JobAction &JA,
&JA);
}

// Redirect output for the generated source + integration footer.
if (isa<AppendFooterJobAction>(JA)) {
if (Arg *A = C.getArgs().getLastArg(options::OPT_fsycl_footer_path_EQ)) {
SmallString<128> OutName(A->getValue());
StringRef BaseName = llvm::sys::path::filename(BaseInput);
if (isSaveTempsEnabled()) {
// Retain the location specified by the user with -save-temps.
const char *Suffix = types::getTypeTempSuffix(JA.getType());
std::string::size_type End = std::string::npos;
if (!types::appendSuffixForType(JA.getType()))
End = BaseName.rfind('.');
SmallString<128> Suffixed(BaseName.substr(0, End));
Suffixed += OffloadingPrefix;
Suffixed += '.';
Suffixed += Suffix;
llvm::sys::path::append(OutName, Suffixed.c_str());
} else {
std::string TmpName =
GetTemporaryPath(llvm::sys::path::stem(BaseName),
types::getTypeTempSuffix(JA.getType()));
llvm::sys::path::append(OutName, llvm::sys::path::filename(TmpName));
}
return C.addTempFile(C.getArgs().MakeArgString(OutName));
}
}

// Default to writing to stdout?
if (AtTopLevel && !CCGenDiagnostics && HasPreprocessOutput(JA)) {
return "-";
Expand Down
6 changes: 6 additions & 0 deletions clang/test/Driver/sycl-int-footer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,9 @@
// COMMON-PHASES: [[#OFFLOAD+9]]: file-table-tform, {[[#OFFLOAD+6]], [[#OFFLOAD+8]]}, tempfiletable, (device-sycl)
// COMMON-PHASES: [[#OFFLOAD+10]]: clang-offload-wrapper, {[[#OFFLOAD+9]]}, object, (device-sycl)
// COMMON-PHASES: [[#OFFLOAD+11]]: offload, "host-sycl (x86_64-{{.*}})" {[[#OFFLOAD+4]]}, "device-sycl (spir64-unknown-unknown-sycldevice)" {[[#OFFLOAD+10]]}, image

/// Test for -fsycl-footer-path=<dir>
// RUN: %clangxx -fsycl -fsycl-footer-path=dummy_dir %s -### 2>&1 \
// RUN: | FileCheck -check-prefix FOOTER_PATH %s
// FOOTER_PATH: append-file{{.*}} "--output=dummy_dir{{(/|\\\\)}}[[APPENDEDSRC:.+\.cpp]]"
// FOOTER_PATH: clang{{.*}} "-x" "c++" "dummy_dir{{(/|\\\\)}}[[APPENDEDSRC]]"