X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FCodeGen%2FStrongPHIElimination.cpp;h=cdf827d50e6e9b055f4f2119a5fb36cf2f1ba2f4;hb=fcd8e9e3a21efb32172a6395e8697889962067e1;hp=3a7e108292537b9faf4594be0927c1b9cefa752d;hpb=0b4825c38b2e2bd2805292f708610b4ad9c7bf92;p=oota-llvm.git diff --git a/lib/CodeGen/StrongPHIElimination.cpp b/lib/CodeGen/StrongPHIElimination.cpp index 3a7e1082925..cdf827d50e6 100644 --- a/lib/CodeGen/StrongPHIElimination.cpp +++ b/lib/CodeGen/StrongPHIElimination.cpp @@ -25,6 +25,7 @@ #include "llvm/CodeGen/MachineDominators.h" #include "llvm/CodeGen/MachineFunctionPass.h" #include "llvm/CodeGen/MachineInstr.h" +#include "llvm/CodeGen/MachineRegisterInfo.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" #include "llvm/ADT/DepthFirstIterator.h" @@ -38,20 +39,33 @@ namespace { static char ID; // Pass identification, replacement for typeid StrongPHIElimination() : MachineFunctionPass((intptr_t)&ID) {} + // Waiting stores, for each MBB, the set of copies that need to + // be inserted into that MBB DenseMap > Waiting; + // Stacks holds the renaming stack for each register std::map > Stacks; + + // Registers in UsedByAnother are PHI nodes that are themselves + // used as operands to another another PHI node std::set UsedByAnother; + + // RenameSets are the sets of operands to a PHI (the defining instruction + // of the key) that can be renamed without copies + std::map > RenameSets; + + // Store the DFS-in number of each block + DenseMap preorder; + + // Store the DFS-out number of each block + DenseMap maxpreorder; bool runOnMachineFunction(MachineFunction &Fn); virtual void getAnalysisUsage(AnalysisUsage &AU) const { - AU.addPreserved(); - AU.addPreservedID(PHIEliminationID); AU.addRequired(); AU.addRequired(); - AU.setPreservesAll(); MachineFunctionPass::getAnalysisUsage(AU); } @@ -60,19 +74,32 @@ namespace { maxpreorder.clear(); Waiting.clear(); + Stacks.clear(); + UsedByAnother.clear(); + RenameSets.clear(); } private: + + /// DomForestNode - Represents a node in the "dominator forest". This is + /// a forest in which the nodes represent registers and the edges + /// represent a dominance relation in the block defining those registers. struct DomForestNode { private: + // Store references to our children std::vector children; + // The register we represent unsigned reg; + // Add another node as our child void addChild(DomForestNode* DFN) { children.push_back(DFN); } public: typedef std::vector::iterator iterator; + // Create a DomForestNode by providing the register it represents, and + // the node to be its parent. The virtual root node has register 0 + // and a null parent. DomForestNode(unsigned r, DomForestNode* parent) : reg(r) { if (parent) parent->addChild(this); @@ -83,26 +110,25 @@ namespace { delete *I; } + /// getReg - Return the regiser that this node represents inline unsigned getReg() { return reg; } + // Provide iterator access to our children inline DomForestNode::iterator begin() { return children.begin(); } inline DomForestNode::iterator end() { return children.end(); } }; - DenseMap preorder; - DenseMap maxpreorder; - - void computeDFS(MachineFunction& MF); void processBlock(MachineBasicBlock* MBB); - std::vector computeDomForest(std::set& instrs); + std::vector computeDomForest(std::set& instrs, + MachineRegisterInfo& MRI); void processPHIUnion(MachineInstr* Inst, std::set& PHIUnion, std::vector& DF, std::vector >& locals); void ScheduleCopies(MachineBasicBlock* MBB, std::set& pushed); - void InsertCopies(MachineBasicBlock* MBB); + void InsertCopies(MachineBasicBlock* MBB, std::set& v); }; char StrongPHIElimination::ID = 0; @@ -161,25 +187,24 @@ void StrongPHIElimination::computeDFS(MachineFunction& MF) { class PreorderSorter { private: DenseMap& preorder; - LiveVariables& LV; + MachineRegisterInfo& MRI; public: PreorderSorter(DenseMap& p, - LiveVariables& L) : preorder(p), LV(L) { } + MachineRegisterInfo& M) : preorder(p), MRI(M) { } bool operator()(unsigned A, unsigned B) { if (A == B) return false; - MachineBasicBlock* ABlock = LV.getVarInfo(A).DefInst->getParent(); - MachineBasicBlock* BBlock = LV.getVarInfo(A).DefInst->getParent(); + MachineBasicBlock* ABlock = MRI.getVRegDef(A)->getParent(); + MachineBasicBlock* BBlock = MRI.getVRegDef(B)->getParent(); if (preorder[ABlock] < preorder[BBlock]) return true; else if (preorder[ABlock] > preorder[BBlock]) return false; - assert(0 && "Error sorting by dominance!"); return false; } }; @@ -187,43 +212,58 @@ public: /// computeDomForest - compute the subforest of the DomTree corresponding /// to the defining blocks of the registers in question std::vector -StrongPHIElimination::computeDomForest(std::set& regs) { - LiveVariables& LV = getAnalysis(); - +StrongPHIElimination::computeDomForest(std::set& regs, + MachineRegisterInfo& MRI) { + // Begin by creating a virtual root node, since the actual results + // may well be a forest. Assume this node has maximum DFS-out number. DomForestNode* VirtualRoot = new DomForestNode(0, 0); maxpreorder.insert(std::make_pair((MachineBasicBlock*)0, ~0UL)); + // Populate a worklist with the registers std::vector worklist; worklist.reserve(regs.size()); for (std::set::iterator I = regs.begin(), E = regs.end(); I != E; ++I) worklist.push_back(*I); - PreorderSorter PS(preorder, LV); + // Sort the registers by the DFS-in number of their defining block + PreorderSorter PS(preorder, MRI); std::sort(worklist.begin(), worklist.end(), PS); + // Create a "current parent" stack, and put the virtual root on top of it DomForestNode* CurrentParent = VirtualRoot; std::vector stack; stack.push_back(VirtualRoot); + // Iterate over all the registers in the previously computed order for (std::vector::iterator I = worklist.begin(), E = worklist.end(); I != E; ++I) { - unsigned pre = preorder[LV.getVarInfo(*I).DefInst->getParent()]; - MachineBasicBlock* parentBlock = - LV.getVarInfo(CurrentParent->getReg()).DefInst->getParent(); + unsigned pre = preorder[MRI.getVRegDef(*I)->getParent()]; + MachineBasicBlock* parentBlock = CurrentParent->getReg() ? + MRI.getVRegDef(CurrentParent->getReg())->getParent() : + 0; + // If the DFS-in number of the register is greater than the DFS-out number + // of the current parent, repeatedly pop the parent stack until it isn't. while (pre > maxpreorder[parentBlock]) { stack.pop_back(); CurrentParent = stack.back(); - parentBlock = LV.getVarInfo(CurrentParent->getReg()).DefInst->getParent(); + parentBlock = CurrentParent->getReg() ? + MRI.getVRegDef(CurrentParent->getReg())->getParent() : + 0; } + // Now that we've found the appropriate parent, create a DomForestNode for + // this register and attach it to the forest DomForestNode* child = new DomForestNode(*I, CurrentParent); + + // Push this new node on the "current parent" stack stack.push_back(child); CurrentParent = child; } + // Return a vector containing the children of the virtual root node std::vector ret; ret.insert(ret.end(), VirtualRoot->begin(), VirtualRoot->end()); return ret; @@ -231,11 +271,13 @@ StrongPHIElimination::computeDomForest(std::set& regs) { /// isLiveIn - helper method that determines, from a VarInfo, if a register /// is live into a block -static bool isLiveIn(LiveVariables::VarInfo& V, MachineBasicBlock* MBB) { +static bool isLiveIn(unsigned r, MachineBasicBlock* MBB, + MachineRegisterInfo& MRI, LiveVariables& LV) { + LiveVariables::VarInfo V = LV.getVarInfo(r); if (V.AliveBlocks.test(MBB->getNumber())) return true; - if (V.DefInst->getParent() != MBB && + if (MRI.getVRegDef(r)->getParent() != MBB && V.UsedBlocks.test(MBB->getNumber())) return true; @@ -244,8 +286,10 @@ static bool isLiveIn(LiveVariables::VarInfo& V, MachineBasicBlock* MBB) { /// isLiveOut - help method that determines, from a VarInfo, if a register is /// live out of a block. -static bool isLiveOut(LiveVariables::VarInfo& V, MachineBasicBlock* MBB) { - if (MBB == V.DefInst->getParent() || +static bool isLiveOut(unsigned r, MachineBasicBlock* MBB, + MachineRegisterInfo& MRI, LiveVariables& LV) { + LiveVariables::VarInfo& V = LV.getVarInfo(r); + if (MBB == MRI.getVRegDef(r)->getParent() || V.UsedBlocks.test(MBB->getNumber())) { for (std::vector::iterator I = V.Kills.begin(), E = V.Kills.end(); I != E; ++I) @@ -258,21 +302,19 @@ static bool isLiveOut(LiveVariables::VarInfo& V, MachineBasicBlock* MBB) { return false; } -/// isKillInst - helper method that determines, from a VarInfo, if an -/// instruction kills a given register -static bool isKillInst(LiveVariables::VarInfo& V, MachineInstr* MI) { - return std::find(V.Kills.begin(), V.Kills.end(), MI) != V.Kills.end(); -} - /// interferes - checks for local interferences by scanning a block. The only /// trick parameter is 'mode' which tells it the relationship of the two /// registers. 0 - defined in the same block, 1 - first properly dominates /// second, 2 - second properly dominates first -static bool interferes(LiveVariables::VarInfo& First, LiveVariables::VarInfo& Second, - MachineBasicBlock* scan, unsigned mode) { +static bool interferes(unsigned a, unsigned b, MachineBasicBlock* scan, + LiveVariables& LV, unsigned mode) { MachineInstr* def = 0; MachineInstr* kill = 0; + // The code is still in SSA form at this point, so there is only one + // definition per VReg. Thus we can safely use MRI->getVRegDef(). + const MachineRegisterInfo* MRI = &scan->getParent()->getRegInfo(); + bool interference = false; // Wallk the block, checking for interferences @@ -282,23 +324,23 @@ static bool interferes(LiveVariables::VarInfo& First, LiveVariables::VarInfo& Se // Same defining block... if (mode == 0) { - if (curr == First.DefInst) { - // If we find our first DefInst, save it + if (curr == MRI->getVRegDef(a)) { + // If we find our first definition, save it if (!def) { def = curr; - // If there's already an unkilled DefInst, then + // If there's already an unkilled definition, then // this is an interference } else if (!kill) { interference = true; break; - // If there's a DefInst followed by a KillInst, then + // If there's a definition followed by a KillInst, then // they can't interfere } else { interference = false; break; } // Symmetric with the above - } else if (curr == Second.DefInst ) { + } else if (curr == MRI->getVRegDef(b)) { if (!def) { def = curr; } else if (!kill) { @@ -308,35 +350,35 @@ static bool interferes(LiveVariables::VarInfo& First, LiveVariables::VarInfo& Se interference = false; break; } - // Store KillInsts if they match up with the DefInst - } else if (isKillInst(First, curr)) { - if (def == First.DefInst) { + // Store KillInsts if they match up with the definition + } else if (LV.KillsRegister(curr, a)) { + if (def == MRI->getVRegDef(a)) { kill = curr; - } else if (isKillInst(Second, curr)) { - if (def == Second.DefInst) { + } else if (LV.KillsRegister(curr, b)) { + if (def == MRI->getVRegDef(b)) { kill = curr; } } } // First properly dominates second... } else if (mode == 1) { - if (curr == Second.DefInst) { - // DefInst of second without kill of first is an interference + if (curr == MRI->getVRegDef(b)) { + // Definition of second without kill of first is an interference if (!kill) { interference = true; break; - // DefInst after a kill is a non-interference + // Definition after a kill is a non-interference } else { interference = false; break; } // Save KillInsts of First - } else if (isKillInst(First, curr)) { + } else if (LV.KillsRegister(curr, a)) { kill = curr; } // Symmetric with the above } else if (mode == 2) { - if (curr == First.DefInst) { + if (curr == MRI->getVRegDef(a)) { if (!kill) { interference = true; break; @@ -344,7 +386,7 @@ static bool interferes(LiveVariables::VarInfo& First, LiveVariables::VarInfo& Se interference = false; break; } - } else if (isKillInst(Second, curr)) { + } else if (LV.KillsRegister(curr, b)) { kill = curr; } } @@ -353,81 +395,106 @@ static bool interferes(LiveVariables::VarInfo& First, LiveVariables::VarInfo& Se return interference; } -/// processBlock - Eliminate PHIs in the given block +/// processBlock - Determine how to break up PHIs in the current block. Each +/// PHI is broken up by some combination of renaming its operands and inserting +/// copies. This method is responsible for determining which operands receive +/// which treatment. void StrongPHIElimination::processBlock(MachineBasicBlock* MBB) { LiveVariables& LV = getAnalysis(); + MachineRegisterInfo& MRI = MBB->getParent()->getRegInfo(); // Holds names that have been added to a set in any PHI within this block // before the current one. std::set ProcessedNames; + // Iterate over all the PHI nodes in this block MachineBasicBlock::iterator P = MBB->begin(); - while (P->getOpcode() == TargetInstrInfo::PHI) { - LiveVariables::VarInfo& PHIInfo = LV.getVarInfo(P->getOperand(0).getReg()); - + while (P != MBB->end() && P->getOpcode() == TargetInstrInfo::PHI) { unsigned DestReg = P->getOperand(0).getReg(); - // Hold the names that are currently in the candidate set. + // PHIUnion is the set of incoming registers to the PHI node that + // are going to be renames rather than having copies inserted. This set + // is refinded over the course of this function. UnionedBlocks is the set + // of corresponding MBBs. std::set PHIUnion; std::set UnionedBlocks; + // Iterate over the operands of the PHI node for (int i = P->getNumOperands() - 1; i >= 2; i-=2) { unsigned SrcReg = P->getOperand(i-1).getReg(); - LiveVariables::VarInfo& SrcInfo = LV.getVarInfo(SrcReg); - // Check for trivial interferences - if (isLiveIn(SrcInfo, P->getParent()) || - isLiveOut(PHIInfo, SrcInfo.DefInst->getParent()) || - ( PHIInfo.DefInst->getOpcode() == TargetInstrInfo::PHI && - isLiveIn(PHIInfo, SrcInfo.DefInst->getParent()) ) || + // Check for trivial interferences via liveness information, allowing us + // to avoid extra work later. Any registers that interfere cannot both + // be in the renaming set, so choose one and add copies for it instead. + // The conditions are: + // 1) if the operand is live into the PHI node's block OR + // 2) if the PHI node is live out of the operand's defining block OR + // 3) if the operand is itself a PHI node and the original PHI is + // live into the operand's defining block OR + // 4) if the operand is already being renamed for another PHI node + // in this block OR + // 5) if any two operands are defined in the same block, insert copies + // for one of them + if (isLiveIn(SrcReg, P->getParent(), MRI, LV) || + isLiveOut(P->getOperand(0).getReg(), + MRI.getVRegDef(SrcReg)->getParent(), MRI, LV) || + ( MRI.getVRegDef(SrcReg)->getOpcode() == TargetInstrInfo::PHI && + isLiveIn(P->getOperand(0).getReg(), + MRI.getVRegDef(SrcReg)->getParent(), MRI, LV) ) || ProcessedNames.count(SrcReg) || - UnionedBlocks.count(SrcInfo.DefInst->getParent())) { + UnionedBlocks.count(MRI.getVRegDef(SrcReg)->getParent())) { - // add a copy from a_i to p in Waiting[From[a_i]] + // Add a copy for the selected register MachineBasicBlock* From = P->getOperand(i).getMBB(); Waiting[From].insert(std::make_pair(SrcReg, DestReg)); UsedByAnother.insert(SrcReg); } else { + // Otherwise, add it to the renaming set PHIUnion.insert(SrcReg); - UnionedBlocks.insert(SrcInfo.DefInst->getParent()); + UnionedBlocks.insert(MRI.getVRegDef(SrcReg)->getParent()); } } + // Compute the dominator forest for the renaming set. This is a forest + // where the nodes are the registers and the edges represent dominance + // relations between the defining blocks of the registers std::vector DF = - computeDomForest(PHIUnion); + computeDomForest(PHIUnion, MRI); - // Walk DomForest to resolve interferences + // Walk DomForest to resolve interferences at an inter-block level. This + // will remove registers from the renaming set (and insert copies for them) + // if interferences are found. std::vector > localInterferences; processPHIUnion(P, PHIUnion, DF, localInterferences); - // Check for local interferences + // The dominator forest walk may have returned some register pairs whose + // interference cannot be determines from dominator analysis. We now + // examine these pairs for local interferences. for (std::vector >::iterator I = localInterferences.begin(), E = localInterferences.end(); I != E; ++I) { std::pair p = *I; - LiveVariables::VarInfo& FirstInfo = LV.getVarInfo(p.first); - LiveVariables::VarInfo& SecondInfo = LV.getVarInfo(p.second); - MachineDominatorTree& MDT = getAnalysis(); // Determine the block we need to scan and the relationship between // the two registers MachineBasicBlock* scan = 0; unsigned mode = 0; - if (FirstInfo.DefInst->getParent() == SecondInfo.DefInst->getParent()) { - scan = FirstInfo.DefInst->getParent(); + if (MRI.getVRegDef(p.first)->getParent() == + MRI.getVRegDef(p.second)->getParent()) { + scan = MRI.getVRegDef(p.first)->getParent(); mode = 0; // Same block - } else if (MDT.dominates(FirstInfo.DefInst->getParent(), - SecondInfo.DefInst->getParent())) { - scan = SecondInfo.DefInst->getParent(); + } else if (MDT.dominates(MRI.getVRegDef(p.first)->getParent(), + MRI.getVRegDef(p.second)->getParent())) { + scan = MRI.getVRegDef(p.second)->getParent(); mode = 1; // First dominates second } else { - scan = FirstInfo.DefInst->getParent(); + scan = MRI.getVRegDef(p.first)->getParent(); mode = 2; // Second dominates first } // If there's an interference, we need to insert copies - if (interferes(FirstInfo, SecondInfo, scan, mode)) { + if (interferes(p.first, p.second, scan, LV, mode)) { // Insert copies for First for (int i = P->getNumOperands() - 1; i >= 2; i-=2) { if (P->getOperand(i-1).getReg() == p.first) { @@ -444,9 +511,13 @@ void StrongPHIElimination::processBlock(MachineBasicBlock* MBB) { } } - // FIXME: Cache renaming information + // Add the renaming set for this PHI node to our overal renaming information + RenameSets.insert(std::make_pair(P->getOperand(0).getReg(), PHIUnion)); + // Remember which registers are already renamed, so that we don't try to + // rename them for another PHI node in this block ProcessedNames.insert(PHIUnion.begin(), PHIUnion.end()); + ++P; } } @@ -463,6 +534,9 @@ void StrongPHIElimination::processPHIUnion(MachineInstr* Inst, std::vector worklist(DF.begin(), DF.end()); SmallPtrSet visited; + // Code is still in SSA form, so we can use MRI::getVRegDef() + MachineRegisterInfo& MRI = Inst->getParent()->getParent()->getRegInfo(); + LiveVariables& LV = getAnalysis(); unsigned DestReg = Inst->getOperand(0).getReg(); @@ -470,16 +544,20 @@ void StrongPHIElimination::processPHIUnion(MachineInstr* Inst, while (!worklist.empty()) { DomForestNode* DFNode = worklist.back(); - LiveVariables::VarInfo& Info = LV.getVarInfo(DFNode->getReg()); visited.insert(DFNode); bool inserted = false; for (DomForestNode::iterator CI = DFNode->begin(), CE = DFNode->end(); CI != CE; ++CI) { DomForestNode* child = *CI; - LiveVariables::VarInfo& CInfo = LV.getVarInfo(child->getReg()); - - if (isLiveOut(Info, CInfo.DefInst->getParent())) { + + // If the current node is live-out of the defining block of one of its + // children, insert a copy for it. NOTE: The paper actually calls for + // a more elaborate heuristic for determining whether to insert copies + // for the child or the parent. In the interest of simplicity, we're + // just always choosing the parent. + if (isLiveOut(DFNode->getReg(), + MRI.getVRegDef(child->getReg())->getParent(), MRI, LV)) { // Insert copies for parent for (int i = Inst->getNumOperands() - 1; i >= 2; i-=2) { if (Inst->getOperand(i-1).getReg() == DFNode->getReg()) { @@ -492,8 +570,14 @@ void StrongPHIElimination::processPHIUnion(MachineInstr* Inst, PHIUnion.erase(SrcReg); } } - } else if (isLiveIn(Info, CInfo.DefInst->getParent()) || - Info.DefInst->getParent() == CInfo.DefInst->getParent()) { + + // If a node is live-in to the defining block of one of its children, but + // not live-out, then we need to scan that block for local interferences. + } else if (isLiveIn(DFNode->getReg(), + MRI.getVRegDef(child->getReg())->getParent(), + MRI, LV) || + MRI.getVRegDef(DFNode->getReg())->getParent() == + MRI.getVRegDef(child->getReg())->getParent()) { // Add (p, c) to possible local interferences locals.push_back(std::make_pair(DFNode->getReg(), child->getReg())); } @@ -516,6 +600,7 @@ void StrongPHIElimination::processPHIUnion(MachineInstr* Inst, /// of Static Single Assignment Form" by Briggs, et al. void StrongPHIElimination::ScheduleCopies(MachineBasicBlock* MBB, std::set& pushed) { + // FIXME: This function needs to update LiveVariables std::map& copy_set= Waiting[MBB]; std::map worklist; @@ -540,6 +625,9 @@ void StrongPHIElimination::ScheduleCopies(MachineBasicBlock* MBB, } LiveVariables& LV = getAnalysis(); + MachineFunction* MF = MBB->getParent(); + MachineRegisterInfo& MRI = MF->getRegInfo(); + const TargetInstrInfo *TII = MF->getTarget().getInstrInfo(); // Iterate over the worklist, inserting copies while (!worklist.empty() || !copy_set.empty()) { @@ -547,13 +635,28 @@ void StrongPHIElimination::ScheduleCopies(MachineBasicBlock* MBB, std::pair curr = *worklist.begin(); worklist.erase(curr.first); - if (isLiveOut(LV.getVarInfo(curr.second), MBB)) { - // Insert copy from curr.second to a temporary + const TargetRegisterClass *RC = MF->getRegInfo().getRegClass(curr.first); + + if (isLiveOut(curr.second, MBB, MRI, LV)) { + // Create a temporary + unsigned t = MF->getRegInfo().createVirtualRegister(RC); + + // Insert copy from curr.second to a temporary at + // the Phi defining curr.second + MachineBasicBlock::iterator PI = MRI.getVRegDef(curr.second); + TII->copyRegToReg(*PI->getParent(), PI, t, + curr.second, RC, RC); + // Push temporary on Stacks - // Insert temporary in pushed + Stacks[curr.second].push_back(t); + + // Insert curr.second in pushed + pushed.insert(curr.second); } // Insert copy from map[curr.first] to curr.second + TII->copyRegToReg(*MBB, MBB->getFirstTerminator(), curr.second, + map[curr.first], RC, RC); map[curr.first] = curr.second; // If curr.first is a destination in copy_set... @@ -577,8 +680,13 @@ void StrongPHIElimination::ScheduleCopies(MachineBasicBlock* MBB, std::pair curr = *copy_set.begin(); copy_set.erase(curr.first); + const TargetRegisterClass *RC = MF->getRegInfo().getRegClass(curr.first); + // Insert a copy from dest to a new temporary t at the end of b - // map[curr.second] = t; + unsigned t = MF->getRegInfo().createVirtualRegister(RC); + TII->copyRegToReg(*MBB, MBB->getFirstTerminator(), t, + curr.second, RC, RC); + map[curr.second] = t; worklist.insert(curr); } @@ -586,7 +694,10 @@ void StrongPHIElimination::ScheduleCopies(MachineBasicBlock* MBB, } /// InsertCopies - insert copies into MBB and all of its successors -void StrongPHIElimination::InsertCopies(MachineBasicBlock* MBB) { +void StrongPHIElimination::InsertCopies(MachineBasicBlock* MBB, + std::set& visited) { + visited.insert(MBB); + std::set pushed; // Rewrite register uses from Stacks @@ -605,7 +716,8 @@ void StrongPHIElimination::InsertCopies(MachineBasicBlock* MBB) { for (GraphTraits::ChildIteratorType I = GraphTraits::child_begin(MBB), E = GraphTraits::child_end(MBB); I != E; ++I) - InsertCopies(*I); + if (!visited.count(*I)) + InsertCopies(*I, visited); // As we exit this block, pop the names we pushed while processing it for (std::set::iterator I = pushed.begin(), @@ -625,9 +737,31 @@ bool StrongPHIElimination::runOnMachineFunction(MachineFunction &Fn) { // Insert copies // FIXME: This process should probably preserve LiveVariables - InsertCopies(Fn.begin()); + std::set visited; + InsertCopies(Fn.begin(), visited); - // FIXME: Perform renaming + // Perform renaming + typedef std::map > RenameSetType; + for (RenameSetType::iterator I = RenameSets.begin(), E = RenameSets.end(); + I != E; ++I) + for (std::set::iterator SI = I->second.begin(), + SE = I->second.end(); SI != SE; ++SI) + Fn.getRegInfo().replaceRegWith(*SI, I->first); + + // FIXME: Insert last-minute copies + + // Remove PHIs + std::vector phis; + for (MachineFunction::iterator I = Fn.begin(), E = Fn.end(); I != E; ++I) { + for (MachineBasicBlock::iterator BI = I->begin(), BE = I->end(); + BI != BE; ++BI) + if (BI->getOpcode() == TargetInstrInfo::PHI) + phis.push_back(BI); + } + + for (std::vector::iterator I = phis.begin(), E = phis.end(); + I != E; ++I) + (*I)->eraseFromParent(); return false; }