Skip to content

[Driver][SYCL] Address issue when unbundling for non-FPGA archive #3366

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
bader merged 2 commits into from
Mar 18, 2021
Merged

[Driver][SYCL] Address issue when unbundling for non-FPGA archive #3366

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7cca87
[Driver][SYCL] Address issue when unbundling for non-FPGA archive
mdtoguchi Mar 16, 2021
d24350a
[NFC] address review comments
mdtoguchi Mar 17, 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: 2 additions & 1 deletion clang/lib/Driver/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6193,7 +6193,8 @@ InputInfo Driver::BuildJobsForActionNoCache(
TI = types::TY_Tempfilelist;
} else if (EffectiveTriple.getSubArch() !=
llvm::Triple::SPIRSubArch_fpga) {
if (UI.DependentOffloadKind == Action::OFK_SYCL) {
if (UI.DependentOffloadKind == Action::OFK_SYCL &&
JA->getType() != types::TY_FPGA_AOCO) {
// Do not add the current info for device with FPGA device. The
// device side isn't used
continue;
Expand Down
12 changes: 12 additions & 0 deletions clang/test/Driver/sycl-offload-static-lib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,3 +150,15 @@
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -foffload-static-lib= -c %s 2>&1 \
// RUN: | FileCheck %s -check-prefixes=FOFFLOAD_STATIC_LIB_NOVALUE
// FOFFLOAD_STATIC_LIB_NOVALUE: warning: argument unused during compilation: '-foffload-static-lib='

/// Use of a static archive with various targets should compile and unbundle
// RUN: touch %t.a
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl %t.a -### 2>&1 \
// RUN: | FileCheck %s -check-prefixes=STATIC_ARCHIVE_NO_UNBUNDLE
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64_gen-unknown-unknown-sycldevice %t.a -### 2>&1 \
// RUN: | FileCheck %s -check-prefixes=STATIC_ARCHIVE_NO_UNBUNDLE
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64_fpga-unknown-unknown-sycldevice %t.a -### 2>&1 \
// RUN: | FileCheck %s -check-prefixes=STATIC_ARCHIVE_NO_UNBUNDLE
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fsycl-targets=spir64_x86_64-unknown-unknown-sycldevice %t.a -### 2>&1 \
// RUN: | FileCheck %s -check-prefixes=STATIC_ARCHIVE_NO_UNBUNDLE
// STATIC_ARCHIVE_NO_UNBUNDLE: clang-offload-bundler{{.*}}