6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-07 14:33:15 +00:00
Code Issues Projects Releases Wiki Activity

MachineVerifier: Report register for bad liveranges

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@222380 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Matthias Braun 2014-11-19 19:46:13 +00:00
parent c754d5815d
commit 4a7e0736d3
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lib/CodeGen/MachineVerifier.cpp
View File

@ -215,9 +215,9 @@ namespace {
void report(const char *msg, const MachineBasicBlock *MBB, void report(const char *msg, const MachineBasicBlock *MBB,
const LiveInterval &LI); const LiveInterval &LI);
void report(const char *msg, const MachineFunction *MF, void report(const char *msg, const MachineFunction *MF,
const LiveRange &LR); const LiveRange &LR, unsigned Reg);
void report(const char *msg, const MachineBasicBlock *MBB, void report(const char *msg, const MachineBasicBlock *MBB,
const LiveRange &LR); const LiveRange &LR, unsigned Reg);
void verifyInlineAsm(const MachineInstr *MI); void verifyInlineAsm(const MachineInstr *MI);
@ -432,15 +432,17 @@ void MachineVerifier::report(const char *msg, const MachineBasicBlock *MBB,
} }
void MachineVerifier::report(const char *msg, const MachineBasicBlock *MBB, void MachineVerifier::report(const char *msg, const MachineBasicBlock *MBB,
const LiveRange &LR) { const LiveRange &LR, unsigned Reg) {
report(msg, MBB); report(msg, MBB);
*OS << "- liverange: " << LR << "\n"; *OS << "- liverange: " << LR << '\n';
*OS << "- register: " << PrintReg(Reg, TRI) << '\n';
} }
void MachineVerifier::report(const char *msg, const MachineFunction *MF, void MachineVerifier::report(const char *msg, const MachineFunction *MF,
const LiveRange &LR) { const LiveRange &LR, unsigned Reg) {
report(msg, MF); report(msg, MF);
*OS << "- liverange: " << LR << "\n"; *OS << "- liverange: " << LR << '\n';
*OS << "- register: " << PrintReg(Reg, TRI) << '\n';
} }
void MachineVerifier::markReachable(const MachineBasicBlock *MBB) { void MachineVerifier::markReachable(const MachineBasicBlock *MBB) {
@ -1360,13 +1362,13 @@ void MachineVerifier::verifyLiveRangeValue(const LiveRange &LR,
const VNInfo *DefVNI = LR.getVNInfoAt(VNI->def); const VNInfo *DefVNI = LR.getVNInfoAt(VNI->def);
if (!DefVNI) { if (!DefVNI) {
report("Valno not live at def and not marked unused", MF, LR); report("Valno not live at def and not marked unused", MF, LR, Reg);
*OS << "Valno #" << VNI->id << '\n'; *OS << "Valno #" << VNI->id << '\n';
return; return;
} }
if (DefVNI != VNI) { if (DefVNI != VNI) {
report("Live segment at def has different valno", MF, LR); report("Live segment at def has different valno", MF, LR, Reg);
*OS << "Valno #" << VNI->id << " is defined at " << VNI->def *OS << "Valno #" << VNI->id << " is defined at " << VNI->def
<< " where valno #" << DefVNI->id << " is live\n"; << " where valno #" << DefVNI->id << " is live\n";
return; return;
@ -1374,7 +1376,7 @@ void MachineVerifier::verifyLiveRangeValue(const LiveRange &LR,
const MachineBasicBlock *MBB = LiveInts->getMBBFromIndex(VNI->def); const MachineBasicBlock *MBB = LiveInts->getMBBFromIndex(VNI->def);
if (!MBB) { if (!MBB) {
report("Invalid definition index", MF, LR); report("Invalid definition index", MF, LR, Reg);
*OS << "Valno #" << VNI->id << " is defined at " << VNI->def *OS << "Valno #" << VNI->id << " is defined at " << VNI->def
<< " in " << LR << '\n'; << " in " << LR << '\n';
return; return;
@ -1382,7 +1384,7 @@ void MachineVerifier::verifyLiveRangeValue(const LiveRange &LR,
if (VNI->isPHIDef()) { if (VNI->isPHIDef()) {
if (VNI->def != LiveInts->getMBBStartIdx(MBB)) { if (VNI->def != LiveInts->getMBBStartIdx(MBB)) {
report("PHIDef value is not defined at MBB start", MBB, LR); report("PHIDef value is not defined at MBB start", MBB, LR, Reg);
*OS << "Valno #" << VNI->id << " is defined at " << VNI->def *OS << "Valno #" << VNI->id << " is defined at " << VNI->def
<< ", not at the beginning of BB#" << MBB->getNumber() << '\n'; << ", not at the beginning of BB#" << MBB->getNumber() << '\n';
} }
@ -1392,7 +1394,7 @@ void MachineVerifier::verifyLiveRangeValue(const LiveRange &LR,
// Non-PHI def. // Non-PHI def.
const MachineInstr *MI = LiveInts->getInstructionFromIndex(VNI->def); const MachineInstr *MI = LiveInts->getInstructionFromIndex(VNI->def);
if (!MI) { if (!MI) {
report("No instruction at def index", MBB, LR); report("No instruction at def index", MBB, LR, Reg);
*OS << "Valno #" << VNI->id << " is defined at " << VNI->def << '\n'; *OS << "Valno #" << VNI->id << " is defined at " << VNI->def << '\n';
return; return;
} }
@ -1425,12 +1427,13 @@ void MachineVerifier::verifyLiveRangeValue(const LiveRange &LR,
// DEF slots. // DEF slots.
if (isEarlyClobber) { if (isEarlyClobber) {
if (!VNI->def.isEarlyClobber()) { if (!VNI->def.isEarlyClobber()) {
report("Early clobber def must be at an early-clobber slot", MBB, LR); report("Early clobber def must be at an early-clobber slot", MBB, LR,
Reg);
*OS << "Valno #" << VNI->id << " is defined at " << VNI->def << '\n'; *OS << "Valno #" << VNI->id << " is defined at " << VNI->def << '\n';
} }
} else if (!VNI->def.isRegister()) { } else if (!VNI->def.isRegister()) {
report("Non-PHI, non-early clobber def must be at a register slot", report("Non-PHI, non-early clobber def must be at a register slot",
MBB, LR); MBB, LR, Reg);
*OS << "Valno #" << VNI->id << " is defined at " << VNI->def << '\n'; *OS << "Valno #" << VNI->id << " is defined at " << VNI->def << '\n';
} }
} }
@ -1444,31 +1447,31 @@ void MachineVerifier::verifyLiveRangeSegment(const LiveRange &LR,
assert(VNI && "Live segment has no valno"); assert(VNI && "Live segment has no valno");
if (VNI->id >= LR.getNumValNums() || VNI != LR.getValNumInfo(VNI->id)) { if (VNI->id >= LR.getNumValNums() || VNI != LR.getValNumInfo(VNI->id)) {
report("Foreign valno in live segment", MF, LR); report("Foreign valno in live segment", MF, LR, Reg);
*OS << S << " has a bad valno\n"; *OS << S << " has a bad valno\n";
} }
if (VNI->isUnused()) { if (VNI->isUnused()) {
report("Live segment valno is marked unused", MF, LR); report("Live segment valno is marked unused", MF, LR, Reg);
*OS << S << '\n'; *OS << S << '\n';
} }
const MachineBasicBlock *MBB = LiveInts->getMBBFromIndex(S.start); const MachineBasicBlock *MBB = LiveInts->getMBBFromIndex(S.start);
if (!MBB) { if (!MBB) {
report("Bad start of live segment, no basic block", MF, LR); report("Bad start of live segment, no basic block", MF, LR, Reg);
*OS << S << '\n'; *OS << S << '\n';
return; return;
} }
SlotIndex MBBStartIdx = LiveInts->getMBBStartIdx(MBB); SlotIndex MBBStartIdx = LiveInts->getMBBStartIdx(MBB);
if (S.start != MBBStartIdx && S.start != VNI->def) { if (S.start != MBBStartIdx && S.start != VNI->def) {
report("Live segment must begin at MBB entry or valno def", MBB, LR); report("Live segment must begin at MBB entry or valno def", MBB, LR, Reg);
*OS << S << '\n'; *OS << S << '\n';
} }
const MachineBasicBlock *EndMBB = const MachineBasicBlock *EndMBB =
LiveInts->getMBBFromIndex(S.end.getPrevSlot()); LiveInts->getMBBFromIndex(S.end.getPrevSlot());
if (!EndMBB) { if (!EndMBB) {
report("Bad end of live segment, no basic block", MF, LR); report("Bad end of live segment, no basic block", MF, LR, Reg);
*OS << S << '\n'; *OS << S << '\n';
return; return;
} }
@ -1486,14 +1489,14 @@ void MachineVerifier::verifyLiveRangeSegment(const LiveRange &LR,
const MachineInstr *MI = const MachineInstr *MI =
LiveInts->getInstructionFromIndex(S.end.getPrevSlot()); LiveInts->getInstructionFromIndex(S.end.getPrevSlot());
if (!MI) { if (!MI) {
report("Live segment doesn't end at a valid instruction", EndMBB, LR); report("Live segment doesn't end at a valid instruction", EndMBB, LR, Reg);
*OS << S << '\n'; *OS << S << '\n';
return; return;
} }
// The block slot must refer to a basic block boundary. // The block slot must refer to a basic block boundary.
if (S.end.isBlock()) { if (S.end.isBlock()) {
report("Live segment ends at B slot of an instruction", EndMBB, LR); report("Live segment ends at B slot of an instruction", EndMBB, LR, Reg);
*OS << S << '\n'; *OS << S << '\n';
} }
@ -1501,7 +1504,8 @@ void MachineVerifier::verifyLiveRangeSegment(const LiveRange &LR,
// Segment ends on the dead slot. // Segment ends on the dead slot.
// That means there must be a dead def. // That means there must be a dead def.
if (!SlotIndex::isSameInstr(S.start, S.end)) { if (!SlotIndex::isSameInstr(S.start, S.end)) {
report("Live segment ending at dead slot spans instructions", EndMBB, LR); report("Live segment ending at dead slot spans instructions", EndMBB, LR,
Reg);
*OS << S << '\n'; *OS << S << '\n';
} }
} }
@ -1511,7 +1515,7 @@ void MachineVerifier::verifyLiveRangeSegment(const LiveRange &LR,
if (S.end.isEarlyClobber()) { if (S.end.isEarlyClobber()) {
if (I+1 == LR.end() || (I+1)->start != S.end) { if (I+1 == LR.end() || (I+1)->start != S.end) {
report("Live segment ending at early clobber slot must be " report("Live segment ending at early clobber slot must be "
"redefined by an EC def in the same instruction", EndMBB, LR); "redefined by an EC def in the same instruction", EndMBB, LR, Reg);
*OS << S << '\n'; *OS << S << '\n';
} }
} }
@ -1569,7 +1573,7 @@ void MachineVerifier::verifyLiveRangeSegment(const LiveRange &LR,
// All predecessors must have a live-out value. // All predecessors must have a live-out value.
if (!PVNI) { if (!PVNI) {
report("Register not marked live out of predecessor", *PI, LR); report("Register not marked live out of predecessor", *PI, LR, Reg);
*OS << "Valno #" << VNI->id << " live into BB#" << MFI->getNumber() *OS << "Valno #" << VNI->id << " live into BB#" << MFI->getNumber()
<< '@' << LiveInts->getMBBStartIdx(MFI) << ", not live before " << '@' << LiveInts->getMBBStartIdx(MFI) << ", not live before "
<< PEnd << '\n'; << PEnd << '\n';
@ -1578,7 +1582,7 @@ void MachineVerifier::verifyLiveRangeSegment(const LiveRange &LR,
// Only PHI-defs can take different predecessor values. // Only PHI-defs can take different predecessor values.
if (!IsPHI && PVNI != VNI) { if (!IsPHI && PVNI != VNI) {
report("Different value live out of predecessor", *PI, LR); report("Different value live out of predecessor", *PI, LR, Reg);
*OS << "Valno #" << PVNI->id << " live out of BB#" *OS << "Valno #" << PVNI->id << " live out of BB#"
<< (*PI)->getNumber() << '@' << PEnd << (*PI)->getNumber() << '@' << PEnd
<< "\nValno #" << VNI->id << " live into BB#" << MFI->getNumber() << "\nValno #" << VNI->id << " live into BB#" << MFI->getNumber()