From 2f21e07915c1e09245d51b64b55f0f25d5f8a7f5 Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Sat, 27 May 2006 18:47:11 +0000 Subject: Make LCSSA insert proper Phi nodes throughout the rest of the CFG by computing the iterated Dominance Frontier of the loop-closure Phi's. This is the second phase of the LCSSA pass. The third phase (coming soon) will be to update all uses of loop variables to use the loop-closure Phi's instead. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28524 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Utils/LCSSA.cpp | 59 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/Transforms/Utils/LCSSA.cpp b/lib/Transforms/Utils/LCSSA.cpp index c8d9487a6d..1142c87f0e 100644 --- a/lib/Transforms/Utils/LCSSA.cpp +++ b/lib/Transforms/Utils/LCSSA.cpp @@ -36,12 +36,13 @@ #include "llvm/Analysis/LoopInfo.h" #include "llvm/Support/CFG.h" #include +#include #include using namespace llvm; namespace { - static Statistic<> NumLCSSA("lcssa", "Number of times LCSSA was applied"); + static Statistic<> NumLCSSA("lcssa", "Number of live out of a loop"); class LCSSA : public FunctionPass { public: @@ -64,8 +65,7 @@ namespace { AU.addPreservedID(LoopSimplifyID); AU.addRequired(); AU.addPreserved(); - AU.addRequired(); // Not sure if this one will actually - // be needed. + AU.addRequired(); AU.addRequired(); } private: @@ -105,6 +105,11 @@ bool LCSSA::visitSubloop(Loop* L) { std::vector exitBlocks; L->getExitBlocks(exitBlocks); + // Phi nodes that need to be IDF-processed + std::vector workList; + + // Iterate over all affected values for this loop and insert Phi nodes + // for them in the appropriate exit blocks for (std::set::iterator I = AffectedValues.begin(), E = AffectedValues.end(); I != E; ++I) { ++NumLCSSA; // We are applying the transformation @@ -112,20 +117,58 @@ bool LCSSA::visitSubloop(Loop* L) { BBE = exitBlocks.end(); BBI != BBE; ++BBI) { PHINode *phi = new PHINode((*I)->getType(), "lcssa"); (*BBI)->getInstList().insert((*BBI)->front(), phi); + workList.push_back(phi); + // Since LoopSimplify has been run, we know that all of these predecessors + // are in the loop, so just hook them up in the obvious manner. for (pred_iterator PI = pred_begin(*BBI), PE = pred_end(*BBI); PI != PE; ++PI) phi->addIncoming(*I, *PI); } + } - for (Value::use_iterator UI = (*I)->use_begin(), UE = (*I)->use_end(); - UI != UE; ++UI) { - BasicBlock *UserBB = cast(*UI)->getParent(); - if (!std::binary_search(LoopBlocks.begin(), LoopBlocks.end(), UserBB)) - ; // FIXME: This should update the SSA form. + // Calculate the IDF of these LCSSA Phi nodes, inserting new Phi's where + // necessary. Keep track of these new Phi's in DFPhis. + std::map DFPhis; + for (std::vector::iterator I = workList.begin(), + E = workList.end(); I != E; ++I) { + + // Get the current Phi's DF, and insert Phi nodes. Add these new + // nodes to our worklist. + DominanceFrontier::const_iterator it = DF->find((*I)->getParent()); + if (it != DF->end()) { + const DominanceFrontier::DomSetType &S = it->second; + for (DominanceFrontier::DomSetType::const_iterator P = S.begin(), + PE = S.end(); P != PE; ++P) { + if (DFPhis[*P] == 0) { + // Still doesn't have operands... + PHINode *phi = new PHINode((*I)->getType(), "lcssa"); + (*P)->getInstList().insert((*P)->front(), phi); + DFPhis[*P] = phi; + + workList.push_back(phi); + } + } } + + // Get the predecessor blocks of the current Phi, and use them to hook up + // the operands of the current Phi to any members of DFPhis that dominate + // it. This is a nop for the Phis inserted directly in the exit blocks, + // since they are not dominated by any members of DFPhis. + for (pred_iterator PI = pred_begin((*I)->getParent()), + E = pred_end((*I)->getParent()); PI != E; ++PI) + for (std::map::iterator MI = DFPhis.begin(), + ME = DFPhis.end(); MI != ME; ++MI) + if (DT->getNode((*MI).first)->dominates(DT->getNode(*PI))) { + (*I)->addIncoming((*MI).second, *PI); + + // Since dominate() is not cheap, don't do it more than we have to. + break; + } } + // FIXME: Should update all uses. + return true; // FIXME: Should be more intelligent in our return value. } -- cgit v1.2.3