RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 18:54:02 +01:00
Code Issues Projects Releases Wiki Activity

Fix for InlineSpiller accessing not updated dom tree base information.

Browse Source 
Summary:
The InlineSpiller was accessing the DominatorTreeBase directly
through the public data member DT in the MachineDominatorTree.
This is not a good idea as the "cached" information in
SplitCriticalEdges is not applied before the access.
The DominatorTreeBase must be accessed through the member
function getBase() in MachineDominatorTree.

The fault was introduced in r266162.

I think the public data member DT in the MachineDominatorTree
should have been made private in the original code (r215576)
that introduced the concept of lazily updating the
MachineDominatorTree information from
MachineBasicBlock::SplitCriticalEdge().

Patch by Karl-Johan Karlsson <karl-johan.karlsson@ericsson.com>

Reviewers: wmi, qcolombet

Subscribers: llvm-commits, bjope, uabelho

Differential Revision: https://reviews.llvm.org/D27983

llvm-svn: 290950
This commit is contained in:
Bjorn Pettersson 2017-01-04 09:41:56 +00:00
parent 6eba6db512
commit 53828bbf87
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/CodeGen/MachineDominators.h
View File

@ -59,6 +59,9 @@ class MachineDominatorTree : public MachineFunctionPass {
/// such as BB == elt.NewBB. /// such as BB == elt.NewBB.
mutable SmallSet<MachineBasicBlock *, 32> NewBBs; mutable SmallSet<MachineBasicBlock *, 32> NewBBs;
/// The DominatorTreeBase that is used to compute a normal dominator tree
DominatorTreeBase<MachineBasicBlock>* DT;
/// \brief Apply all the recorded critical edges to the DT. /// \brief Apply all the recorded critical edges to the DT.
/// This updates the underlying DT information in a way that uses /// This updates the underlying DT information in a way that uses
/// the fast query path of DT as much as possible. /// the fast query path of DT as much as possible.
@ -68,7 +71,6 @@ class MachineDominatorTree : public MachineFunctionPass {
public: public:
static char ID; // Pass ID, replacement for typeid static char ID; // Pass ID, replacement for typeid
DominatorTreeBase<MachineBasicBlock>* DT;
MachineDominatorTree(); MachineDominatorTree();

8
lib/CodeGen/InlineSpiller.cpp
View File

@ -1124,7 +1124,7 @@ void HoistSpillHelper::rmRedundantSpills(
// earlier spill with smaller SlotIndex. // earlier spill with smaller SlotIndex.
for (const auto CurrentSpill : Spills) { for (const auto CurrentSpill : Spills) {
MachineBasicBlock *Block = CurrentSpill->getParent(); MachineBasicBlock *Block = CurrentSpill->getParent();
MachineDomTreeNode *Node = MDT.DT->getNode(Block); MachineDomTreeNode *Node = MDT.getBase().getNode(Block);
MachineInstr *PrevSpill = SpillBBToSpill[Node]; MachineInstr *PrevSpill = SpillBBToSpill[Node];
if (PrevSpill) { if (PrevSpill) {
SlotIndex PIdx = LIS.getInstructionIndex(*PrevSpill); SlotIndex PIdx = LIS.getInstructionIndex(*PrevSpill);
@ -1132,9 +1132,9 @@ void HoistSpillHelper::rmRedundantSpills(
MachineInstr *SpillToRm = (CIdx > PIdx) ? CurrentSpill : PrevSpill; MachineInstr *SpillToRm = (CIdx > PIdx) ? CurrentSpill : PrevSpill;
MachineInstr *SpillToKeep = (CIdx > PIdx) ? PrevSpill : CurrentSpill; MachineInstr *SpillToKeep = (CIdx > PIdx) ? PrevSpill : CurrentSpill;
SpillsToRm.push_back(SpillToRm); SpillsToRm.push_back(SpillToRm);
SpillBBToSpill[MDT.DT->getNode(Block)] = SpillToKeep; SpillBBToSpill[MDT.getBase().getNode(Block)] = SpillToKeep;
} else { } else {
SpillBBToSpill[MDT.DT->getNode(Block)] = CurrentSpill; SpillBBToSpill[MDT.getBase().getNode(Block)] = CurrentSpill;
} }
} }
for (const auto SpillToRm : SpillsToRm) for (const auto SpillToRm : SpillsToRm)
@ -1209,7 +1209,7 @@ void HoistSpillHelper::getVisitOrders(
// Sort the nodes in WorkSet in top-down order and save the nodes // Sort the nodes in WorkSet in top-down order and save the nodes
// in Orders. Orders will be used for hoisting in runHoistSpills. // in Orders. Orders will be used for hoisting in runHoistSpills.
unsigned idx = 0; unsigned idx = 0;
Orders.push_back(MDT.DT->getNode(Root)); Orders.push_back(MDT.getBase().getNode(Root));
do { do {
MachineDomTreeNode *Node = Orders[idx++]; MachineDomTreeNode *Node = Orders[idx++];
const std::vector<MachineDomTreeNode *> &Children = Node->getChildren(); const std::vector<MachineDomTreeNode *> &Children = Node->getChildren();