@@ -3921,7 +3921,8 @@ class OffloadingActionBuilder final {
3921
3921
// For SYCL device libraries, don't need to add them to
3922
3922
// FPGAObjectInputs as there is no FPGA dep files inside.
3923
3923
const auto *TC = ToolChains.front ();
3924
- if (TC->getTriple ().getSubArch () == llvm::Triple::SPIRSubArch_fpga &&
3924
+ if (TC->getTriple ().getSubArch () ==
3925
+ llvm::Triple::SPIRSubArch_fpga &&
3925
3926
!IsSYCLDeviceLibObj (FileName, C.getDefaultToolChain ()
3926
3927
.getTriple ()
3927
3928
.isWindowsMSVCEnvironment ()))
@@ -4635,9 +4636,10 @@ class OffloadingActionBuilder final {
4635
4636
C.hasOffloadToolChain <Action::OFK_SYCL>()
4636
4637
? C.getSingleOffloadToolChain <Action::OFK_SYCL>()
4637
4638
: C.getSingleOffloadToolChain <Action::OFK_Host>();
4638
- HasFPGATarget = TC->getTriple ().getSubArch () == llvm::Triple::SPIRSubArch_fpga;
4639
+ HasFPGATarget =
4640
+ TC->getTriple ().getSubArch () == llvm::Triple::SPIRSubArch_fpga;
4639
4641
if (HasFPGATarget && !(HostAction->getType () == types::TY_Object &&
4640
- isObjectFile (InputName))) {
4642
+ isObjectFile (InputName))) {
4641
4643
// Type FPGA aoco is a special case for -foffload-static-lib.
4642
4644
if (HostAction->getType () == types::TY_FPGA_AOCO) {
4643
4645
if (!hasFPGABinary (C, InputName, types::TY_FPGA_AOCO))
@@ -4683,8 +4685,8 @@ class OffloadingActionBuilder final {
4683
4685
// FPGA device archive.
4684
4686
if ((OffloadKind == Action::OFK_None && CanUseBundler) ||
4685
4687
(HasFPGATarget && ((Args.hasArg (options::OPT_fsycl_link_EQ) &&
4686
- HostAction->getType () == types::TY_Object) ||
4687
- HostAction->getType () == types::TY_FPGA_AOCX)))
4688
+ HostAction->getType () == types::TY_Object) ||
4689
+ HostAction->getType () == types::TY_FPGA_AOCX)))
4688
4690
if (auto *UA = dyn_cast<OffloadUnbundlingJobAction>(HostAction))
4689
4691
HostAction = UA->getInputs ().back ();
4690
4692
@@ -6092,9 +6094,10 @@ InputInfo Driver::BuildJobsForActionNoCache(
6092
6094
// unbundling action does not change the type of the output which can
6093
6095
// cause a overwrite.
6094
6096
InputInfo CurI;
6095
- bool IsFPGAObjLink = (JA->getType () == types::TY_Object &&
6096
- EffectiveTriple.getSubArch () == llvm::Triple::SPIRSubArch_fpga &&
6097
- C.getInputArgs ().hasArg (options::OPT_fsycl_link_EQ));
6097
+ bool IsFPGAObjLink =
6098
+ (JA->getType () == types::TY_Object &&
6099
+ EffectiveTriple.getSubArch () == llvm::Triple::SPIRSubArch_fpga &&
6100
+ C.getInputArgs ().hasArg (options::OPT_fsycl_link_EQ));
6098
6101
if (C.getDriver ().getOffloadStaticLibSeen () &&
6099
6102
JA->getType () == types::TY_Archive) {
6100
6103
// Host part of the unbundled static archive is not used.
0 commit comments