Skip to content

[Driver][SYCL] Do not emit target not found warning for early images #12035

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 2 commits into from
Dec 5, 2023
Merged

[Driver][SYCL] Do not emit target not found warning for early images #12035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14a32a5
[Driver][SYCL] Do not emit target not found in binary warning for ear…
mdtoguchi Nov 29, 2023
ab9f3e4
Merge remote-tracking branch 'intel_llvm/sycl' into no-warning-with-i…
mdtoguchi Dec 1, 2023
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
21 changes: 21 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 @@ -6145,6 +6145,27 @@ class OffloadingActionBuilder final {
if (std::find(UniqueSections.begin(), UniqueSections.end(),
SectionTriple) != UniqueSections.end())
continue;
// If any section found is an 'image' based object that was created
// with the intention of not requiring the matching SYCL target, do
// not emit the diagnostic.
if (SyclTarget.TC->getTriple().isSPIR()) {
bool SectionFound = false;
for (auto Section : UniqueSections) {
if (SectionFound)
break;
SmallVector<std::string, 3> ArchList = {"spir64_gen", "spir64_fpga",
"spir64_x86_64"};
for (auto ArchStr : ArchList) {
std::string Arch(ArchStr + "_image");
if (Section.find(Arch) != std::string::npos) {
SectionFound = true;
break;
}
}
}
if (SectionFound)
continue;
}
// Didn't find any matches, return the full list for the diagnostic.
SmallString<128> ArchListStr;
int Cnt = 0;
Expand Down
2 changes: 2 additions & 0 deletions clang/test/Driver/sycl-early-device-link.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,13 @@
// RUN: %clangxx -fsycl --target=x86_64-unknown-linux-gnu -### \
// RUN: %S/Inputs/SYCL/objgenimage.o %s 2>&1 \
// RUN: | FileCheck %s -check-prefix=CONSUME_OBJ
// CONSUME_OBJ-NOT: linked binaries do not contain expected
// CONSUME_OBJ: clang-offload-bundler{{.*}} "-type=o" "-targets=sycl-spir64_gen_image-unknown-unknown" "-input={{.*}}objgenimage.o" "-output=[[DEVICE_IMAGE_OBJ:.+\.o]]
// CONSUME_OBJ: ld{{.*}} "[[DEVICE_IMAGE_OBJ]]"

// RUN: %clangxx -fsycl --target=x86_64-unknown-linux-gnu -### \
// RUN: %S/Inputs/SYCL/libgenimage.a %s 2>&1 \
// RUN: | FileCheck %s -check-prefix=CONSUME_LIB
// CONSUME_LIB-NOT: linked binaries do not contain expected
// CONSUME_LIB: clang-offload-bundler{{.*}} "-type=aoo" "-targets=sycl-spir64_gen_image-unknown-unknown" "-input={{.*}}libgenimage.a" "-output=[[DEVICE_IMAGE_LIB:.+\.txt]]
// CONSUME_LIB: ld{{.*}} "@[[DEVICE_IMAGE_LIB]]"