RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-04-04 22:31:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clarify debug output in LiveDebugValues

Browse Source 
MachineBasicBlocks often do not have names, so it helps to refer to them
by block number when printing debug messages.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@343889 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Vedant Kumar 2018-10-05 21:44:00 +00:00
parent f5174dba59
commit ff3a583947
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/CodeGen/LiveDebugValues.cpp
View File

@ -323,8 +323,10 @@ void LiveDebugValues::printVarLocInMBB(const MachineFunction &MF,
raw_ostream &Out) const { raw_ostream &Out) const {
Out << '\n' << msg << '\n'; Out << '\n' << msg << '\n';
for (const MachineBasicBlock &BB : MF) { for (const MachineBasicBlock &BB : MF) {
const auto &L = V.lookup(&BB); const VarLocSet &L = V.lookup(&BB);
Out << "MBB: " << BB.getName() << ":\n"; if (L.empty())
continue;
Out << "MBB: " << BB.getNumber() << ":\n";
for (unsigned VLL : L) { for (unsigned VLL : L) {
const VarLoc &VL = VarLocIDs[VLL]; const VarLoc &VL = VarLocIDs[VLL];
Out << " Var: " << VL.Var.getVar()->getName(); Out << " Var: " << VL.Var.getVar()->getName();
@ -604,7 +606,7 @@ bool LiveDebugValues::transferTerminatorInst(MachineInstr &MI,
LLVM_DEBUG(for (unsigned ID LLVM_DEBUG(for (unsigned ID
: OpenRanges.getVarLocs()) { : OpenRanges.getVarLocs()) {
// Copy OpenRanges to OutLocs, if not already present. // Copy OpenRanges to OutLocs, if not already present.
dbgs() << "Add to OutLocs: "; dbgs() << "Add to OutLocs in MBB #" << CurMBB->getNumber() << ": ";
VarLocIDs[ID].dump(); VarLocIDs[ID].dump();
}); });
VarLocSet &VLS = OutLocs[CurMBB]; VarLocSet &VLS = OutLocs[CurMBB];
@ -634,7 +636,7 @@ bool LiveDebugValues::process(MachineInstr &MI, OpenRangesSet &OpenRanges,
bool LiveDebugValues::join(MachineBasicBlock &MBB, VarLocInMBB &OutLocs, bool LiveDebugValues::join(MachineBasicBlock &MBB, VarLocInMBB &OutLocs,
VarLocInMBB &InLocs, const VarLocMap &VarLocIDs, VarLocInMBB &InLocs, const VarLocMap &VarLocIDs,
SmallPtrSet<const MachineBasicBlock *, 16> &Visited) { SmallPtrSet<const MachineBasicBlock *, 16> &Visited) {
LLVM_DEBUG(dbgs() << "join MBB: " << MBB.getName() << "\n"); LLVM_DEBUG(dbgs() << "join MBB: " << MBB.getNumber() << "\n");
bool Changed = false; bool Changed = false;
VarLocSet InLocsT; // Temporary incoming locations. VarLocSet InLocsT; // Temporary incoming locations.
@ -646,8 +648,11 @@ bool LiveDebugValues::join(MachineBasicBlock &MBB, VarLocInMBB &OutLocs,
// Ignore unvisited predecessor blocks. As we are processing // Ignore unvisited predecessor blocks. As we are processing
// the blocks in reverse post-order any unvisited block can // the blocks in reverse post-order any unvisited block can
// be considered to not remove any incoming values. // be considered to not remove any incoming values.
if (!Visited.count(p)) if (!Visited.count(p)) {
LLVM_DEBUG(dbgs() << " ignoring unvisited pred MBB: " << p->getNumber()
<< "\n");
continue; continue;
}
auto OL = OutLocs.find(p); auto OL = OutLocs.find(p);
// Join is null in case of empty OutLocs from any of the pred. // Join is null in case of empty OutLocs from any of the pred.
if (OL == OutLocs.end()) if (OL == OutLocs.end())
@ -659,14 +664,29 @@ bool LiveDebugValues::join(MachineBasicBlock &MBB, VarLocInMBB &OutLocs,
InLocsT = OL->second; InLocsT = OL->second;
else else
InLocsT &= OL->second; InLocsT &= OL->second;
LLVM_DEBUG({
if (!InLocsT.empty()) {
for (auto ID : InLocsT)
dbgs() << " gathered candidate incoming var: "
<< VarLocIDs[ID].Var.getVar()->getName() << "\n";
}
});
NumVisited++; NumVisited++;
} }
// Filter out DBG_VALUES that are out of scope. // Filter out DBG_VALUES that are out of scope.
VarLocSet KillSet; VarLocSet KillSet;
for (auto ID : InLocsT) for (auto ID : InLocsT) {
if (!VarLocIDs[ID].dominates(MBB)) if (!VarLocIDs[ID].dominates(MBB)) {
KillSet.set(ID); KillSet.set(ID);
LLVM_DEBUG({
auto Name = VarLocIDs[ID].Var.getVar()->getName();
dbgs() << " killing " << Name << ", it doesn't dominate MBB\n";
});
}
}
InLocsT.intersectWithComplement(KillSet); InLocsT.intersectWithComplement(KillSet);
// As we are processing blocks in reverse post-order we // As we are processing blocks in reverse post-order we