projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging r261039:
[oota-llvm.git]
/
tools
/
bugpoint
/
bugpoint.cpp
diff --git
a/tools/bugpoint/bugpoint.cpp
b/tools/bugpoint/bugpoint.cpp
index a575861ede222f85a7871eee80de99eaffea2bdf..48f30e6709f8089002fddcea620b8c7d34a1041d 100644
(file)
--- a/
tools/bugpoint/bugpoint.cpp
+++ b/
tools/bugpoint/bugpoint.cpp
@@
-16,10
+16,10
@@
#include "BugDriver.h"
#include "ToolRunner.h"
#include "llvm/IR/LLVMContext.h"
#include "BugDriver.h"
#include "ToolRunner.h"
#include "llvm/IR/LLVMContext.h"
+#include "llvm/IR/LegacyPassManager.h"
#include "llvm/IR/LegacyPassNameParser.h"
#include "llvm/LinkAllIR.h"
#include "llvm/LinkAllPasses.h"
#include "llvm/IR/LegacyPassNameParser.h"
#include "llvm/LinkAllIR.h"
#include "llvm/LinkAllPasses.h"
-#include "llvm/PassManager.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/PluginLoader.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/PluginLoader.h"
@@
-50,7
+50,7
@@
TimeoutValue("timeout", cl::init(300), cl::value_desc("seconds"),
static cl::opt<int>
MemoryLimit("mlimit", cl::init(-1), cl::value_desc("MBytes"),
cl::desc("Maximum amount of memory to use. 0 disables check."
static cl::opt<int>
MemoryLimit("mlimit", cl::init(-1), cl::value_desc("MBytes"),
cl::desc("Maximum amount of memory to use. 0 disables check."
- " Defaults to
3
00MB (800MB under valgrind)."));
+ " Defaults to
4
00MB (800MB under valgrind)."));
static cl::opt<bool>
UseValgrind("enable-valgrind",
static cl::opt<bool>
UseValgrind("enable-valgrind",
@@
-62,10
+62,6
@@
UseValgrind("enable-valgrind",
static cl::list<const PassInfo*, bool, PassNameParser>
PassList(cl::desc("Passes available:"), cl::ZeroOrMore);
static cl::list<const PassInfo*, bool, PassNameParser>
PassList(cl::desc("Passes available:"), cl::ZeroOrMore);
-static cl::opt<bool>
-StandardCompileOpts("std-compile-opts",
- cl::desc("Include the standard compile time optimizations"));
-
static cl::opt<bool>
StandardLinkOpts("std-link-opts",
cl::desc("Include the standard link time optimizations"));
static cl::opt<bool>
StandardLinkOpts("std-link-opts",
cl::desc("Include the standard link time optimizations"));
@@
-96,7
+92,7
@@
static void BugpointInterruptFunction() {
// Hack to capture a pass list.
namespace {
// Hack to capture a pass list.
namespace {
- class AddToDriver : public FunctionPassManager {
+ class AddToDriver : public
legacy::
FunctionPassManager {
BugDriver &D;
public:
AddToDriver(BugDriver &_D) : FunctionPassManager(nullptr), D(_D) {}
BugDriver &D;
public:
AddToDriver(BugDriver &_D) : FunctionPassManager(nullptr), D(_D) {}
@@
-130,7
+126,6
@@
int main(int argc, char **argv) {
initializeVectorization(Registry);
initializeIPO(Registry);
initializeAnalysis(Registry);
initializeVectorization(Registry);
initializeIPO(Registry);
initializeAnalysis(Registry);
- initializeIPA(Registry);
initializeTransformUtils(Registry);
initializeInstCombine(Registry);
initializeInstrumentation(Registry);
initializeTransformUtils(Registry);
initializeInstCombine(Registry);
initializeInstrumentation(Registry);
@@
-162,7
+157,7
@@
int main(int argc, char **argv) {
if (sys::RunningOnValgrind() || UseValgrind)
MemoryLimit = 800;
else
if (sys::RunningOnValgrind() || UseValgrind)
MemoryLimit = 800;
else
- MemoryLimit =
3
00;
+ MemoryLimit =
4
00;
}
BugDriver D(argv[0], FindBugs, TimeoutValue, MemoryLimit,
}
BugDriver D(argv[0], FindBugs, TimeoutValue, MemoryLimit,
@@
-170,12
+165,6
@@
int main(int argc, char **argv) {
if (D.addSources(InputFilenames)) return 1;
AddToDriver PM(D);
if (D.addSources(InputFilenames)) return 1;
AddToDriver PM(D);
- if (StandardCompileOpts) {
- PassManagerBuilder Builder;
- Builder.OptLevel = 3;
- Builder.Inliner = createFunctionInliningPass();
- Builder.populateModulePassManager(PM);
- }
if (StandardLinkOpts) {
PassManagerBuilder Builder;
if (StandardLinkOpts) {
PassManagerBuilder Builder;
@@
-191,19
+180,12
@@
int main(int argc, char **argv) {
Builder.Inliner = createFunctionInliningPass(225);
else
Builder.Inliner = createFunctionInliningPass(275);
Builder.Inliner = createFunctionInliningPass(225);
else
Builder.Inliner = createFunctionInliningPass(275);
-
- // Note that although clang/llvm-gcc use two separate passmanagers
- // here, it shouldn't normally make a difference.
Builder.populateFunctionPassManager(PM);
Builder.populateModulePassManager(PM);
}
Builder.populateFunctionPassManager(PM);
Builder.populateModulePassManager(PM);
}
- for (std::vector<const PassInfo*>::iterator I = PassList.begin(),
- E = PassList.end();
- I != E; ++I) {
- const PassInfo* PI = *I;
+ for (const PassInfo *PI : PassList)
D.addPass(PI->getPassArgument());
D.addPass(PI->getPassArgument());
- }
// Bugpoint has the ability of generating a plethora of core files, so to
// avoid filling up the disk, we prevent it
// Bugpoint has the ability of generating a plethora of core files, so to
// avoid filling up the disk, we prevent it