[llvm-commits] CVS: llvm/lib/CodeGen/AsmPrinter.cpp DwarfWriter.cpp ELFWriter.cpp LiveInterval.cpp LiveIntervalAnalysis.cpp
Bill Wendling
isanbard at gmail.com
Tue Nov 28 16:40:03 PST 2006
Changes in directory llvm/lib/CodeGen:
AsmPrinter.cpp updated: 1.118 -> 1.119
DwarfWriter.cpp updated: 1.101 -> 1.102
ELFWriter.cpp updated: 1.28 -> 1.29
LiveInterval.cpp updated: 1.38 -> 1.39
LiveIntervalAnalysis.cpp updated: 1.197 -> 1.198
---
Log message:
Converted to using llvm streams instead of <iostream>s
---
Diffs of the changes: (+101 -87)
AsmPrinter.cpp | 25 ++++----
DwarfWriter.cpp | 20 +++++-
ELFWriter.cpp | 5 +
LiveInterval.cpp | 2
LiveIntervalAnalysis.cpp | 136 +++++++++++++++++++++++------------------------
5 files changed, 101 insertions(+), 87 deletions(-)
Index: llvm/lib/CodeGen/AsmPrinter.cpp
diff -u llvm/lib/CodeGen/AsmPrinter.cpp:1.118 llvm/lib/CodeGen/AsmPrinter.cpp:1.119
--- llvm/lib/CodeGen/AsmPrinter.cpp:1.118 Sun Nov 26 19:05:09 2006
+++ llvm/lib/CodeGen/AsmPrinter.cpp Tue Nov 28 18:39:47 2006
@@ -20,11 +20,12 @@
#include "llvm/CodeGen/MachineJumpTableInfo.h"
#include "llvm/Support/Mangler.h"
#include "llvm/Support/MathExtras.h"
+#include "llvm/Support/Streams.h"
#include "llvm/Target/TargetAsmInfo.h"
#include "llvm/Target/TargetData.h"
#include "llvm/Target/TargetLowering.h"
#include "llvm/Target/TargetMachine.h"
-#include <iostream>
+#include <ostream>
#include <cerrno>
using namespace llvm;
@@ -667,7 +668,7 @@
if (LastMI != MI) { ++Counter; LastMI = MI; }
O << Counter;
} else {
- std::cerr << "Unknown special formatter '" << Code
+ llvm_cerr << "Unknown special formatter '" << Code
<< "' for machine instr: " << *MI;
exit(1);
}
@@ -736,8 +737,8 @@
case '(': // $( -> same as GCC's { character.
++LastEmitted; // Consume '(' character.
if (CurVariant != -1) {
- std::cerr << "Nested variants found in inline asm string: '"
- << AsmStr << "'\n";
+ llvm_cerr << "Nested variants found in inline asm string: '"
+ << AsmStr << "'\n";
exit(1);
}
CurVariant = 0; // We're in the first variant now.
@@ -745,8 +746,8 @@
case '|':
++LastEmitted; // consume '|' character.
if (CurVariant == -1) {
- std::cerr << "Found '|' character outside of variant in inline asm "
- << "string: '" << AsmStr << "'\n";
+ llvm_cerr << "Found '|' character outside of variant in inline asm "
+ << "string: '" << AsmStr << "'\n";
exit(1);
}
++CurVariant; // We're in the next variant.
@@ -754,7 +755,7 @@
case ')': // $) -> same as GCC's } char.
++LastEmitted; // consume ')' character.
if (CurVariant == -1) {
- std::cerr << "Found '}' character outside of variant in inline asm "
+ llvm_cerr << "Found '}' character outside of variant in inline asm "
<< "string: '" << AsmStr << "'\n";
exit(1);
}
@@ -773,7 +774,7 @@
char *IDEnd;
long Val = strtol(IDStart, &IDEnd, 10); // We only accept numbers for IDs.
if (!isdigit(*IDStart) || (Val == 0 && errno == EINVAL)) {
- std::cerr << "Bad $ operand number in inline asm string: '"
+ llvm_cerr << "Bad $ operand number in inline asm string: '"
<< AsmStr << "'\n";
exit(1);
}
@@ -787,7 +788,7 @@
if (*LastEmitted == ':') {
++LastEmitted; // Consume ':' character.
if (*LastEmitted == 0) {
- std::cerr << "Bad ${:} expression in inline asm string: '"
+ llvm_cerr << "Bad ${:} expression in inline asm string: '"
<< AsmStr << "'\n";
exit(1);
}
@@ -797,7 +798,7 @@
}
if (*LastEmitted != '}') {
- std::cerr << "Bad ${} expression in inline asm string: '"
+ llvm_cerr << "Bad ${} expression in inline asm string: '"
<< AsmStr << "'\n";
exit(1);
}
@@ -805,7 +806,7 @@
}
if ((unsigned)Val >= NumOperands-1) {
- std::cerr << "Invalid $ operand number in inline asm string: '"
+ llvm_cerr << "Invalid $ operand number in inline asm string: '"
<< AsmStr << "'\n";
exit(1);
}
@@ -840,7 +841,7 @@
}
}
if (Error) {
- std::cerr << "Invalid operand found in inline asm: '"
+ llvm_cerr << "Invalid operand found in inline asm: '"
<< AsmStr << "'\n";
MI->dump();
exit(1);
Index: llvm/lib/CodeGen/DwarfWriter.cpp
diff -u llvm/lib/CodeGen/DwarfWriter.cpp:1.101 llvm/lib/CodeGen/DwarfWriter.cpp:1.102
--- llvm/lib/CodeGen/DwarfWriter.cpp:1.101 Thu Nov 9 10:32:26 2006
+++ llvm/lib/CodeGen/DwarfWriter.cpp Tue Nov 28 18:39:47 2006
@@ -32,7 +32,7 @@
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetFrameInfo.h"
-#include <iostream>
+#include <ostream>
#include <string>
using namespace llvm;
@@ -139,6 +139,9 @@
}
#ifndef NDEBUG
+ void print(llvm_ostream &O) const {
+ if (O.stream()) print(*O.stream());
+ }
void print(std::ostream &O) const {
O << ".debug_" << Tag;
if (Number) O << Number;
@@ -244,6 +247,9 @@
void Emit(const Dwarf &DW) const;
#ifndef NDEBUG
+ void print(llvm_ostream &O) {
+ if (O.stream()) print(*O.stream());
+ }
void print(std::ostream &O);
void dump();
#endif
@@ -331,6 +337,9 @@
void Profile(FoldingSetNodeID &ID) ;
#ifndef NDEBUG
+ void print(llvm_ostream &O, unsigned IncIndent = 0) {
+ if (O.stream()) print(*O.stream(), IncIndent);
+ }
void print(std::ostream &O, unsigned IncIndent = 0);
void dump();
#endif
@@ -379,6 +388,9 @@
virtual void Profile(FoldingSetNodeID &ID) = 0;
#ifndef NDEBUG
+ void print(llvm_ostream &O) {
+ if (O.stream()) print(*O.stream());
+ }
virtual void print(std::ostream &O) = 0;
void dump();
#endif
@@ -2839,14 +2851,14 @@
<< "\n";
}
}
-void DIEAbbrev::dump() { print(std::cerr); }
+void DIEAbbrev::dump() { print(llvm_cerr); }
#endif
//===----------------------------------------------------------------------===//
#ifndef NDEBUG
void DIEValue::dump() {
- print(std::cerr);
+ print(llvm_cerr);
}
#endif
@@ -3055,7 +3067,7 @@
}
void DIE::dump() {
- print(std::cerr);
+ print(llvm_cerr);
}
#endif
Index: llvm/lib/CodeGen/ELFWriter.cpp
diff -u llvm/lib/CodeGen/ELFWriter.cpp:1.28 llvm/lib/CodeGen/ELFWriter.cpp:1.29
--- llvm/lib/CodeGen/ELFWriter.cpp:1.28 Thu Nov 16 14:04:04 2006
+++ llvm/lib/CodeGen/ELFWriter.cpp Tue Nov 28 18:39:47 2006
@@ -38,7 +38,8 @@
#include "llvm/Target/TargetData.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/Support/Mangler.h"
-#include <iostream>
+#include "llvm/Support/Streams.h"
+#include <ostream>
using namespace llvm;
//===----------------------------------------------------------------------===//
@@ -103,7 +104,7 @@
ELFWriter::ELFSection::SHF_EXECINSTR |
ELFWriter::ELFSection::SHF_ALLOC);
OutBuffer = &ES->SectionData;
- std::cerr << "FIXME: This code needs to be updated for changes in the"
+ llvm_cerr << "FIXME: This code needs to be updated for changes in the"
<< " CodeEmitter interfaces. In particular, this should set "
<< "BufferBegin/BufferEnd/CurBufferPtr, not deal with OutBuffer!";
abort();
Index: llvm/lib/CodeGen/LiveInterval.cpp
diff -u llvm/lib/CodeGen/LiveInterval.cpp:1.38 llvm/lib/CodeGen/LiveInterval.cpp:1.39
--- llvm/lib/CodeGen/LiveInterval.cpp:1.38 Mon Nov 27 21:31:29 2006
+++ llvm/lib/CodeGen/LiveInterval.cpp Tue Nov 28 18:39:47 2006
@@ -475,7 +475,7 @@
llvm_cerr << *this << "\n";
}
-void LiveInterval::print(llvm_ostream &OS, const MRegisterInfo *MRI) const {
+void LiveInterval::print(llvm_ostream OS, const MRegisterInfo *MRI) const {
if (MRI && MRegisterInfo::isPhysicalRegister(reg))
OS << MRI->getName(reg);
else
Index: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
diff -u llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.197 llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.198
--- llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.197 Thu Nov 16 01:35:18 2006
+++ llvm/lib/CodeGen/LiveIntervalAnalysis.cpp Tue Nov 28 18:39:47 2006
@@ -33,7 +33,6 @@
#include "llvm/ADT/Statistic.h"
#include "llvm/ADT/STLExtras.h"
#include <algorithm>
-#include <iostream>
using namespace llvm;
namespace {
@@ -155,11 +154,11 @@
numIntervals += getNumIntervals();
- DEBUG(std::cerr << "********** INTERVALS **********\n";
- for (iterator I = begin(), E = end(); I != E; ++I) {
- I->second.print(std::cerr, mri_);
- std::cerr << "\n";
- });
+ DOUT << "********** INTERVALS **********\n";
+ for (iterator I = begin(), E = end(); I != E; ++I) {
+ I->second.print(DOUT, mri_);
+ DOUT << "\n";
+ }
// Join (coallesce) intervals if requested.
if (EnableJoining) joinIntervals();
@@ -236,8 +235,8 @@
void LiveIntervals::print(std::ostream &O, const Module* ) const {
O << "********** INTERVALS **********\n";
for (const_iterator I = begin(), E = end(); I != E; ++I) {
- I->second.print(std::cerr, mri_);
- std::cerr << "\n";
+ I->second.print(DOUT, mri_);
+ DOUT << "\n";
}
O << "********** MACHINEINSTRS **********\n";
@@ -292,11 +291,11 @@
for (std::vector<LiveRange>::const_iterator
I = LRs.begin(), E = LRs.end(); I != E; ++I) {
- DEBUG(std::cerr << " Adding live range " << *I << " to new interval\n");
+ DOUT << " Adding live range " << *I << " to new interval\n";
NewLI.addRange(*I);
}
- DEBUG(std::cerr << "Created new live interval " << NewLI << "\n");
+ DOUT << "Created new live interval " << NewLI << "\n";
return NewLI;
}
@@ -311,8 +310,9 @@
assert(li.weight != HUGE_VALF &&
"attempt to spill already spilled interval!");
- DEBUG(std::cerr << "\t\t\t\tadding intervals for spills for interval: ";
- li.print(std::cerr, mri_); std::cerr << '\n');
+ DOUT << "\t\t\t\tadding intervals for spills for interval: ";
+ li.print(DOUT, mri_);
+ DOUT << '\n';
const TargetRegisterClass* rc = mf_->getSSARegMap()->getRegClass(li.reg);
@@ -388,13 +388,13 @@
if (HasUse) {
LiveRange LR(getLoadIndex(index), getUseIndex(index),
nI.getNextValue(~0U, 0));
- DEBUG(std::cerr << " +" << LR);
+ DOUT << " +" << LR;
nI.addRange(LR);
}
if (HasDef) {
LiveRange LR(getDefIndex(index), getStoreIndex(index),
nI.getNextValue(~0U, 0));
- DEBUG(std::cerr << " +" << LR);
+ DOUT << " +" << LR;
nI.addRange(LR);
}
@@ -404,8 +404,9 @@
if (lv_)
lv_->addVirtualRegisterKilled(NewVReg, MI);
- DEBUG(std::cerr << "\t\t\t\tadded new interval: ";
- nI.print(std::cerr, mri_); std::cerr << '\n');
+ DOUT << "\t\t\t\tadded new interval: ";
+ nI.print(DOUT, mri_);
+ DOUT << '\n';
}
}
}
@@ -417,9 +418,9 @@
void LiveIntervals::printRegName(unsigned reg) const {
if (MRegisterInfo::isPhysicalRegister(reg))
- std::cerr << mri_->getName(reg);
+ llvm_cerr << mri_->getName(reg);
else
- std::cerr << "%reg" << reg;
+ llvm_cerr << "%reg" << reg;
}
/// isReDefinedByTwoAddr - Returns true if the Reg re-definition is due to
@@ -445,7 +446,7 @@
MachineBasicBlock::iterator mi,
unsigned MIIdx,
LiveInterval &interval) {
- DEBUG(std::cerr << "\t\tregister: "; printRegName(interval.reg));
+ DOUT << "\t\tregister: "; DEBUG(printRegName(interval.reg));
LiveVariables::VarInfo& vi = lv_->getVarInfo(interval.reg);
// Virtual registers may be defined multiple times (due to phi
@@ -485,7 +486,7 @@
"Shouldn't be alive across any blocks!");
LiveRange LR(defIndex, killIdx, ValNum);
interval.addRange(LR);
- DEBUG(std::cerr << " +" << LR << "\n");
+ DOUT << " +" << LR << "\n";
return;
}
}
@@ -497,7 +498,7 @@
LiveRange NewLR(defIndex,
getInstructionIndex(&mbb->back()) + InstrSlots::NUM,
ValNum);
- DEBUG(std::cerr << " +" << NewLR);
+ DOUT << " +" << NewLR;
interval.addRange(NewLR);
// Iterate over all of the blocks that the variable is completely
@@ -511,7 +512,7 @@
getInstructionIndex(&MBB->back()) + InstrSlots::NUM,
ValNum);
interval.addRange(LR);
- DEBUG(std::cerr << " +" << LR);
+ DOUT << " +" << LR;
}
}
}
@@ -524,7 +525,7 @@
getUseIndex(getInstructionIndex(Kill))+1,
ValNum);
interval.addRange(LR);
- DEBUG(std::cerr << " +" << LR);
+ DOUT << " +" << LR;
}
} else {
@@ -559,7 +560,7 @@
// Add the new live interval which replaces the range for the input copy.
LiveRange LR(DefIndex, RedefIndex, ValNo);
- DEBUG(std::cerr << " replace range with " << LR);
+ DOUT << " replace range with " << LR;
interval.addRange(LR);
// If this redefinition is dead, we need to add a dummy unit live
@@ -567,7 +568,8 @@
if (lv_->RegisterDefIsDead(mi, interval.reg))
interval.addRange(LiveRange(RedefIndex, RedefIndex+1, 0));
- DEBUG(std::cerr << "RESULT: "; interval.print(std::cerr, mri_));
+ DOUT << "RESULT: ";
+ interval.print(DOUT, mri_);
} else {
// Otherwise, this must be because of phi elimination. If this is the
@@ -581,17 +583,17 @@
MachineInstr *Killer = vi.Kills[0];
unsigned Start = getMBBStartIdx(Killer->getParent());
unsigned End = getUseIndex(getInstructionIndex(Killer))+1;
- DEBUG(std::cerr << "Removing [" << Start << "," << End << "] from: ";
- interval.print(std::cerr, mri_); std::cerr << "\n");
+ DOUT << "Removing [" << Start << "," << End << "] from: ";
+ interval.print(DOUT, mri_); DOUT << "\n";
interval.removeRange(Start, End);
- DEBUG(std::cerr << "RESULT: "; interval.print(std::cerr, mri_));
+ DOUT << "RESULT: "; interval.print(DOUT, mri_);
// Replace the interval with one of a NEW value number. Note that this
// value number isn't actually defined by an instruction, weird huh? :)
LiveRange LR(Start, End, interval.getNextValue(~0U, 0));
- DEBUG(std::cerr << " replace range with " << LR);
+ DOUT << " replace range with " << LR;
interval.addRange(LR);
- DEBUG(std::cerr << "RESULT: "; interval.print(std::cerr, mri_));
+ DOUT << "RESULT: "; interval.print(DOUT, mri_);
}
// In the case of PHI elimination, each variable definition is only
@@ -609,11 +611,11 @@
LiveRange LR(defIndex,
getInstructionIndex(&mbb->back()) + InstrSlots::NUM, ValNum);
interval.addRange(LR);
- DEBUG(std::cerr << " +" << LR);
+ DOUT << " +" << LR;
}
}
- DEBUG(std::cerr << '\n');
+ DOUT << '\n';
}
void LiveIntervals::handlePhysicalRegisterDef(MachineBasicBlock *MBB,
@@ -623,7 +625,7 @@
unsigned SrcReg) {
// A physical register cannot be live across basic block, so its
// lifetime must end somewhere in its defining basic block.
- DEBUG(std::cerr << "\t\tregister: "; printRegName(interval.reg));
+ DOUT << "\t\tregister: "; DEBUG(printRegName(interval.reg));
unsigned baseIndex = MIIdx;
unsigned start = getDefIndex(baseIndex);
@@ -633,7 +635,7 @@
// the instruction defining it. Hence its interval is:
// [defSlot(def), defSlot(def)+1)
if (lv_->RegisterDefIsDead(mi, interval.reg)) {
- DEBUG(std::cerr << " dead");
+ DOUT << " dead";
end = getDefIndex(start) + 1;
goto exit;
}
@@ -644,7 +646,7 @@
while (++mi != MBB->end()) {
baseIndex += InstrSlots::NUM;
if (lv_->KillsRegister(mi, interval.reg)) {
- DEBUG(std::cerr << " killed");
+ DOUT << " killed";
end = getUseIndex(baseIndex) + 1;
goto exit;
} else if (lv_->ModifiesRegister(mi, interval.reg)) {
@@ -652,7 +654,7 @@
// Then the register is essentially dead at the instruction that defines
// it. Hence its interval is:
// [defSlot(def), defSlot(def)+1)
- DEBUG(std::cerr << " dead");
+ DOUT << " dead";
end = getDefIndex(start) + 1;
goto exit;
}
@@ -670,7 +672,7 @@
LiveRange LR(start, end, interval.getNextValue(SrcReg != 0 ? start : ~0U,
SrcReg));
interval.addRange(LR);
- DEBUG(std::cerr << " +" << LR << '\n');
+ DOUT << " +" << LR << '\n';
}
void LiveIntervals::handleRegisterDef(MachineBasicBlock *MBB,
@@ -694,9 +696,9 @@
/// live interval is an interval [i, j) where 1 <= i <= j < N for
/// which a variable is live
void LiveIntervals::computeIntervals() {
- DEBUG(std::cerr << "********** COMPUTING LIVE INTERVALS **********\n");
- DEBUG(std::cerr << "********** Function: "
- << ((Value*)mf_->getFunction())->getName() << '\n');
+ DOUT << "********** COMPUTING LIVE INTERVALS **********\n"
+ << "********** Function: "
+ << ((Value*)mf_->getFunction())->getName() << '\n';
bool IgnoreFirstInstr = mf_->livein_begin() != mf_->livein_end();
// Track the index of the current machine instr.
@@ -704,7 +706,7 @@
for (MachineFunction::iterator MBBI = mf_->begin(), E = mf_->end();
MBBI != E; ++MBBI) {
MachineBasicBlock *MBB = MBBI;
- DEBUG(std::cerr << ((Value*)MBB->getBasicBlock())->getName() << ":\n");
+ DOUT << ((Value*)MBB->getBasicBlock())->getName() << ":\n";
MachineBasicBlock::iterator MI = MBB->begin(), miEnd = MBB->end();
if (IgnoreFirstInstr) {
@@ -714,7 +716,7 @@
}
for (; MI != miEnd; ++MI) {
- DEBUG(std::cerr << MIIndex << "\t" << *MI);
+ DOUT << MIIndex << "\t" << *MI;
// Handle defs.
for (int i = MI->getNumOperands() - 1; i >= 0; --i) {
@@ -792,7 +794,7 @@
// IntB, we can merge them.
if (ValLR+1 != BLR) return false;
- DEBUG(std::cerr << "\nExtending: "; IntB.print(std::cerr, mri_));
+ DOUT << "\nExtending: "; IntB.print(DOUT, mri_);
// We are about to delete CopyMI, so need to remove it as the 'instruction
// that defines this value #'.
@@ -817,8 +819,8 @@
// Okay, merge "B1" into the same value number as "B0".
if (BValNo != ValLR->ValId)
IntB.MergeValueNumberInto(BValNo, ValLR->ValId);
- DEBUG(std::cerr << " result = "; IntB.print(std::cerr, mri_);
- std::cerr << "\n");
+ DOUT << " result = "; IntB.print(DOUT, mri_);
+ DOUT << "\n";
// Finally, delete the copy instruction.
RemoveMachineInstrFromMaps(CopyMI);
@@ -836,9 +838,7 @@
/// it may be possible if other things get coallesced.
bool LiveIntervals::JoinCopy(MachineInstr *CopyMI,
unsigned SrcReg, unsigned DstReg) {
-
-
- DEBUG(std::cerr << getInstructionIndex(CopyMI) << '\t' << *CopyMI);
+ DOUT << getInstructionIndex(CopyMI) << '\t' << *CopyMI;
// Get representative registers.
SrcReg = rep(SrcReg);
@@ -846,30 +846,30 @@
// If they are already joined we continue.
if (SrcReg == DstReg) {
- DEBUG(std::cerr << "\tCopy already coallesced.\n");
+ DOUT << "\tCopy already coallesced.\n";
return true; // Not coallescable.
}
// If they are both physical registers, we cannot join them.
if (MRegisterInfo::isPhysicalRegister(SrcReg) &&
MRegisterInfo::isPhysicalRegister(DstReg)) {
- DEBUG(std::cerr << "\tCan not coallesce physregs.\n");
+ DOUT << "\tCan not coallesce physregs.\n";
return true; // Not coallescable.
}
// We only join virtual registers with allocatable physical registers.
if (MRegisterInfo::isPhysicalRegister(SrcReg) && !allocatableRegs_[SrcReg]){
- DEBUG(std::cerr << "\tSrc reg is unallocatable physreg.\n");
+ DOUT << "\tSrc reg is unallocatable physreg.\n";
return true; // Not coallescable.
}
if (MRegisterInfo::isPhysicalRegister(DstReg) && !allocatableRegs_[DstReg]){
- DEBUG(std::cerr << "\tDst reg is unallocatable physreg.\n");
+ DOUT << "\tDst reg is unallocatable physreg.\n";
return true; // Not coallescable.
}
// If they are not of the same register class, we cannot join them.
if (differingRegisterClasses(SrcReg, DstReg)) {
- DEBUG(std::cerr << "\tSrc/Dest are different register classes.\n");
+ DOUT << "\tSrc/Dest are different register classes.\n";
return true; // Not coallescable.
}
@@ -878,9 +878,9 @@
assert(SrcInt.reg == SrcReg && DestInt.reg == DstReg &&
"Register mapping is horribly broken!");
- DEBUG(std::cerr << "\t\tInspecting "; SrcInt.print(std::cerr, mri_);
- std::cerr << " and "; DestInt.print(std::cerr, mri_);
- std::cerr << ": ");
+ DOUT << "\t\tInspecting "; SrcInt.print(DOUT, mri_);
+ DOUT << " and "; DestInt.print(DOUT, mri_);
+ DOUT << ": ";
// Okay, attempt to join these two intervals. On failure, this returns false.
// Otherwise, if one of the intervals being joined is a physreg, this method
@@ -894,7 +894,7 @@
return true;
// Otherwise, we are unable to join the intervals.
- DEBUG(std::cerr << "Interference!\n");
+ DOUT << "Interference!\n";
return false;
}
@@ -912,8 +912,8 @@
getInterval(*AS).MergeInClobberRanges(SrcInt);
}
- DEBUG(std::cerr << "\n\t\tJoined. Result = "; DestInt.print(std::cerr, mri_);
- std::cerr << "\n");
+ DOUT << "\n\t\tJoined. Result = "; DestInt.print(DOUT, mri_);
+ DOUT << "\n";
// If the intervals were swapped by Join, swap them back so that the register
// mapping (in the r2i map) is correct.
@@ -1314,7 +1314,7 @@
void LiveIntervals::CopyCoallesceInMBB(MachineBasicBlock *MBB,
std::vector<CopyRec> &TryAgain) {
- DEBUG(std::cerr << ((Value*)MBB->getBasicBlock())->getName() << ":\n");
+ DOUT << ((Value*)MBB->getBasicBlock())->getName() << ":\n";
for (MachineBasicBlock::iterator MII = MBB->begin(), E = MBB->end();
MII != E;) {
@@ -1331,7 +1331,7 @@
void LiveIntervals::joinIntervals() {
- DEBUG(std::cerr << "********** JOINING INTERVALS ***********\n");
+ DOUT << "********** JOINING INTERVALS ***********\n";
std::vector<CopyRec> TryAgainList;
@@ -1374,13 +1374,13 @@
}
}
- DEBUG(std::cerr << "*** Register mapping ***\n");
- DEBUG(for (int i = 0, e = r2rMap_.size(); i != e; ++i)
- if (r2rMap_[i]) {
- std::cerr << " reg " << i << " -> ";
- printRegName(r2rMap_[i]);
- std::cerr << "\n";
- });
+ DOUT << "*** Register mapping ***\n";
+ for (int i = 0, e = r2rMap_.size(); i != e; ++i)
+ if (r2rMap_[i]) {
+ DOUT << " reg " << i << " -> ";
+ DEBUG(printRegName(r2rMap_[i]));
+ DOUT << "\n";
+ }
}
/// Return true if the two specified registers belong to different register
More information about the llvm-commits
mailing list