Move the EnableFullLoadPRE flag from a separate command-line option to an
argument of createGVNPass and set it automatically for -O3.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@97245 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/llvm/Support/StandardPasses.h b/include/llvm/Support/StandardPasses.h
index f233c18de..b402e98 100644
--- a/include/llvm/Support/StandardPasses.h
+++ b/include/llvm/Support/StandardPasses.h
@@ -138,7 +138,7 @@
PM->add(createLoopUnrollPass()); // Unroll small loops
PM->add(createInstructionCombiningPass()); // Clean up after the unroller
if (OptimizationLevel > 1)
- PM->add(createGVNPass()); // Remove redundancies
+ PM->add(createGVNPass(OptimizationLevel > 2)); // Remove redundancies
PM->add(createMemCpyOptPass()); // Remove memcpy / form memset
PM->add(createSCCPPass()); // Constant prop with SCCP
diff --git a/include/llvm/Transforms/Scalar.h b/include/llvm/Transforms/Scalar.h
index 6893bad..4e6be46 100644
--- a/include/llvm/Transforms/Scalar.h
+++ b/include/llvm/Transforms/Scalar.h
@@ -263,7 +263,8 @@
// GVN - This pass performs global value numbering and redundant load
// elimination cotemporaneously.
//
-FunctionPass *createGVNPass(bool NoLoads = false);
+FunctionPass *createGVNPass(bool EnableFullLoadPRE = true,
+ bool NoLoads = false);
//===----------------------------------------------------------------------===//
//
diff --git a/lib/Transforms/Scalar/GVN.cpp b/lib/Transforms/Scalar/GVN.cpp
index f7470c3..c9a66fe 100644
--- a/lib/Transforms/Scalar/GVN.cpp
+++ b/lib/Transforms/Scalar/GVN.cpp
@@ -60,7 +60,6 @@
static cl::opt<bool> EnablePRE("enable-pre",
cl::init(true), cl::Hidden);
static cl::opt<bool> EnableLoadPRE("enable-load-pre", cl::init(true));
-static cl::opt<bool> EnableFullLoadPRE("enable-full-load-pre", cl::init(false));
//===----------------------------------------------------------------------===//
// ValueTable Class
@@ -662,10 +661,12 @@
bool runOnFunction(Function &F);
public:
static char ID; // Pass identification, replacement for typeid
- explicit GVN(bool noloads = false)
- : FunctionPass(&ID), NoLoads(noloads), MD(0) { }
+ explicit GVN(bool fullloadpre = true, bool noloads = false)
+ : FunctionPass(&ID), EnableFullLoadPRE(fullloadpre),
+ NoLoads(noloads), MD(0) { }
private:
+ bool EnableFullLoadPRE;
bool NoLoads;
MemoryDependenceAnalysis *MD;
DominatorTree *DT;
@@ -710,8 +711,8 @@
}
// createGVNPass - The public interface to this file...
-FunctionPass *llvm::createGVNPass(bool NoLoads) {
- return new GVN(NoLoads);
+FunctionPass *llvm::createGVNPass(bool EnableFullLoadPRE, bool NoLoads) {
+ return new GVN(EnableFullLoadPRE, NoLoads);
}
static RegisterPass<GVN> X("gvn",