[llvm-commits] [llvm] r150568 - /llvm/trunk/lib/CodeGen/Passes.cpp

[Andrew Trick]

Author: atrick
Date: Wed Feb 15 01:57:03 2012
New Revision: 150568

URL: http://llvm.org/viewvc/llvm-project?rev=150568&view=rev
Log:
Revert r150565 again. Appears to be a stage2 failure with dragonegg.

I'll put MachineLICM back before PEI. All my arm/x86 benchmarks look good, but buildbots don't like it.

Modified:
    llvm/trunk/lib/CodeGen/Passes.cpp

Modified: llvm/trunk/lib/CodeGen/Passes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/Passes.cpp?rev=150568&r1=150567&r2=150568&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/Passes.cpp (original)
+++ llvm/trunk/lib/CodeGen/Passes.cpp Wed Feb 15 01:57:03 2012
@@ -582,8 +582,14 @@
   //
   // FIXME: Re-enable coloring with register when it's capable of adding
   // kill markers.
-  if (addPass(StackSlotColoringID) != &NoPassID)
-    printAndVerify("After StackSlotColoring");
+  addPass(StackSlotColoringID);
+
+  // Run post-ra machine LICM to hoist reloads / remats.
+  //
+  // FIXME: can this move into MachineLateOptimization?
+  addPass(PostRAMachineLICMID);
+
+  printAndVerify("After StackSlotColoring and postra Machine LICM");
 }
 
 //===---------------------------------------------------------------------===//
@@ -592,10 +598,6 @@
 
 /// Add passes that optimize machine instructions after register allocation.
 void TargetPassConfig::addMachineLateOptimization() {
-  // Run post-ra machine LICM to hoist reloads / remats.
-  if (addPass(PostRAMachineLICMID) != &NoPassID)
-    printAndVerify("After postra Machine LICM");
-
   // Branch folding must be run after regalloc and prolog/epilog insertion.
   if (addPass(BranchFolderPassID) != &NoPassID)
     printNoVerify("After BranchFolding");