Revert r97245 which seems to be causing performance problems.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@97366 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Support/StandardPasses.h b/include/llvm/Support/StandardPasses.h
index b402e980a4d0189a114e0f9b98a21bccfdb6835c..f233c18de3ba152a744af5d3cf1a0449cd57beec 100644 (file)
--- 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(createLoopUnrollPass());          // Unroll small loops
     PM->add(createInstructionCombiningPass());  // Clean up after the unroller
     if (OptimizationLevel > 1)

-      PM->add(createGVNPass(OptimizationLevel > 2)); // Remove redundancies
+      PM->add(createGVNPass());                 // Remove redundancies

     PM->add(createMemCpyOptPass());             // Remove memcpy / form memset
     PM->add(createSCCPPass());                  // Constant prop with SCCP
   
     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 4e6be4605a519d7df6217f636e35fd42d21b3124..6893badfc2395b0050d9d8d886ae4a44fa73f513 100644 (file)
--- a/include/llvm/Transforms/Scalar.h
+++ b/include/llvm/Transforms/Scalar.h
@@ -263,8 +263,7 @@ extern const PassInfo *const LCSSAID;
 // GVN - This pass performs global value numbering and redundant load 
 // elimination cotemporaneously.
 //
 // GVN - This pass performs global value numbering and redundant load 
 // elimination cotemporaneously.
 //

-FunctionPass *createGVNPass(bool EnableFullLoadPRE = true,
-                            bool NoLoads = false);
+FunctionPass *createGVNPass(bool NoLoads = false);

 
 //===----------------------------------------------------------------------===//
 //
 
 //===----------------------------------------------------------------------===//
 //

diff --git a/lib/Transforms/Scalar/GVN.cpp b/lib/Transforms/Scalar/GVN.cpp
index c9a66fe6ec736b583ab494b43d502099eff5109e..f7470c3c19ee2b16a890a54176221a95dbb626cb 100644 (file)
--- a/lib/Transforms/Scalar/GVN.cpp
+++ b/lib/Transforms/Scalar/GVN.cpp
@@ -60,6 +60,7 @@ 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> 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
 
 //===----------------------------------------------------------------------===//
 //                         ValueTable Class


@@ -661,12 +662,10 @@ namespace {
     bool runOnFunction(Function &F);
   public:
     static char ID; // Pass identification, replacement for typeid
     bool runOnFunction(Function &F);
   public:
     static char ID; // Pass identification, replacement for typeid

-    explicit GVN(bool fullloadpre = true, bool noloads = false)
-      : FunctionPass(&ID), EnableFullLoadPRE(fullloadpre),
-        NoLoads(noloads), MD(0) { }
+    explicit GVN(bool noloads = false)
+      : FunctionPass(&ID), NoLoads(noloads), MD(0) { }

 
   private:
 
   private:

-    bool EnableFullLoadPRE;

     bool NoLoads;
     MemoryDependenceAnalysis *MD;
     DominatorTree *DT;
     bool NoLoads;
     MemoryDependenceAnalysis *MD;
     DominatorTree *DT;


@@ -711,8 +710,8 @@ namespace {
 }
 
 // createGVNPass - The public interface to this file...
 }
 
 // createGVNPass - The public interface to this file...

-FunctionPass *llvm::createGVNPass(bool EnableFullLoadPRE, bool NoLoads) {
-  return new GVN(EnableFullLoadPRE, NoLoads);
+FunctionPass *llvm::createGVNPass(bool NoLoads) {
+  return new GVN(NoLoads);

 }
 
 static RegisterPass<GVN> X("gvn",
 }
 
 static RegisterPass<GVN> X("gvn",