diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/include/llvm-c/lto.h | 8 | ||||
| -rw-r--r-- | llvm/tools/lto/LTOCodeGenerator.cpp | 5 | ||||
| -rw-r--r-- | llvm/tools/lto/LTOCodeGenerator.h | 3 | ||||
| -rw-r--r-- | llvm/tools/lto/lto.cpp | 6 | ||||
| -rw-r--r-- | llvm/tools/lto/lto.exports | 1 |
5 files changed, 19 insertions, 4 deletions
diff --git a/llvm/include/llvm-c/lto.h b/llvm/include/llvm-c/lto.h index f822b475249..c0f4c6b30c8 100644 --- a/llvm/include/llvm-c/lto.h +++ b/llvm/include/llvm-c/lto.h @@ -251,6 +251,12 @@ lto_codegen_set_assembler_args(lto_code_gen_t cg, const char **args, int nargs); /** + * Enables the internalize pass during LTO optimizations. + */ +extern void +lto_codegen_whole_program_optimization(lto_code_gen_t cg); + +/** * Adds to a list of all global symbols that must exist in the final * generated code. If a function is not listed, it might be * inlined into every usage and optimized away. @@ -258,7 +264,6 @@ lto_codegen_set_assembler_args(lto_code_gen_t cg, const char **args, extern void lto_codegen_add_must_preserve_symbol(lto_code_gen_t cg, const char* symbol); - /** * Writes a new object file at the specified path that contains the * merged contents of all modules added so far. @@ -267,7 +272,6 @@ lto_codegen_add_must_preserve_symbol(lto_code_gen_t cg, const char* symbol); extern bool lto_codegen_write_merged_modules(lto_code_gen_t cg, const char* path); - /** * Generates code for all added modules into one native object file. * On success returns a pointer to a generated mach-o/ELF buffer and diff --git a/llvm/tools/lto/LTOCodeGenerator.cpp b/llvm/tools/lto/LTOCodeGenerator.cpp index 0e61c2fb2a5..7620bcb1c18 100644 --- a/llvm/tools/lto/LTOCodeGenerator.cpp +++ b/llvm/tools/lto/LTOCodeGenerator.cpp @@ -67,7 +67,7 @@ LTOCodeGenerator::LTOCodeGenerator() : _context(getGlobalContext()), _linker("LinkTimeOptimizer", "ld-temp.o", _context), _target(NULL), _emitDwarfDebugInfo(false), _scopeRestrictionsDone(false), - _codeModel(LTO_CODEGEN_PIC_MODEL_DYNAMIC), + _runInternalizePass(false), _codeModel(LTO_CODEGEN_PIC_MODEL_DYNAMIC), _nativeObjectFile(NULL) { InitializeAllTargets(); InitializeAllTargetMCs(); @@ -366,7 +366,8 @@ bool LTOCodeGenerator::generateObjectFile(raw_ostream &out, // Add an appropriate TargetData instance for this module... passes.add(new TargetData(*_target->getTargetData())); - PassManagerBuilder().populateLTOPassManager(passes, /*Internalize=*/ false, + PassManagerBuilder().populateLTOPassManager(passes, + _runInternalizePass, !DisableInline, DisableGVNLoadPRE); diff --git a/llvm/tools/lto/LTOCodeGenerator.h b/llvm/tools/lto/LTOCodeGenerator.h index 3081b7dad1d..bac3e6efe90 100644 --- a/llvm/tools/lto/LTOCodeGenerator.h +++ b/llvm/tools/lto/LTOCodeGenerator.h @@ -54,6 +54,8 @@ struct LTOCodeGenerator { const void *compile(size_t *length, std::string &errMsg); void setCodeGenDebugOptions(const char *opts); + void enableInternalizePass() { _runInternalizePass = true; } + private: bool generateObjectFile(llvm::raw_ostream &out, std::string &errMsg); void applyScopeRestrictions(); @@ -70,6 +72,7 @@ private: llvm::TargetMachine* _target; bool _emitDwarfDebugInfo; bool _scopeRestrictionsDone; + bool _runInternalizePass; lto_codegen_model _codeModel; StringSet _mustPreserveSymbols; StringSet _asmUndefinedRefs; diff --git a/llvm/tools/lto/lto.cpp b/llvm/tools/lto/lto.cpp index a7e633d14b9..e523eb39018 100644 --- a/llvm/tools/lto/lto.cpp +++ b/llvm/tools/lto/lto.cpp @@ -183,6 +183,12 @@ void lto_codegen_add_must_preserve_symbol(lto_code_gen_t cg, cg->addMustPreserveSymbol(symbol); } +/// lto_codegen_whole_program_optimization - Enable the internalize pass during +/// LTO optimizations. +void lto_codegen_whole_program_optimization(lto_code_gen_t cg) { + cg->enableInternalizePass(); +} + /// lto_codegen_write_merged_modules - Writes a new file at the specified path /// that contains the merged contents of all modules added so far. Returns true /// on error (check lto_get_error_message() for details). diff --git a/llvm/tools/lto/lto.exports b/llvm/tools/lto/lto.exports index b900bfb594b..1726388c0ae 100644 --- a/llvm/tools/lto/lto.exports +++ b/llvm/tools/lto/lto.exports @@ -27,6 +27,7 @@ lto_codegen_set_assembler_args lto_codegen_set_assembler_path lto_codegen_set_cpu lto_codegen_compile_to_file +lto_codegen_whole_program_optimization LLVMCreateDisasm LLVMDisasmDispose LLVMDisasmInstruction |
