From 788066a1f46872d076d4c7ae561b76237a625b69 Mon Sep 17 00:00:00 2001 From: Andrew Trick Date: Wed, 15 Feb 2012 05:43:27 +0000 Subject: Reapply r150565 with the typo fix properly merged. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@150567 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/Passes.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'lib/CodeGen/Passes.cpp') diff --git a/lib/CodeGen/Passes.cpp b/lib/CodeGen/Passes.cpp index ec1f2b4c3b..8fb94162b2 100644 --- a/lib/CodeGen/Passes.cpp +++ b/lib/CodeGen/Passes.cpp @@ -582,14 +582,8 @@ void TargetPassConfig::addOptimizedRegAlloc(FunctionPass *RegAllocPass) { // // FIXME: Re-enable coloring with register when it's capable of adding // kill markers. - 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"); + if (addPass(StackSlotColoringID) != &NoPassID) + printAndVerify("After StackSlotColoring"); } //===---------------------------------------------------------------------===// @@ -598,6 +592,10 @@ 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"); -- cgit v1.2.3