mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-23 03:02:36 +01:00
switch bugpoint and liblto to PassManagerBuilder.
llvm-svn: 131821
This commit is contained in:
parent
6e81571c48
commit
89036e6501
@ -22,7 +22,7 @@
|
||||
#include "llvm/Support/ManagedStatic.h"
|
||||
#include "llvm/Support/PluginLoader.h"
|
||||
#include "llvm/Support/PrettyStackTrace.h"
|
||||
#include "llvm/Support/StandardPasses.h"
|
||||
#include "llvm/Support/PassManagerBuilder.h"
|
||||
#include "llvm/Support/Process.h"
|
||||
#include "llvm/Support/Signals.h"
|
||||
#include "llvm/Support/Valgrind.h"
|
||||
@ -146,19 +146,17 @@ int main(int argc, char **argv) {
|
||||
|
||||
AddToDriver PM(D);
|
||||
if (StandardCompileOpts) {
|
||||
createStandardModulePasses(&PM, 3,
|
||||
/*OptimizeSize=*/ false,
|
||||
/*UnitAtATime=*/ true,
|
||||
/*UnrollLoops=*/ true,
|
||||
/*SimplifyLibCalls=*/ true,
|
||||
/*HaveExceptions=*/ true,
|
||||
createFunctionInliningPass());
|
||||
PassManagerBuilder Builder;
|
||||
Builder.OptLevel = 3;
|
||||
Builder.Inliner = createFunctionInliningPass();
|
||||
Builder.populateModulePassManager(PM);
|
||||
}
|
||||
|
||||
if (StandardLinkOpts)
|
||||
createStandardLTOPasses(&PM, /*Internalize=*/true,
|
||||
/*RunInliner=*/true,
|
||||
/*VerifyEach=*/false);
|
||||
if (StandardLinkOpts) {
|
||||
PassManagerBuilder Builder;
|
||||
Builder.populateLTOPassManager(PM, /*Internalize=*/true,
|
||||
/*RunInliner=*/true);
|
||||
}
|
||||
|
||||
|
||||
for (std::vector<const PassInfo*>::iterator I = PassList.begin(),
|
||||
|
@ -14,7 +14,6 @@
|
||||
|
||||
#include "LTOModule.h"
|
||||
#include "LTOCodeGenerator.h"
|
||||
|
||||
#include "llvm/Constants.h"
|
||||
#include "llvm/DerivedTypes.h"
|
||||
#include "llvm/Linker.h"
|
||||
@ -37,7 +36,7 @@
|
||||
#include "llvm/Support/CommandLine.h"
|
||||
#include "llvm/Support/FormattedStream.h"
|
||||
#include "llvm/Support/MemoryBuffer.h"
|
||||
#include "llvm/Support/StandardPasses.h"
|
||||
#include "llvm/Support/PassManagerBuilder.h"
|
||||
#include "llvm/Support/SystemUtils.h"
|
||||
#include "llvm/Support/ToolOutputFile.h"
|
||||
#include "llvm/Support/Host.h"
|
||||
@ -355,9 +354,8 @@ void LTOCodeGenerator::applyScopeRestrictions() {
|
||||
}
|
||||
|
||||
/// Optimize merged modules using various IPO passes
|
||||
bool LTOCodeGenerator::generateObjectFile(raw_ostream& out,
|
||||
std::string& errMsg)
|
||||
{
|
||||
bool LTOCodeGenerator::generateObjectFile(raw_ostream &out,
|
||||
std::string &errMsg) {
|
||||
if ( this->determineTarget(errMsg) )
|
||||
return true;
|
||||
|
||||
@ -380,13 +378,13 @@ bool LTOCodeGenerator::generateObjectFile(raw_ostream& out,
|
||||
// Add an appropriate TargetData instance for this module...
|
||||
passes.add(new TargetData(*_target->getTargetData()));
|
||||
|
||||
createStandardLTOPasses(&passes, /*Internalize=*/ false, !DisableInline,
|
||||
/*VerifyEach=*/ false);
|
||||
PassManagerBuilder().populateLTOPassManager(passes, /*Internalize=*/ false,
|
||||
!DisableInline);
|
||||
|
||||
// Make sure everything is still good.
|
||||
passes.add(createVerifierPass());
|
||||
|
||||
FunctionPassManager* codeGenPasses = new FunctionPassManager(mergedModule);
|
||||
FunctionPassManager *codeGenPasses = new FunctionPassManager(mergedModule);
|
||||
|
||||
codeGenPasses->add(new TargetData(*_target->getTargetData()));
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user