diff options
author | Krzysztof Parzyszek <kparzysz@codeaurora.org> | 2017-01-30 16:20:30 +0000 |
---|---|---|
committer | Krzysztof Parzyszek <kparzysz@codeaurora.org> | 2017-01-30 16:20:30 +0000 |
commit | 10d8ceab1f0148d78cd37273c1755ac1ee62feb9 (patch) | |
tree | a9048837e5c6401aa5a5b67b2b5444cb0839c505 /lib/Target/Hexagon/RDFGraph.cpp | |
parent | f24bf5a453e2e54aef2153a6e1f37aa07d1a370e (diff) |
[RDF] Add phis for entry block live-ins (in addition to function live-ins)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@293491 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/Hexagon/RDFGraph.cpp')
-rw-r--r-- | lib/Target/Hexagon/RDFGraph.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/Target/Hexagon/RDFGraph.cpp b/lib/Target/Hexagon/RDFGraph.cpp index ee8db96d40f..e5cfc7a96b4 100644 --- a/lib/Target/Hexagon/RDFGraph.cpp +++ b/lib/Target/Hexagon/RDFGraph.cpp @@ -764,7 +764,7 @@ void RegisterAggr::print(raw_ostream &OS) const { DataFlowGraph::DataFlowGraph(MachineFunction &mf, const TargetInstrInfo &tii, const TargetRegisterInfo &tri, const MachineDominatorTree &mdt, const MachineDominanceFrontier &mdf, const TargetOperandInfo &toi) - : MF(mf), TII(tii), TRI(tri), MDT(mdt), MDF(mdf), TOI(toi) { + : MF(mf), TII(tii), TRI(tri), MDT(mdt), MDF(mdf), TOI(toi), LiveIns(TRI) { } // The implementation of the definition stack. @@ -1010,12 +1010,20 @@ void DataFlowGraph::build(unsigned Options) { BlockRefsMap RefM; buildBlockRefs(EA, RefM); - // Add function-entry phi nodes. + // Collect function live-ins and entry block live-ins. MachineRegisterInfo &MRI = MF.getRegInfo(); - for (auto I = MRI.livein_begin(), E = MRI.livein_end(); I != E; ++I) { + MachineBasicBlock &EntryB = *EA.Addr->getCode(); + assert(EntryB.pred_empty() && "Function entry block has predecessors"); + for (auto I = MRI.livein_begin(), E = MRI.livein_end(); I != E; ++I) + LiveIns.insert(RegisterRef(I->first)); + for (auto I : EntryB.liveins()) + LiveIns.insert(RegisterRef(I.PhysReg, I.LaneMask)); + + // Add function-entry phi nodes for the live-in registers. + for (std::pair<RegisterId,LaneBitmask> P : LiveIns) { NodeAddr<PhiNode*> PA = newPhi(EA); - RegisterRef RR = RegisterRef(I->first); uint16_t PhiFlags = NodeAttrs::PhiRef | NodeAttrs::Preserving; + RegisterRef RR(P.first, P.second); NodeAddr<DefNode*> DA = newDef(PA, RR, PhiFlags); PA.Addr->addMember(DA, *this); } |