Skip to content

Commit 1d55c86

Browse files
mdtoguchibader
authored andcommitted
[Driver][NFC] cleanup unused -fsycl-link FPGA bundling settings (#944)
When performing -fsycl-link -fintelfpga, there is no bundling step that occurs which uses the FPGA type specific settings (aocr, aocx, aoco). If a bundling step does occur (with -c), it is only for the specific device compile and does not include the AOT step. These settings were part of an earlier implementation that considered using a bundled binary instead of an archive to store the aocx/aocr generated bits Signed-off-by: Michael D Toguchi <[email protected]>
1 parent 117ac7f commit 1d55c86

File tree

1 file changed

+0
-21
lines changed

1 file changed

+0
-21
lines changed

clang/lib/Driver/ToolChains/Clang.cpp

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6840,27 +6840,6 @@ void OffloadBundler::ConstructJob(Compilation &C, const JobAction &JA,
68406840
Triples += CurDep->getOffloadingArch();
68416841
}
68426842
}
6843-
6844-
// When bundling for FPGA with -fsycl-link a specific triple is formulated
6845-
// to match the FPGA binary. We are also guaranteed only the single device
6846-
// and host object inputs.
6847-
const ToolChain *TCCheck = &getToolChain();
6848-
if (TCArgs.hasArg(options::OPT_fsycl_link_EQ) &&
6849-
TCCheck->getTriple().getSubArch() == llvm::Triple::SPIRSubArch_fpga) {
6850-
Triples = "-targets=";
6851-
llvm::Triple TT;
6852-
TT.setArchName(types::getTypeName(JA.getInputs()[0]->getType()));
6853-
TT.setVendorName("intel");
6854-
TT.setOS(llvm::Triple(TCCheck->getTriple()).getOS());
6855-
TT.setEnvironment(llvm::Triple::SYCLDevice);
6856-
Triples += "fpga-";
6857-
Triples += TT.normalize();
6858-
Triples += ",";
6859-
Triples += Action::GetOffloadKindName(Action::OFK_Host);
6860-
Triples += "-";
6861-
const ToolChain *HostTC = C.getSingleOffloadToolChain<Action::OFK_Host>();
6862-
Triples += HostTC->getTriple().normalize();
6863-
}
68646843
CmdArgs.push_back(TCArgs.MakeArgString(Triples));
68656844

68666845
// Get bundled file command.

0 commit comments

Comments
 (0)