diff options
| author | Andrew Trick <atrick@apple.com> | 2012-02-15 07:57:03 +0000 |
|---|---|---|
| committer | Andrew Trick <atrick@apple.com> | 2012-02-15 07:57:03 +0000 |
| commit | 900d7b78e6cacca6c6062abf803d7ab1a4e39b38 (patch) | |
| tree | 4869180000db57a4aeeb2809f6568a9e6d929663 /lib/CodeGen/Passes.cpp | |
| parent | 788066a1f46872d076d4c7ae561b76237a625b69 (diff) | |
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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@150568 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/Passes.cpp')
| -rw-r--r-- | lib/CodeGen/Passes.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/CodeGen/Passes.cpp b/lib/CodeGen/Passes.cpp index 8fb94162b2..ec1f2b4c3b 100644 --- a/lib/CodeGen/Passes.cpp +++ b/lib/CodeGen/Passes.cpp @@ -582,8 +582,14 @@ void TargetPassConfig::addOptimizedRegAlloc(FunctionPass *RegAllocPass) { // // 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 @@ void TargetPassConfig::addOptimizedRegAlloc(FunctionPass *RegAllocPass) { /// 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"); |