Skip to content

[MISched] Small debug improvements #125072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 5, 2025
Merged

[MISched] Small debug improvements #125072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2e055fe
[MISched] Small debug improvements
c-rhodes Jan 30, 2025
62c7bb3
run clang-format
c-rhodes Jan 30, 2025
3c26a66
manually format
c-rhodes Jan 30, 2025
7373f88
add braces to fix botched clang-format
c-rhodes Jan 31, 2025
951cb97
move if into LLVM_DEBUG
c-rhodes Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 27 additions & 16 deletions llvm/lib/CodeGen/MachineScheduler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1293,9 +1293,9 @@ void ScheduleDAGMILive::initRegPressure() {
updatePressureDiffs(LiveUses);
}

LLVM_DEBUG(dbgs() << "Top Pressure:\n";
LLVM_DEBUG(dbgs() << "Top Pressure: ";
dumpRegSetPressure(TopRPTracker.getRegSetPressureAtPos(), TRI);
dbgs() << "Bottom Pressure:\n";
dbgs() << "Bottom Pressure: ";
dumpRegSetPressure(BotRPTracker.getRegSetPressureAtPos(), TRI););

assert((BotRPTracker.getPos() == RegionEnd ||
Expand All @@ -1316,11 +1316,14 @@ void ScheduleDAGMILive::initRegPressure() {
RegionCriticalPSets.push_back(PressureChange(i));
}
}
LLVM_DEBUG(dbgs() << "Excess PSets: ";
for (const PressureChange &RCPS
: RegionCriticalPSets) dbgs()
<< TRI->getRegPressureSetName(RCPS.getPSet()) << " ";
dbgs() << "\n");
LLVM_DEBUG({
if (RegionCriticalPSets.size() > 0) {
dbgs() << "Excess PSets: ";
for (const PressureChange &RCPS : RegionCriticalPSets)
dbgs() << TRI->getRegPressureSetName(RCPS.getPSet()) << " ";
dbgs() << "\n";
}
});
}

void ScheduleDAGMILive::
Expand Down Expand Up @@ -1374,10 +1377,14 @@ void ScheduleDAGMILive::updatePressureDiffs(ArrayRef<VRegMaskOrUnit> LiveUses) {

PressureDiff &PDiff = getPressureDiff(&SU);
PDiff.addPressureChange(Reg, Decrement, &MRI);
LLVM_DEBUG(dbgs() << " UpdateRegP: SU(" << SU.NodeNum << ") "
<< printReg(Reg, TRI) << ':'
<< PrintLaneMask(P.LaneMask) << ' ' << *SU.getInstr();
dbgs() << " to "; PDiff.dump(*TRI););
if (llvm::any_of(PDiff, [](const PressureChange &Change) {
return Change.isValid();
}))
LLVM_DEBUG(dbgs()
<< " UpdateRegPressure: SU(" << SU.NodeNum << ") "
<< printReg(Reg, TRI) << ':'
<< PrintLaneMask(P.LaneMask) << ' ' << *SU.getInstr();
dbgs() << " to "; PDiff.dump(*TRI););
}
} else {
assert(P.LaneMask.any());
Expand Down Expand Up @@ -1409,9 +1416,13 @@ void ScheduleDAGMILive::updatePressureDiffs(ArrayRef<VRegMaskOrUnit> LiveUses) {
if (LRQ.valueIn() == VNI) {
PressureDiff &PDiff = getPressureDiff(SU);
PDiff.addPressureChange(Reg, true, &MRI);
LLVM_DEBUG(dbgs() << " UpdateRegP: SU(" << SU->NodeNum << ") "
<< *SU->getInstr();
dbgs() << " to "; PDiff.dump(*TRI););
if (llvm::any_of(PDiff, [](const PressureChange &Change) {
return Change.isValid();
}))
LLVM_DEBUG(dbgs() << " UpdateRegPressure: SU(" << SU->NodeNum
<< ") " << *SU->getInstr();
dbgs() << " to ";
PDiff.dump(*TRI););
}
}
}
Expand Down Expand Up @@ -1671,7 +1682,7 @@ void ScheduleDAGMILive::scheduleMI(SUnit *SU, bool IsTopNode) {

TopRPTracker.advance(RegOpers);
assert(TopRPTracker.getPos() == CurrentTop && "out of sync");
LLVM_DEBUG(dbgs() << "Top Pressure:\n"; dumpRegSetPressure(
LLVM_DEBUG(dbgs() << "Top Pressure: "; dumpRegSetPressure(
TopRPTracker.getRegSetPressureAtPos(), TRI););

updateScheduledPressure(SU, TopRPTracker.getPressure().MaxSetPressure);
Expand Down Expand Up @@ -1709,7 +1720,7 @@ void ScheduleDAGMILive::scheduleMI(SUnit *SU, bool IsTopNode) {
SmallVector<VRegMaskOrUnit, 8> LiveUses;
BotRPTracker.recede(RegOpers, &LiveUses);
assert(BotRPTracker.getPos() == CurrentBottom && "out of sync");
LLVM_DEBUG(dbgs() << "Bottom Pressure:\n"; dumpRegSetPressure(
LLVM_DEBUG(dbgs() << "Bottom Pressure: "; dumpRegSetPressure(
BotRPTracker.getRegSetPressureAtPos(), TRI););

updateScheduledPressure(SU, BotRPTracker.getPressure().MaxSetPressure);
Expand Down
7 changes: 2 additions & 5 deletions llvm/lib/CodeGen/RegisterPressure.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,12 @@ static void decreaseSetPressure(std::vector<unsigned> &CurrSetPressure,
LLVM_DUMP_METHOD
void llvm::dumpRegSetPressure(ArrayRef<unsigned> SetPressure,
const TargetRegisterInfo *TRI) {
bool Empty = true;
for (unsigned i = 0, e = SetPressure.size(); i < e; ++i) {
if (SetPressure[i] != 0) {
dbgs() << TRI->getRegPressureSetName(i) << "=" << SetPressure[i] << '\n';
Empty = false;
dbgs() << TRI->getRegPressureSetName(i) << "=" << SetPressure[i] << ' ';
}
}
if (Empty)
dbgs() << "\n";
dbgs() << "\n";
}

LLVM_DUMP_METHOD
Expand Down