mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-06-27 14:24:40 +00:00
eliminate the "Value" printing methods that print to a std::ostream.
This required converting a bunch of stuff off DOUT and other cleanups. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79819 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@ -34,6 +34,7 @@
|
||||
#include "llvm/Support/Compiler.h"
|
||||
#include "llvm/Support/Debug.h"
|
||||
#include "llvm/Support/ValueHandle.h"
|
||||
#include "llvm/Support/raw_ostream.h"
|
||||
#include "llvm/ADT/PostOrderIterator.h"
|
||||
#include "llvm/ADT/Statistic.h"
|
||||
#include <algorithm>
|
||||
@ -181,8 +182,8 @@ unsigned Reassociate::getRank(Value *V) {
|
||||
(!BinaryOperator::isNot(I) && !BinaryOperator::isNeg(I)))
|
||||
++Rank;
|
||||
|
||||
//DOUT << "Calculated Rank[" << V->getName() << "] = "
|
||||
// << Rank << "\n";
|
||||
//DEBUG(errs() << "Calculated Rank[" << V->getName() << "] = "
|
||||
// << Rank << "\n");
|
||||
|
||||
return CachedRank = Rank;
|
||||
}
|
||||
@ -222,7 +223,7 @@ void Reassociate::LinearizeExpr(BinaryOperator *I) {
|
||||
isReassociableOp(RHS, I->getOpcode()) &&
|
||||
"Not an expression that needs linearization?");
|
||||
|
||||
DOUT << "Linear" << *LHS << '\n' << *RHS << '\n' << *I << '\n';
|
||||
DEBUG(errs() << "Linear" << *LHS << '\n' << *RHS << '\n' << *I << '\n');
|
||||
|
||||
// Move the RHS instruction to live immediately before I, avoiding breaking
|
||||
// dominator properties.
|
||||
@ -235,7 +236,7 @@ void Reassociate::LinearizeExpr(BinaryOperator *I) {
|
||||
|
||||
++NumLinear;
|
||||
MadeChange = true;
|
||||
DOUT << "Linearized: " << *I << '\n';
|
||||
DEBUG(errs() << "Linearized: " << *I << '\n');
|
||||
|
||||
// If D is part of this expression tree, tail recurse.
|
||||
if (isReassociableOp(I->getOperand(1), I->getOpcode()))
|
||||
@ -334,10 +335,10 @@ void Reassociate::RewriteExprTree(BinaryOperator *I,
|
||||
if (I->getOperand(0) != Ops[i].Op ||
|
||||
I->getOperand(1) != Ops[i+1].Op) {
|
||||
Value *OldLHS = I->getOperand(0);
|
||||
DOUT << "RA: " << *I << '\n';
|
||||
DEBUG(errs() << "RA: " << *I << '\n');
|
||||
I->setOperand(0, Ops[i].Op);
|
||||
I->setOperand(1, Ops[i+1].Op);
|
||||
DOUT << "TO: " << *I << '\n';
|
||||
DEBUG(errs() << "TO: " << *I << '\n');
|
||||
MadeChange = true;
|
||||
++NumChanged;
|
||||
|
||||
@ -350,9 +351,9 @@ void Reassociate::RewriteExprTree(BinaryOperator *I,
|
||||
assert(i+2 < Ops.size() && "Ops index out of range!");
|
||||
|
||||
if (I->getOperand(1) != Ops[i].Op) {
|
||||
DOUT << "RA: " << *I << '\n';
|
||||
DEBUG(errs() << "RA: " << *I << '\n');
|
||||
I->setOperand(1, Ops[i].Op);
|
||||
DOUT << "TO: " << *I << '\n';
|
||||
DEBUG(errs() << "TO: " << *I << '\n');
|
||||
MadeChange = true;
|
||||
++NumChanged;
|
||||
}
|
||||
@ -450,7 +451,7 @@ static Instruction *BreakUpSubtract(LLVMContext &Context, Instruction *Sub,
|
||||
Sub->replaceAllUsesWith(New);
|
||||
Sub->eraseFromParent();
|
||||
|
||||
DOUT << "Negated: " << *New << '\n';
|
||||
DEBUG(errs() << "Negated: " << *New << '\n');
|
||||
return New;
|
||||
}
|
||||
|
||||
@ -728,7 +729,7 @@ Value *Reassociate::OptimizeExpression(BinaryOperator *I,
|
||||
|
||||
// If any factor occurred more than one time, we can pull it out.
|
||||
if (MaxOcc > 1) {
|
||||
DOUT << "\nFACTORING [" << MaxOcc << "]: " << *MaxOccVal << "\n";
|
||||
DEBUG(errs() << "\nFACTORING [" << MaxOcc << "]: " << *MaxOccVal << "\n");
|
||||
|
||||
// Create a new instruction that uses the MaxOccVal twice. If we don't do
|
||||
// this, we could otherwise run into situations where removing a factor
|
||||
@ -841,7 +842,7 @@ void Reassociate::ReassociateExpression(BinaryOperator *I) {
|
||||
std::vector<ValueEntry> Ops;
|
||||
LinearizeExprTree(I, Ops);
|
||||
|
||||
DOUT << "RAIn:\t"; DEBUG(PrintOps(I, Ops)); DOUT << "\n";
|
||||
DEBUG(errs() << "RAIn:\t"; PrintOps(I, Ops); errs() << "\n");
|
||||
|
||||
// Now that we have linearized the tree to a list and have gathered all of
|
||||
// the operands and their ranks, sort the operands by their rank. Use a
|
||||
@ -856,7 +857,7 @@ void Reassociate::ReassociateExpression(BinaryOperator *I) {
|
||||
if (Value *V = OptimizeExpression(I, Ops)) {
|
||||
// This expression tree simplified to something that isn't a tree,
|
||||
// eliminate it.
|
||||
DOUT << "Reassoc to scalar: " << *V << "\n";
|
||||
DEBUG(errs() << "Reassoc to scalar: " << *V << "\n");
|
||||
I->replaceAllUsesWith(V);
|
||||
RemoveDeadBinaryOp(I);
|
||||
return;
|
||||
@ -874,7 +875,7 @@ void Reassociate::ReassociateExpression(BinaryOperator *I) {
|
||||
Ops.pop_back();
|
||||
}
|
||||
|
||||
DOUT << "RAOut:\t"; DEBUG(PrintOps(I, Ops)); DOUT << "\n";
|
||||
DEBUG(errs() << "RAOut:\t"; PrintOps(I, Ops); errs() << "\n");
|
||||
|
||||
if (Ops.size() == 1) {
|
||||
// This expression tree simplified to something that isn't a tree,
|
||||
|
Reference in New Issue
Block a user