Add a hook to turn on the internalize pass through the LTO interface.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@154306 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling
2012-04-09 05:26:48 +00:00
parent ae1bec52f7
commit 3029a0c56a
5 changed files with 19 additions and 4 deletions

View File

@ -250,6 +250,12 @@ extern void
lto_codegen_set_assembler_args(lto_code_gen_t cg, const char **args, lto_codegen_set_assembler_args(lto_code_gen_t cg, const char **args,
int nargs); 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 * 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 * generated code. If a function is not listed, it might be
@ -258,7 +264,6 @@ lto_codegen_set_assembler_args(lto_code_gen_t cg, const char **args,
extern void extern void
lto_codegen_add_must_preserve_symbol(lto_code_gen_t cg, const char* symbol); 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 * Writes a new object file at the specified path that contains the
* merged contents of all modules added so far. * 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 extern bool
lto_codegen_write_merged_modules(lto_code_gen_t cg, const char* path); lto_codegen_write_merged_modules(lto_code_gen_t cg, const char* path);
/** /**
* Generates code for all added modules into one native object file. * Generates code for all added modules into one native object file.
* On success returns a pointer to a generated mach-o/ELF buffer and * On success returns a pointer to a generated mach-o/ELF buffer and

View File

@ -67,7 +67,7 @@ LTOCodeGenerator::LTOCodeGenerator()
: _context(getGlobalContext()), : _context(getGlobalContext()),
_linker("LinkTimeOptimizer", "ld-temp.o", _context), _target(NULL), _linker("LinkTimeOptimizer", "ld-temp.o", _context), _target(NULL),
_emitDwarfDebugInfo(false), _scopeRestrictionsDone(false), _emitDwarfDebugInfo(false), _scopeRestrictionsDone(false),
_codeModel(LTO_CODEGEN_PIC_MODEL_DYNAMIC), _runInternalizePass(false), _codeModel(LTO_CODEGEN_PIC_MODEL_DYNAMIC),
_nativeObjectFile(NULL) { _nativeObjectFile(NULL) {
InitializeAllTargets(); InitializeAllTargets();
InitializeAllTargetMCs(); InitializeAllTargetMCs();
@ -366,7 +366,8 @@ bool LTOCodeGenerator::generateObjectFile(raw_ostream &out,
// Add an appropriate TargetData instance for this module... // Add an appropriate TargetData instance for this module...
passes.add(new TargetData(*_target->getTargetData())); passes.add(new TargetData(*_target->getTargetData()));
PassManagerBuilder().populateLTOPassManager(passes, /*Internalize=*/ false, PassManagerBuilder().populateLTOPassManager(passes,
_runInternalizePass,
!DisableInline, !DisableInline,
DisableGVNLoadPRE); DisableGVNLoadPRE);

View File

@ -54,6 +54,8 @@ struct LTOCodeGenerator {
const void *compile(size_t *length, std::string &errMsg); const void *compile(size_t *length, std::string &errMsg);
void setCodeGenDebugOptions(const char *opts); void setCodeGenDebugOptions(const char *opts);
void enableInternalizePass() { _runInternalizePass = true; }
private: private:
bool generateObjectFile(llvm::raw_ostream &out, std::string &errMsg); bool generateObjectFile(llvm::raw_ostream &out, std::string &errMsg);
void applyScopeRestrictions(); void applyScopeRestrictions();
@ -70,6 +72,7 @@ private:
llvm::TargetMachine* _target; llvm::TargetMachine* _target;
bool _emitDwarfDebugInfo; bool _emitDwarfDebugInfo;
bool _scopeRestrictionsDone; bool _scopeRestrictionsDone;
bool _runInternalizePass;
lto_codegen_model _codeModel; lto_codegen_model _codeModel;
StringSet _mustPreserveSymbols; StringSet _mustPreserveSymbols;
StringSet _asmUndefinedRefs; StringSet _asmUndefinedRefs;

View File

@ -183,6 +183,12 @@ void lto_codegen_add_must_preserve_symbol(lto_code_gen_t cg,
cg->addMustPreserveSymbol(symbol); 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 /// 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 /// that contains the merged contents of all modules added so far. Returns true
/// on error (check lto_get_error_message() for details). /// on error (check lto_get_error_message() for details).

View File

@ -27,6 +27,7 @@ lto_codegen_set_assembler_args
lto_codegen_set_assembler_path lto_codegen_set_assembler_path
lto_codegen_set_cpu lto_codegen_set_cpu
lto_codegen_compile_to_file lto_codegen_compile_to_file
lto_codegen_whole_program_optimization
LLVMCreateDisasm LLVMCreateDisasm
LLVMDisasmDispose LLVMDisasmDispose
LLVMDisasmInstruction LLVMDisasmInstruction