Skip to content

[SYCL]Use llvm-link's only-needed option to link device libs #2783

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.

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 12 commits into from
Dec 10, 2020
Merged
Changes from 1 commit
Commits
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
24 changes: 12 additions & 12 deletions clang/lib/Driver/ToolChains/SYCL.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,24 +100,24 @@ const char *SYCL::Linker::constructLLVMLinkCommand(Compilation &C,
StringRef SubArchName, StringRef OutputFilePrefix,
const InputInfoList &InputFiles) const {
ArgStringList CmdArgs;

bool LinkSYCLDeviceLibs = false;
for (const auto &II : InputFiles) {
StringRef InputFilename =
llvm::sys::path::filename(StringRef(II.getFilename()));
StringRef InputSuffix = ".o";
if (InputFilename.startswith("libsycl-") &&
InputFilename.endswith(InputSuffix)) {
LinkSYCLDeviceLibs = true;
break;
}
}
// Add the input bc's created by compile step.
// When offloading, the input file(s) could be from unbundled partially
// linked archives. The unbundled information is a list of files and not
// an actual object/archive. Take that list and pass those to the linker
// instead of the original object.
if (JA.isDeviceOffloading(Action::OFK_SYCL)) {
bool LinkSYCLDeviceLibs = false;
auto SYCLDeviceLibIter =
std::find_if(InputFiles.begin(), InputFiles.end(), [](const auto &II) {
StringRef InputFilename =
llvm::sys::path::filename(StringRef(II.getFilename()));
if (InputFilename.startswith("libsycl-") &&
InputFilename.endswith(".o"))
return true;
else
return false;
});
LinkSYCLDeviceLibs = (SYCLDeviceLibIter != InputFiles.end());
// Go through the Inputs to the link. When a listfile is encountered, we
// know it is an unbundled generated list.
if (LinkSYCLDeviceLibs)
Expand Down