[llvm-commits] [llvm] r97245 - in /llvm/trunk: include/llvm/Support/StandardPasses.h include/llvm/Transforms/Scalar.h lib/Transforms/Scalar/GVN.cpp

[Bob Wilson]

Author: bwilson
Date: Fri Feb 26 13:09:47 2010
New Revision: 97245

URL: http://llvm.org/viewvc/llvm-project?rev=97245&view=rev
Log:
Move the EnableFullLoadPRE flag from a separate command-line option to an
argument of createGVNPass and set it automatically for -O3.

Modified:
    llvm/trunk/include/llvm/Support/StandardPasses.h
    llvm/trunk/include/llvm/Transforms/Scalar.h
    llvm/trunk/lib/Transforms/Scalar/GVN.cpp

Modified: llvm/trunk/include/llvm/Support/StandardPasses.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/StandardPasses.h?rev=97245&r1=97244&r2=97245&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/StandardPasses.h (original)
+++ llvm/trunk/include/llvm/Support/StandardPasses.h Fri Feb 26 13:09:47 2010
@@ -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
   

Modified: llvm/trunk/include/llvm/Transforms/Scalar.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Transforms/Scalar.h?rev=97245&r1=97244&r2=97245&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Transforms/Scalar.h (original)
+++ llvm/trunk/include/llvm/Transforms/Scalar.h Fri Feb 26 13:09:47 2010
@@ -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);
 
 //===----------------------------------------------------------------------===//
 //

Modified: llvm/trunk/lib/Transforms/Scalar/GVN.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/GVN.cpp?rev=97245&r1=97244&r2=97245&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/GVN.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/GVN.cpp Fri Feb 26 13:09:47 2010
@@ -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",