[llvm-commits] CVS: llvm/lib/Transforms/ExprTypeConvert.cpp LevelRaise.cpp
Bill Wendling
isanbard at gmail.com
Sun Nov 26 01:17:26 PST 2006
Changes in directory llvm/lib/Transforms:
ExprTypeConvert.cpp updated: 1.112 -> 1.113
LevelRaise.cpp updated: 1.111 -> 1.112
---
Log message:
Removed #include <iostream> and used the llvm_cerr/DOUT streams instead.
---
Diffs of the changes: (+22 -27)
ExprTypeConvert.cpp | 26 ++++++++++++--------------
LevelRaise.cpp | 23 ++++++++++-------------
2 files changed, 22 insertions(+), 27 deletions(-)
Index: llvm/lib/Transforms/ExprTypeConvert.cpp
diff -u llvm/lib/Transforms/ExprTypeConvert.cpp:1.112 llvm/lib/Transforms/ExprTypeConvert.cpp:1.113
--- llvm/lib/Transforms/ExprTypeConvert.cpp:1.112 Wed Nov 8 00:47:33 2006
+++ llvm/lib/Transforms/ExprTypeConvert.cpp Sun Nov 26 03:17:06 2006
@@ -19,7 +19,6 @@
#include "llvm/ADT/STLExtras.h"
#include "llvm/Support/Debug.h"
#include <algorithm>
-#include <iostream>
using namespace llvm;
static bool OperandConvertibleToType(User *U, Value *V, const Type *Ty,
@@ -205,7 +204,7 @@
return VMCI->second;
}
- DEBUG(std::cerr << "CETT: " << (void*)V << " " << *V);
+ DOUT << "CETT: " << (void*)V << " " << *V;
Instruction *I = dyn_cast<Instruction>(V);
if (I == 0) {
@@ -384,8 +383,8 @@
if (NumUses == OldSize) ++It;
}
- DEBUG(std::cerr << "ExpIn: " << (void*)I << " " << *I
- << "ExpOut: " << (void*)Res << " " << *Res);
+ DOUT << "ExpIn: " << (void*)I << " " << *I
+ << "ExpOut: " << (void*)Res << " " << *Res;
return Res;
}
@@ -708,7 +707,7 @@
I->setName("");
Instruction *Res; // Result of conversion
- //std::cerr << endl << endl << "Type:\t" << Ty << "\nInst: " << I
+ //llvm_cerr << endl << endl << "Type:\t" << Ty << "\nInst: " << I
// << "BB Before: " << BB << endl;
// Prevent I from being removed...
@@ -930,9 +929,9 @@
assert(It != BB->end() && "Instruction not in own basic block??");
BB->getInstList().insert(It, Res); // Keep It pointing to old instruction
- DEBUG(std::cerr << "COT CREATED: " << (void*)Res << " " << *Res
- << "In: " << (void*)I << " " << *I << "Out: " << (void*)Res
- << " " << *Res);
+ DOUT << "COT CREATED: " << (void*)Res << " " << *Res
+ << "In: " << (void*)I << " " << *I << "Out: " << (void*)Res
+ << " " << *Res;
// Add the instruction to the expression map
VMC.ExprMap[I] = Res;
@@ -955,13 +954,13 @@
ValueHandle::ValueHandle(ValueMapCache &VMC, Value *V)
: Instruction(Type::VoidTy, UserOp1, &Op, 1, ""), Op(V, this), Cache(VMC) {
- //DEBUG(std::cerr << "VH AQUIRING: " << (void*)V << " " << V);
+ //DOUT << "VH AQUIRING: " << (void*)V << " " << V;
}
ValueHandle::ValueHandle(const ValueHandle &VH)
: Instruction(Type::VoidTy, UserOp1, &Op, 1, ""),
Op(VH.Op, this), Cache(VH.Cache) {
- //DEBUG(std::cerr << "VH AQUIRING: " << (void*)V << " " << V);
+ //DOUT << "VH AQUIRING: " << (void*)V << " " << V;
}
static void RecursiveDelete(ValueMapCache &Cache, Instruction *I) {
@@ -969,7 +968,7 @@
assert(I->getParent() && "Inst not in basic block!");
- //DEBUG(std::cerr << "VH DELETING: " << (void*)I << " " << I);
+ //DOUT << "VH DELETING: " << (void*)I << " " << I;
for (User::op_iterator OI = I->op_begin(), OE = I->op_end();
OI != OE; ++OI)
@@ -996,8 +995,7 @@
//
RecursiveDelete(Cache, dyn_cast<Instruction>(V));
} else {
- //DEBUG(std::cerr << "VH RELEASING: " << (void*)Operands[0].get() << " "
- // << Operands[0]->getNumUses() << " " << Operands[0]);
+ //DOUT << "VH RELEASING: " << (void*)Operands[0].get() << " "
+ // << Operands[0]->getNumUses() << " " << Operands[0];
}
}
-
Index: llvm/lib/Transforms/LevelRaise.cpp
diff -u llvm/lib/Transforms/LevelRaise.cpp:1.111 llvm/lib/Transforms/LevelRaise.cpp:1.112
--- llvm/lib/Transforms/LevelRaise.cpp:1.111 Sun Aug 27 17:42:51 2006
+++ llvm/lib/Transforms/LevelRaise.cpp Sun Nov 26 03:17:06 2006
@@ -24,7 +24,6 @@
#include "llvm/ADT/Statistic.h"
#include "llvm/ADT/STLExtras.h"
#include <algorithm>
-#include <iostream>
using namespace llvm;
// StartInst - This enables the -raise-start-inst=foo option to cause the level
@@ -54,7 +53,7 @@
NumVarargCallChanges("raise", "Number of vararg call peepholes");
#define PRINT_PEEPHOLE(ID, NUM, I) \
- DEBUG(std::cerr << "Inst P/H " << ID << "[" << NUM << "] " << I)
+ DOUT << "Inst P/H " << ID << "[" << NUM << "] " << I
#define PRINT_PEEPHOLE1(ID, I1) do { PRINT_PEEPHOLE(ID, 0, I1); } while (0)
#define PRINT_PEEPHOLE2(ID, I1, I2) \
@@ -140,7 +139,7 @@
if (ExpressionConvertibleToType(Src, DestTy, ConvertedTypes, TD)) {
PRINT_PEEPHOLE3("CAST-SRC-EXPR-CONV:in ", *Src, *CI, *BB->getParent());
- DEBUG(std::cerr << "\nCONVERTING SRC EXPR TYPE:\n");
+ DOUT << "\nCONVERTING SRC EXPR TYPE:\n";
{ // ValueMap must be destroyed before function verified!
ValueMapCache ValueMap;
Value *E = ConvertExpressionToType(Src, DestTy, ValueMap, TD);
@@ -149,8 +148,8 @@
CI->replaceAllUsesWith(CPV);
PRINT_PEEPHOLE1("CAST-SRC-EXPR-CONV:out", *E);
- DEBUG(std::cerr << "DONE CONVERTING SRC EXPR TYPE: \n"
- << *BB->getParent());
+ DOUT << "DONE CONVERTING SRC EXPR TYPE: \n"
+ << *BB->getParent();
}
BI = BB->begin(); // Rescan basic block. BI might be invalidated.
@@ -168,15 +167,14 @@
//PRINT_PEEPHOLE3("CAST-DEST-EXPR-CONV:in ", *Src, *CI,
// *BB->getParent());
- DEBUG(std::cerr << "\nCONVERTING EXPR TYPE:\n");
+ DOUT << "\nCONVERTING EXPR TYPE:\n";
{ // ValueMap must be destroyed before function verified!
ValueMapCache ValueMap;
ConvertValueToNewType(CI, Src, ValueMap, TD); // This will delete CI!
}
PRINT_PEEPHOLE1("CAST-DEST-EXPR-CONV:out", *Src);
- DEBUG(std::cerr << "DONE CONVERTING EXPR TYPE: \n\n" <<
- *BB->getParent());
+ DOUT << "DONE CONVERTING EXPR TYPE: \n\n" << *BB->getParent();
BI = BB->begin(); // Rescan basic block. BI might be invalidated.
++NumExprTreesConv;
@@ -402,11 +400,11 @@
bool Changed = false;
for (Function::iterator BB = F.begin(), BBE = F.end(); BB != BBE; ++BB)
for (BasicBlock::iterator BI = BB->begin(); BI != BB->end();) {
- DEBUG(std::cerr << "LevelRaising: " << *BI);
+ DOUT << "LevelRaising: " << *BI;
if (dceInstruction(BI) || doConstantPropagation(BI)) {
Changed = true;
++NumDCEorCP;
- DEBUG(std::cerr << "***\t\t^^-- Dead code eliminated!\n");
+ DOUT << "***\t\t^^-- Dead code eliminated!\n";
} else if (PeepholeOptimize(BB, BI)) {
Changed = true;
} else {
@@ -420,8 +418,7 @@
// runOnFunction - Raise a function representation to a higher level.
bool RPR::runOnFunction(Function &F) {
- DEBUG(std::cerr << "\n\n\nStarting to work on Function '" << F.getName()
- << "'\n");
+ DOUT << "\n\n\nStarting to work on Function '" << F.getName() << "'\n";
// Insert casts for all incoming pointer pointer values that are treated as
// arrays...
@@ -443,7 +440,7 @@
}
do {
- DEBUG(std::cerr << "Looping: \n" << F);
+ DOUT << "Looping: \n" << F;
// Iterate over the function, refining it, until it converges on a stable
// state
More information about the llvm-commits
mailing list