[llvm-commits] CVS: llvm/lib/Analysis/AliasAnalysisCounter.cpp AliasAnalysisEvaluator.cpp AliasSetTracker.cpp BasicAliasAnalysis.cpp CFGPrinter.cpp ConstantRange.cpp InstCount.cpp LoopInfo.cpp ProfileInfoLoader.cpp ProfileInfoLoaderPass.cpp ScalarEvolution.cpp ScalarEvolutionExpander.cpp Trace.cpp
Bill Wendling
isanbard at gmail.com
Wed Dec 6 17:32:01 PST 2006
Changes in directory llvm/lib/Analysis:
AliasAnalysisCounter.cpp updated: 1.17 -> 1.18
AliasAnalysisEvaluator.cpp updated: 1.30 -> 1.31
AliasSetTracker.cpp updated: 1.44 -> 1.45
BasicAliasAnalysis.cpp updated: 1.92 -> 1.93
CFGPrinter.cpp updated: 1.20 -> 1.21
ConstantRange.cpp updated: 1.20 -> 1.21
InstCount.cpp updated: 1.17 -> 1.18
LoopInfo.cpp updated: 1.80 -> 1.81
ProfileInfoLoader.cpp updated: 1.9 -> 1.10
ProfileInfoLoaderPass.cpp updated: 1.16 -> 1.17
ScalarEvolution.cpp updated: 1.66 -> 1.67
ScalarEvolutionExpander.cpp updated: 1.7 -> 1.8
Trace.cpp updated: 1.4 -> 1.5
---
Log message:
Changed llvm_ostream et all to OStream. llvm_cerr, llvm_cout, llvm_null, are
now cerr, cout, and NullStream resp.
---
Diffs of the changes: (+91 -98)
AliasAnalysisCounter.cpp | 38 ++++++++++++++------------------
AliasAnalysisEvaluator.cpp | 52 ++++++++++++++++++++++----------------------
AliasSetTracker.cpp | 6 ++---
BasicAliasAnalysis.cpp | 4 +--
CFGPrinter.cpp | 6 ++---
ConstantRange.cpp | 2 -
InstCount.cpp | 2 -
LoopInfo.cpp | 2 -
ProfileInfoLoader.cpp | 29 +++++++++++-------------
ProfileInfoLoaderPass.cpp | 4 +--
ScalarEvolution.cpp | 34 ++++++++++++++--------------
ScalarEvolutionExpander.cpp | 5 +---
Trace.cpp | 5 +---
13 files changed, 91 insertions(+), 98 deletions(-)
Index: llvm/lib/Analysis/AliasAnalysisCounter.cpp
diff -u llvm/lib/Analysis/AliasAnalysisCounter.cpp:1.17 llvm/lib/Analysis/AliasAnalysisCounter.cpp:1.18
--- llvm/lib/Analysis/AliasAnalysisCounter.cpp:1.17 Wed Dec 6 00:16:21 2006
+++ llvm/lib/Analysis/AliasAnalysisCounter.cpp Wed Dec 6 19:30:31 2006
@@ -39,37 +39,33 @@
}
void printLine(const char *Desc, unsigned Val, unsigned Sum) {
- llvm_cerr << " " << Val << " " << Desc << " responses ("
- << Val*100/Sum << "%)\n";
+ cerr << " " << Val << " " << Desc << " responses ("
+ << Val*100/Sum << "%)\n";
}
~AliasAnalysisCounter() {
unsigned AASum = No+May+Must;
unsigned MRSum = NoMR+JustRef+JustMod+MR;
if (AASum + MRSum) { // Print a report if any counted queries occurred...
- llvm_cerr
- << "\n===== Alias Analysis Counter Report =====\n"
- << " Analysis counted: " << Name << "\n"
- << " " << AASum << " Total Alias Queries Performed\n";
+ cerr << "\n===== Alias Analysis Counter Report =====\n"
+ << " Analysis counted: " << Name << "\n"
+ << " " << AASum << " Total Alias Queries Performed\n";
if (AASum) {
printLine("no alias", No, AASum);
printLine("may alias", May, AASum);
printLine("must alias", Must, AASum);
- llvm_cerr
- << " Alias Analysis Counter Summary: " << No*100/AASum << "%/"
- << May*100/AASum << "%/" << Must*100/AASum<<"%\n\n";
+ cerr << " Alias Analysis Counter Summary: " << No*100/AASum << "%/"
+ << May*100/AASum << "%/" << Must*100/AASum<<"%\n\n";
}
- llvm_cerr
- << " " << MRSum << " Total Mod/Ref Queries Performed\n";
+ cerr << " " << MRSum << " Total Mod/Ref Queries Performed\n";
if (MRSum) {
printLine("no mod/ref", NoMR, MRSum);
printLine("ref", JustRef, MRSum);
printLine("mod", JustMod, MRSum);
printLine("mod/ref", MR, MRSum);
- llvm_cerr
- << " Mod/Ref Analysis Counter Summary: " << NoMR*100/MRSum<< "%/"
- << JustRef*100/MRSum << "%/" << JustMod*100/MRSum << "%/"
- << MR*100/MRSum <<"%\n\n";
+ cerr << " Mod/Ref Analysis Counter Summary: " <<NoMR*100/MRSum<< "%/"
+ << JustRef*100/MRSum << "%/" << JustMod*100/MRSum << "%/"
+ << MR*100/MRSum <<"%\n\n";
}
}
}
@@ -133,10 +129,10 @@
}
if (PrintAll || (PrintAllFailures && R == MayAlias)) {
- llvm_cerr << AliasString << ":\t";
- llvm_cerr << "[" << V1Size << "B] ";
+ cerr << AliasString << ":\t";
+ cerr << "[" << V1Size << "B] ";
WriteAsOperand(std::cerr, V1, true, M) << ", ";
- llvm_cerr << "[" << V2Size << "B] ";
+ cerr << "[" << V2Size << "B] ";
WriteAsOperand(std::cerr, V2, true, M) << "\n";
}
@@ -157,10 +153,10 @@
}
if (PrintAll || (PrintAllFailures && R == ModRef)) {
- llvm_cerr << MRString << ": Ptr: ";
- llvm_cerr << "[" << Size << "B] ";
+ cerr << MRString << ": Ptr: ";
+ cerr << "[" << Size << "B] ";
WriteAsOperand(std::cerr, P, true, M);
- llvm_cerr << "\t<->" << *CS.getInstruction();
+ cerr << "\t<->" << *CS.getInstruction();
}
return R;
}
Index: llvm/lib/Analysis/AliasAnalysisEvaluator.cpp
diff -u llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.30 llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.31
--- llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.30 Wed Dec 6 00:16:21 2006
+++ llvm/lib/Analysis/AliasAnalysisEvaluator.cpp Wed Dec 6 19:30:31 2006
@@ -79,7 +79,7 @@
static inline void PrintResults(const char *Msg, bool P, Value *V1, Value *V2,
Module *M) {
if (P) {
- llvm_cerr << " " << Msg << ":\t";
+ cerr << " " << Msg << ":\t";
WriteAsOperand(std::cerr, V1, true, M) << ", ";
WriteAsOperand(std::cerr, V2, true, M) << "\n";
}
@@ -89,9 +89,9 @@
PrintModRefResults(const char *Msg, bool P, Instruction *I, Value *Ptr,
Module *M) {
if (P) {
- llvm_cerr << " " << Msg << ": Ptr: ";
+ cerr << " " << Msg << ": Ptr: ";
WriteAsOperand(std::cerr, Ptr, true, M);
- llvm_cerr << "\t<->" << *I;
+ cerr << "\t<->" << *I;
}
}
@@ -125,8 +125,8 @@
if (PrintNoAlias || PrintMayAlias || PrintMustAlias ||
PrintNoModRef || PrintMod || PrintRef || PrintModRef)
- llvm_cerr << "Function: " << F.getName() << ": " << Pointers.size()
- << " pointers, " << CallSites.size() << " call sites\n";
+ cerr << "Function: " << F.getName() << ": " << Pointers.size()
+ << " pointers, " << CallSites.size() << " call sites\n";
// iterate over the worklist, and run the full (n^2)/2 disambiguations
for (std::set<Value *>::iterator I1 = Pointers.begin(), E = Pointers.end();
@@ -151,7 +151,7 @@
PrintResults("MustAlias", PrintMustAlias, *I1, *I2, F.getParent());
++MustAlias; break;
default:
- llvm_cerr << "Unknown alias query result!\n";
+ cerr << "Unknown alias query result!\n";
}
}
}
@@ -181,7 +181,7 @@
PrintModRefResults(" ModRef", PrintModRef, I, *V, F.getParent());
++ModRef; break;
default:
- llvm_cerr << "Unknown alias query result!\n";
+ cerr << "Unknown alias query result!\n";
}
}
}
@@ -190,45 +190,45 @@
}
static void PrintPercent(unsigned Num, unsigned Sum) {
- llvm_cerr << "(" << Num*100ULL/Sum << "."
+ cerr << "(" << Num*100ULL/Sum << "."
<< ((Num*1000ULL/Sum) % 10) << "%)\n";
}
bool AAEval::doFinalization(Module &M) {
unsigned AliasSum = NoAlias + MayAlias + MustAlias;
- llvm_cerr << "===== Alias Analysis Evaluator Report =====\n";
+ cerr << "===== Alias Analysis Evaluator Report =====\n";
if (AliasSum == 0) {
- llvm_cerr << " Alias Analysis Evaluator Summary: No pointers!\n";
+ cerr << " Alias Analysis Evaluator Summary: No pointers!\n";
} else {
- llvm_cerr << " " << AliasSum << " Total Alias Queries Performed\n";
- llvm_cerr << " " << NoAlias << " no alias responses ";
+ cerr << " " << AliasSum << " Total Alias Queries Performed\n";
+ cerr << " " << NoAlias << " no alias responses ";
PrintPercent(NoAlias, AliasSum);
- llvm_cerr << " " << MayAlias << " may alias responses ";
+ cerr << " " << MayAlias << " may alias responses ";
PrintPercent(MayAlias, AliasSum);
- llvm_cerr << " " << MustAlias << " must alias responses ";
+ cerr << " " << MustAlias << " must alias responses ";
PrintPercent(MustAlias, AliasSum);
- llvm_cerr << " Alias Analysis Evaluator Pointer Alias Summary: "
- << NoAlias*100/AliasSum << "%/" << MayAlias*100/AliasSum << "%/"
- << MustAlias*100/AliasSum << "%\n";
+ cerr << " Alias Analysis Evaluator Pointer Alias Summary: "
+ << NoAlias*100/AliasSum << "%/" << MayAlias*100/AliasSum << "%/"
+ << MustAlias*100/AliasSum << "%\n";
}
// Display the summary for mod/ref analysis
unsigned ModRefSum = NoModRef + Mod + Ref + ModRef;
if (ModRefSum == 0) {
- llvm_cerr << " Alias Analysis Mod/Ref Evaluator Summary: no mod/ref!\n";
+ cerr << " Alias Analysis Mod/Ref Evaluator Summary: no mod/ref!\n";
} else {
- llvm_cerr << " " << ModRefSum << " Total ModRef Queries Performed\n";
- llvm_cerr << " " << NoModRef << " no mod/ref responses ";
+ cerr << " " << ModRefSum << " Total ModRef Queries Performed\n";
+ cerr << " " << NoModRef << " no mod/ref responses ";
PrintPercent(NoModRef, ModRefSum);
- llvm_cerr << " " << Mod << " mod responses ";
+ cerr << " " << Mod << " mod responses ";
PrintPercent(Mod, ModRefSum);
- llvm_cerr << " " << Ref << " ref responses ";
+ cerr << " " << Ref << " ref responses ";
PrintPercent(Ref, ModRefSum);
- llvm_cerr << " " << ModRef << " mod & ref responses ";
+ cerr << " " << ModRef << " mod & ref responses ";
PrintPercent(ModRef, ModRefSum);
- llvm_cerr << " Alias Analysis Evaluator Mod/Ref Summary: "
- << NoModRef*100/ModRefSum << "%/" << Mod*100/ModRefSum << "%/"
- << Ref*100/ModRefSum << "%/" << ModRef*100/ModRefSum << "%\n";
+ cerr << " Alias Analysis Evaluator Mod/Ref Summary: "
+ << NoModRef*100/ModRefSum << "%/" << Mod*100/ModRefSum << "%/"
+ << Ref*100/ModRefSum << "%/" << ModRef*100/ModRefSum << "%\n";
}
return false;
Index: llvm/lib/Analysis/AliasSetTracker.cpp
diff -u llvm/lib/Analysis/AliasSetTracker.cpp:1.44 llvm/lib/Analysis/AliasSetTracker.cpp:1.45
--- llvm/lib/Analysis/AliasSetTracker.cpp:1.44 Tue Nov 28 16:46:12 2006
+++ llvm/lib/Analysis/AliasSetTracker.cpp Wed Dec 6 19:30:31 2006
@@ -543,8 +543,8 @@
OS << "\n";
}
-void AliasSet::dump() const { print (llvm_cerr); }
-void AliasSetTracker::dump() const { print(llvm_cerr); }
+void AliasSet::dump() const { print (cerr); }
+void AliasSetTracker::dump() const { print(cerr); }
//===----------------------------------------------------------------------===//
// AliasSetPrinter Pass
@@ -564,7 +564,7 @@
for (inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I)
Tracker->add(&*I);
- Tracker->print(llvm_cerr);
+ Tracker->print(cerr);
delete Tracker;
return false;
}
Index: llvm/lib/Analysis/BasicAliasAnalysis.cpp
diff -u llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.92 llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.93
--- llvm/lib/Analysis/BasicAliasAnalysis.cpp:1.92 Tue Nov 28 17:33:06 2006
+++ llvm/lib/Analysis/BasicAliasAnalysis.cpp Wed Dec 6 19:30:31 2006
@@ -745,8 +745,8 @@
assert(Offset1<Offset2 && "There is at least one different constant here!");
if ((uint64_t)(Offset2-Offset1) >= SizeMax) {
- //llvm_cerr << "Determined that these two GEP's don't alias ["
- // << SizeMax << " bytes]: \n" << *GEP1 << *GEP2;
+ //cerr << "Determined that these two GEP's don't alias ["
+ // << SizeMax << " bytes]: \n" << *GEP1 << *GEP2;
return NoAlias;
}
}
Index: llvm/lib/Analysis/CFGPrinter.cpp
diff -u llvm/lib/Analysis/CFGPrinter.cpp:1.20 llvm/lib/Analysis/CFGPrinter.cpp:1.21
--- llvm/lib/Analysis/CFGPrinter.cpp:1.20 Wed Dec 6 00:16:21 2006
+++ llvm/lib/Analysis/CFGPrinter.cpp Wed Dec 6 19:30:31 2006
@@ -92,14 +92,14 @@
struct CFGPrinter : public FunctionPass {
virtual bool runOnFunction(Function &F) {
std::string Filename = "cfg." + F.getName() + ".dot";
- llvm_cerr << "Writing '" << Filename << "'...";
+ cerr << "Writing '" << Filename << "'...";
std::ofstream File(Filename.c_str());
if (File.good())
WriteGraph(File, (const Function*)&F);
else
- llvm_cerr << " error opening file for writing!";
- llvm_cerr << "\n";
+ cerr << " error opening file for writing!";
+ cerr << "\n";
return false;
}
Index: llvm/lib/Analysis/ConstantRange.cpp
diff -u llvm/lib/Analysis/ConstantRange.cpp:1.20 llvm/lib/Analysis/ConstantRange.cpp:1.21
--- llvm/lib/Analysis/ConstantRange.cpp:1.20 Wed Dec 6 14:45:15 2006
+++ llvm/lib/Analysis/ConstantRange.cpp Wed Dec 6 19:30:31 2006
@@ -370,5 +370,5 @@
/// dump - Allow printing from a debugger easily...
///
void ConstantRange::dump() const {
- print(llvm_cerr);
+ print(cerr);
}
Index: llvm/lib/Analysis/InstCount.cpp
diff -u llvm/lib/Analysis/InstCount.cpp:1.17 llvm/lib/Analysis/InstCount.cpp:1.18
--- llvm/lib/Analysis/InstCount.cpp:1.17 Wed Dec 6 11:46:31 2006
+++ llvm/lib/Analysis/InstCount.cpp Wed Dec 6 19:30:31 2006
@@ -43,7 +43,7 @@
#include "llvm/Instruction.def"
void visitInstruction(Instruction &I) {
- llvm_cerr << "Instruction Count does not know about " << I;
+ cerr << "Instruction Count does not know about " << I;
abort();
}
public:
Index: llvm/lib/Analysis/LoopInfo.cpp
diff -u llvm/lib/Analysis/LoopInfo.cpp:1.80 llvm/lib/Analysis/LoopInfo.cpp:1.81
--- llvm/lib/Analysis/LoopInfo.cpp:1.80 Tue Nov 28 16:46:12 2006
+++ llvm/lib/Analysis/LoopInfo.cpp Wed Dec 6 19:30:31 2006
@@ -80,7 +80,7 @@
}
void Loop::dump() const {
- print(llvm_cerr);
+ print(cerr);
}
Index: llvm/lib/Analysis/ProfileInfoLoader.cpp
diff -u llvm/lib/Analysis/ProfileInfoLoader.cpp:1.9 llvm/lib/Analysis/ProfileInfoLoader.cpp:1.10
--- llvm/lib/Analysis/ProfileInfoLoader.cpp:1.9 Tue Nov 28 16:46:12 2006
+++ llvm/lib/Analysis/ProfileInfoLoader.cpp Wed Dec 6 19:30:31 2006
@@ -37,7 +37,7 @@
// Read the number of entries...
unsigned NumEntries;
if (fread(&NumEntries, sizeof(unsigned), 1, F) != 1) {
- llvm_cerr << ToolName << ": data packet truncated!\n";
+ cerr << ToolName << ": data packet truncated!\n";
perror(0);
exit(1);
}
@@ -48,7 +48,7 @@
// Read in the block of data...
if (fread(&TempSpace[0], sizeof(unsigned)*NumEntries, 1, F) != 1) {
- llvm_cerr << ToolName << ": data packet truncated!\n";
+ cerr << ToolName << ": data packet truncated!\n";
perror(0);
exit(1);
}
@@ -75,7 +75,7 @@
Module &TheModule) : M(TheModule) {
FILE *F = fopen(Filename.c_str(), "r");
if (F == 0) {
- llvm_cerr << ToolName << ": Error opening '" << Filename << "': ";
+ cerr << ToolName << ": Error opening '" << Filename << "': ";
perror(0);
exit(1);
}
@@ -93,7 +93,7 @@
case ArgumentInfo: {
unsigned ArgLength;
if (fread(&ArgLength, sizeof(unsigned), 1, F) != 1) {
- llvm_cerr << ToolName << ": arguments packet truncated!\n";
+ cerr << ToolName << ": arguments packet truncated!\n";
perror(0);
exit(1);
}
@@ -104,7 +104,7 @@
if (ArgLength)
if (fread(&Chars[0], (ArgLength+3) & ~3, 1, F) != 1) {
- llvm_cerr << ToolName << ": arguments packet truncated!\n";
+ cerr << ToolName << ": arguments packet truncated!\n";
perror(0);
exit(1);
}
@@ -129,7 +129,7 @@
break;
default:
- llvm_cerr << ToolName << ": Unknown packet type #" << PacketType << "!\n";
+ cerr << ToolName << ": Unknown packet type #" << PacketType << "!\n";
exit(1);
}
}
@@ -156,7 +156,7 @@
Counts.push_back(std::make_pair(BlockCounts[i].first->getParent(),
BlockCounts[i].second));
} else {
- llvm_cerr << "Function counts are not available!\n";
+ cerr << "Function counts are not available!\n";
}
return;
}
@@ -200,8 +200,8 @@
if (SuccNum >= TI->getNumSuccessors()) {
static bool Warned = false;
if (!Warned) {
- llvm_cerr << "WARNING: profile info doesn't seem to match"
- << " the program!\n";
+ cerr << "WARNING: profile info doesn't seem to match"
+ << " the program!\n";
Warned = true;
}
} else {
@@ -226,7 +226,7 @@
}
} else {
- llvm_cerr << "Block counts are not available!\n";
+ cerr << "Block counts are not available!\n";
}
return;
}
@@ -247,8 +247,8 @@
void ProfileInfoLoader::getEdgeCounts(std::vector<std::pair<Edge,
unsigned> > &Counts) {
if (EdgeCounts.empty()) {
- llvm_cerr << "Edge counts not available, and no synthesis "
- << "is implemented yet!\n";
+ cerr << "Edge counts not available, and no synthesis "
+ << "is implemented yet!\n";
return;
}
@@ -268,9 +268,8 @@
//
void ProfileInfoLoader::getBBTrace(std::vector<BasicBlock *> &Trace) {
if (BBTrace.empty ()) {
- llvm_cerr << "Basic block trace is not available!\n";
+ cerr << "Basic block trace is not available!\n";
return;
}
- llvm_cerr << "Basic block trace loading is not implemented yet!\n";
+ cerr << "Basic block trace loading is not implemented yet!\n";
}
-
Index: llvm/lib/Analysis/ProfileInfoLoaderPass.cpp
diff -u llvm/lib/Analysis/ProfileInfoLoaderPass.cpp:1.16 llvm/lib/Analysis/ProfileInfoLoaderPass.cpp:1.17
--- llvm/lib/Analysis/ProfileInfoLoaderPass.cpp:1.16 Tue Nov 28 16:46:12 2006
+++ llvm/lib/Analysis/ProfileInfoLoaderPass.cpp Wed Dec 6 19:30:31 2006
@@ -76,8 +76,8 @@
TerminatorInst *TI = BB->getTerminator();
if (SuccNum >= TI->getNumSuccessors()) {
if (!PrintedWarning) {
- llvm_cerr << "WARNING: profile information is inconsistent with "
- << "the current program!\n";
+ cerr << "WARNING: profile information is inconsistent with "
+ << "the current program!\n";
PrintedWarning = true;
}
} else {
Index: llvm/lib/Analysis/ScalarEvolution.cpp
diff -u llvm/lib/Analysis/ScalarEvolution.cpp:1.66 llvm/lib/Analysis/ScalarEvolution.cpp:1.67
--- llvm/lib/Analysis/ScalarEvolution.cpp:1.66 Wed Dec 6 11:46:31 2006
+++ llvm/lib/Analysis/ScalarEvolution.cpp Wed Dec 6 19:30:31 2006
@@ -118,7 +118,7 @@
//
SCEV::~SCEV() {}
void SCEV::dump() const {
- print(llvm_cerr);
+ print(cerr);
}
/// getValueRange - Return the tightest constant bounds that this value is
@@ -1558,11 +1558,11 @@
break;
default:
#if 0
- llvm_cerr << "ComputeIterationCount ";
+ cerr << "ComputeIterationCount ";
if (ExitCond->getOperand(0)->getType()->isUnsigned())
- llvm_cerr << "[unsigned] ";
- llvm_cerr << *LHS << " "
- << Instruction::getOpcodeName(Cond) << " " << *RHS << "\n";
+ cerr << "[unsigned] ";
+ cerr << *LHS << " "
+ << Instruction::getOpcodeName(Cond) << " " << *RHS << "\n";
#endif
break;
}
@@ -1678,9 +1678,9 @@
if (!isa<ConstantBool>(Result)) break; // Couldn't decide for sure
if (cast<ConstantBool>(Result)->getValue() == false) {
#if 0
- llvm_cerr << "\n***\n*** Computed loop count " << *ItCst
- << "\n*** From global " << *GV << "*** BB: " << *L->getHeader()
- << "***\n";
+ cerr << "\n***\n*** Computed loop count " << *ItCst
+ << "\n*** From global " << *GV << "*** BB: " << *L->getHeader()
+ << "***\n";
#endif
++NumArrayLenItCounts;
return SCEVConstant::get(ItCst); // Found terminating iteration!
@@ -2147,8 +2147,8 @@
SCEVConstant *R2 = dyn_cast<SCEVConstant>(Roots.second);
if (R1) {
#if 0
- llvm_cerr << "HFTZ: " << *V << " - sol#1: " << *R1
- << " sol#2: " << *R2 << "\n";
+ cerr << "HFTZ: " << *V << " - sol#1: " << *R1
+ << " sol#2: " << *R2 << "\n";
#endif
// Pick the smallest positive root value.
assert(R1->getType()->isUnsigned()&&"Didn't canonicalize to unsigned?");
@@ -2276,8 +2276,8 @@
default: break;
}
- //llvm_cerr << "Computed Loop Trip Count as: " <<
- // *SCEV::getMinusSCEV(RHS, AddRec->getOperand(0)) << "\n";
+ //cerr << "Computed Loop Trip Count as: "
+ // << *SCEV::getMinusSCEV(RHS, AddRec->getOperand(0)) << "\n";
return SCEV::getMinusSCEV(RHS, AddRec->getOperand(0));
}
@@ -2492,20 +2492,20 @@
for (Loop::iterator I = L->begin(), E = L->end(); I != E; ++I)
PrintLoopInfo(OS, SE, *I);
- llvm_cerr << "Loop " << L->getHeader()->getName() << ": ";
+ cerr << "Loop " << L->getHeader()->getName() << ": ";
std::vector<BasicBlock*> ExitBlocks;
L->getExitBlocks(ExitBlocks);
if (ExitBlocks.size() != 1)
- llvm_cerr << "<multiple exits> ";
+ cerr << "<multiple exits> ";
if (SE->hasLoopInvariantIterationCount(L)) {
- llvm_cerr << *SE->getIterationCount(L) << " iterations! ";
+ cerr << *SE->getIterationCount(L) << " iterations! ";
} else {
- llvm_cerr << "Unpredictable iteration count. ";
+ cerr << "Unpredictable iteration count. ";
}
- llvm_cerr << "\n";
+ cerr << "\n";
}
void ScalarEvolution::print(std::ostream &OS, const Module* ) const {
Index: llvm/lib/Analysis/ScalarEvolutionExpander.cpp
diff -u llvm/lib/Analysis/ScalarEvolutionExpander.cpp:1.7 llvm/lib/Analysis/ScalarEvolutionExpander.cpp:1.8
--- llvm/lib/Analysis/ScalarEvolutionExpander.cpp:1.7 Mon Dec 4 11:04:44 2006
+++ llvm/lib/Analysis/ScalarEvolutionExpander.cpp Wed Dec 6 19:30:31 2006
@@ -13,9 +13,8 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/Analysis/LoopInfo.h"
#include "llvm/Analysis/ScalarEvolutionExpander.h"
-
+#include "llvm/Analysis/LoopInfo.h"
using namespace llvm;
/// InsertCastOfTo - Insert a cast of V to the specified type, doing what
@@ -175,7 +174,7 @@
SCEVHandle IH = SCEVUnknown::get(I); // Get I as a "symbolic" SCEV.
SCEVHandle V = S->evaluateAtIteration(IH);
- //llvm_cerr << "Evaluated: " << *this << "\n to: " << *V << "\n";
+ //cerr << "Evaluated: " << *this << "\n to: " << *V << "\n";
return expandInTy(V, Ty);
}
Index: llvm/lib/Analysis/Trace.cpp
diff -u llvm/lib/Analysis/Trace.cpp:1.4 llvm/lib/Analysis/Trace.cpp:1.5
--- llvm/lib/Analysis/Trace.cpp:1.4 Wed Dec 6 00:16:21 2006
+++ llvm/lib/Analysis/Trace.cpp Wed Dec 6 19:30:31 2006
@@ -25,14 +25,13 @@
return getEntryBasicBlock()->getParent();
}
-
Module *Trace::getModule() const {
return getFunction()->getParent();
}
/// print - Write trace to output stream.
///
-void Trace::print(llvm_ostream &O) const {
+void Trace::print(OStream &O) const {
Function *F = getFunction ();
O << "; Trace from function " << F->getName() << ", blocks:\n";
for (const_iterator i = begin(), e = end(); i != e; ++i) {
@@ -48,5 +47,5 @@
/// output stream.
///
void Trace::dump() const {
- print(llvm_cerr);
+ print(cerr);
}
More information about the llvm-commits
mailing list