diff options
| -rw-r--r-- | include/llvm/Support/StandardPasses.h | 2 | ||||
| -rw-r--r-- | include/llvm/Transforms/Scalar.h | 3 | ||||
| -rw-r--r-- | lib/Transforms/Scalar/GVN.cpp | 11 |
3 files changed, 9 insertions, 7 deletions
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 @@ namespace llvm { 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 @@ extern const PassInfo *const LCSSAID; // 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 @@ STATISTIC(NumPRELoad, "Number of loads PRE'd"); 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 @@ namespace { 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 @@ namespace { } // 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", |