forked from OSchip/llvm-project
[LTO] Add a new splitCodeGen() API which takes a TargetMachineFactory.
This will be used in lld to avoid creating TargetMachine in two different places. See D18999 for a more detailed discussion. Differential Revision: http://reviews.llvm.org/D19139 llvm-svn: 266390
This commit is contained in:
parent
5d7ddfda2d
commit
3fdd27df03
|
@ -43,6 +43,19 @@ splitCodeGen(std::unique_ptr<Module> M, ArrayRef<raw_pwrite_stream *> OSs,
|
||||||
TargetMachine::CodeGenFileType FT = TargetMachine::CGFT_ObjectFile,
|
TargetMachine::CodeGenFileType FT = TargetMachine::CGFT_ObjectFile,
|
||||||
bool PreserveLocals = false);
|
bool PreserveLocals = false);
|
||||||
|
|
||||||
|
/// Split M into OSs.size() partitions, and generate code for each.
|
||||||
|
/// It is a variant that takes a factory function for the TargetMachine
|
||||||
|
/// TMFactory. TMFactory needs to be thread safe on the client side.
|
||||||
|
/// See the other splitCodeGen() for a more detailed description.
|
||||||
|
///
|
||||||
|
/// \returns M if OSs.size() == 1, otherwise returns std::unique_ptr<Module>().
|
||||||
|
std::unique_ptr<Module>
|
||||||
|
splitCodeGen(std::unique_ptr<Module> M, ArrayRef<raw_pwrite_stream *> OSs,
|
||||||
|
ArrayRef<llvm::raw_pwrite_stream *> BCOSs,
|
||||||
|
const std::function<std::unique_ptr<TargetMachine>()> &TMFactory,
|
||||||
|
TargetMachine::CodeGenFileType FT = TargetMachine::CGFT_ObjectFile,
|
||||||
|
bool PreserveLocals = false);
|
||||||
|
|
||||||
} // namespace llvm
|
} // namespace llvm
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -25,39 +25,47 @@
|
||||||
|
|
||||||
using namespace llvm;
|
using namespace llvm;
|
||||||
|
|
||||||
static void codegen(Module *M, llvm::raw_pwrite_stream &OS,
|
static void
|
||||||
const Target *TheTarget, StringRef CPU, StringRef Features,
|
codegen(Module *M, llvm::raw_pwrite_stream &OS,
|
||||||
const TargetOptions &Options, Reloc::Model RM,
|
const std::function<std::unique_ptr<TargetMachine>()> &TMFactory,
|
||||||
CodeModel::Model CM, CodeGenOpt::Level OL,
|
|
||||||
TargetMachine::CodeGenFileType FileType) {
|
TargetMachine::CodeGenFileType FileType) {
|
||||||
std::unique_ptr<TargetMachine> TM(TheTarget->createTargetMachine(
|
std::unique_ptr<TargetMachine> TM = TMFactory();
|
||||||
M->getTargetTriple(), CPU, Features, Options, RM, CM, OL));
|
|
||||||
|
|
||||||
legacy::PassManager CodeGenPasses;
|
legacy::PassManager CodeGenPasses;
|
||||||
if (TM->addPassesToEmitFile(CodeGenPasses, OS, FileType))
|
if (TM->addPassesToEmitFile(CodeGenPasses, OS, FileType))
|
||||||
report_fatal_error("Failed to setup codegen");
|
report_fatal_error("Failed to setup codegen");
|
||||||
CodeGenPasses.run(*M);
|
CodeGenPasses.run(*M);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<Module> llvm::splitCodeGen(
|
std::unique_ptr<Module>
|
||||||
std::unique_ptr<Module> M, ArrayRef<llvm::raw_pwrite_stream *> OSs,
|
llvm::splitCodeGen(std::unique_ptr<Module> M, ArrayRef<raw_pwrite_stream *> OSs,
|
||||||
ArrayRef<llvm::raw_pwrite_stream *> BCOSs, StringRef CPU,
|
ArrayRef<llvm::raw_pwrite_stream *> BCOSs, StringRef CPU,
|
||||||
StringRef Features, const TargetOptions &Options, Reloc::Model RM,
|
StringRef Features, const TargetOptions &Options,
|
||||||
CodeModel::Model CM, CodeGenOpt::Level OL,
|
Reloc::Model RM, CodeModel::Model CM, CodeGenOpt::Level OL,
|
||||||
TargetMachine::CodeGenFileType FileType, bool PreserveLocals) {
|
TargetMachine::CodeGenFileType FileType,
|
||||||
|
bool PreserveLocals) {
|
||||||
StringRef TripleStr = M->getTargetTriple();
|
StringRef TripleStr = M->getTargetTriple();
|
||||||
std::string ErrMsg;
|
std::string ErrMsg;
|
||||||
|
|
||||||
const Target *TheTarget = TargetRegistry::lookupTarget(TripleStr, ErrMsg);
|
const Target *TheTarget = TargetRegistry::lookupTarget(TripleStr, ErrMsg);
|
||||||
if (!TheTarget)
|
if (!TheTarget)
|
||||||
report_fatal_error(Twine("Target not found: ") + ErrMsg);
|
report_fatal_error(Twine("Target not found: ") + ErrMsg);
|
||||||
|
return splitCodeGen(std::move(M), OSs, BCOSs, [&]() {
|
||||||
|
return std::unique_ptr<TargetMachine>(TheTarget->createTargetMachine(
|
||||||
|
TripleStr, CPU, Features, Options, RM, CM, OL));
|
||||||
|
}, FileType, PreserveLocals);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<Module> llvm::splitCodeGen(
|
||||||
|
std::unique_ptr<Module> M, ArrayRef<llvm::raw_pwrite_stream *> OSs,
|
||||||
|
ArrayRef<llvm::raw_pwrite_stream *> BCOSs,
|
||||||
|
const std::function<std::unique_ptr<TargetMachine>()> &TMFactory,
|
||||||
|
TargetMachine::CodeGenFileType FileType, bool PreserveLocals) {
|
||||||
assert(BCOSs.empty() || BCOSs.size() == OSs.size());
|
assert(BCOSs.empty() || BCOSs.size() == OSs.size());
|
||||||
|
|
||||||
if (OSs.size() == 1) {
|
if (OSs.size() == 1) {
|
||||||
if (!BCOSs.empty())
|
if (!BCOSs.empty())
|
||||||
WriteBitcodeToFile(M.get(), *BCOSs[0]);
|
WriteBitcodeToFile(M.get(), *BCOSs[0]);
|
||||||
codegen(M.get(), *OSs[0], TheTarget, CPU, Features, Options, RM, CM, OL,
|
codegen(M.get(), *OSs[0], TMFactory, FileType);
|
||||||
FileType);
|
|
||||||
return M;
|
return M;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -88,8 +96,7 @@ std::unique_ptr<Module> llvm::splitCodeGen(
|
||||||
llvm::raw_pwrite_stream *ThreadOS = OSs[ThreadCount++];
|
llvm::raw_pwrite_stream *ThreadOS = OSs[ThreadCount++];
|
||||||
// Enqueue the task
|
// Enqueue the task
|
||||||
CodegenThreadPool.async(
|
CodegenThreadPool.async(
|
||||||
[TheTarget, CPU, Features, Options, RM, CM, OL, FileType,
|
[&TMFactory, FileType, ThreadOS](const SmallVector<char, 0> &BC) {
|
||||||
ThreadOS](const SmallVector<char, 0> &BC) {
|
|
||||||
LLVMContext Ctx;
|
LLVMContext Ctx;
|
||||||
ErrorOr<std::unique_ptr<Module>> MOrErr = parseBitcodeFile(
|
ErrorOr<std::unique_ptr<Module>> MOrErr = parseBitcodeFile(
|
||||||
MemoryBufferRef(StringRef(BC.data(), BC.size()),
|
MemoryBufferRef(StringRef(BC.data(), BC.size()),
|
||||||
|
@ -99,8 +106,7 @@ std::unique_ptr<Module> llvm::splitCodeGen(
|
||||||
report_fatal_error("Failed to read bitcode");
|
report_fatal_error("Failed to read bitcode");
|
||||||
std::unique_ptr<Module> MPartInCtx = std::move(MOrErr.get());
|
std::unique_ptr<Module> MPartInCtx = std::move(MOrErr.get());
|
||||||
|
|
||||||
codegen(MPartInCtx.get(), *ThreadOS, TheTarget, CPU, Features,
|
codegen(MPartInCtx.get(), *ThreadOS, TMFactory, FileType);
|
||||||
Options, RM, CM, OL, FileType);
|
|
||||||
},
|
},
|
||||||
// Pass BC using std::move to ensure that it get moved rather than
|
// Pass BC using std::move to ensure that it get moved rather than
|
||||||
// copied into the thread's context.
|
// copied into the thread's context.
|
||||||
|
|
Loading…
Reference in New Issue