mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-20 19:42:54 +02:00
Progress on PR341
llvm-svn: 14840
This commit is contained in:
parent
0f61d55197
commit
2db1894038
@ -348,7 +348,7 @@ Value *llvm::ConvertExpressionToType(Value *V, const Type *Ty,
|
||||
return VMCI->second;
|
||||
}
|
||||
|
||||
DEBUG(std::cerr << "CETT: " << (void*)V << " " << V);
|
||||
DEBUG(std::cerr << "CETT: " << (void*)V << " " << *V);
|
||||
|
||||
Instruction *I = dyn_cast<Instruction>(V);
|
||||
if (I == 0) {
|
||||
@ -553,8 +553,8 @@ Value *llvm::ConvertExpressionToType(Value *V, const Type *Ty,
|
||||
if (NumUses == OldSize) ++It;
|
||||
}
|
||||
|
||||
DEBUG(std::cerr << "ExpIn: " << (void*)I << " " << I
|
||||
<< "ExpOut: " << (void*)Res << " " << Res);
|
||||
DEBUG(std::cerr << "ExpIn: " << (void*)I << " " << *I
|
||||
<< "ExpOut: " << (void*)Res << " " << *Res);
|
||||
|
||||
return Res;
|
||||
}
|
||||
@ -1232,9 +1232,9 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
|
||||
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);
|
||||
DEBUG(std::cerr << "COT CREATED: " << (void*)Res << " " << *Res
|
||||
<< "In: " << (void*)I << " " << *I << "Out: " << (void*)Res
|
||||
<< " " << *Res);
|
||||
|
||||
// Add the instruction to the expression map
|
||||
VMC.ExprMap[I] = Res;
|
||||
|
@ -137,7 +137,7 @@ static bool HandleCastToPointer(BasicBlock::iterator BI,
|
||||
// Cannot handle subtracts if there is more than one index required...
|
||||
if (HasSubUse && Indices.size() != 1) return false;
|
||||
|
||||
PRINT_PEEPHOLE2("cast-add-to-gep:in", Src, CI);
|
||||
PRINT_PEEPHOLE2("cast-add-to-gep:in", *Src, CI);
|
||||
|
||||
// If we have a getelementptr capability... transform all of the
|
||||
// add instruction uses into getelementptr's.
|
||||
@ -151,7 +151,7 @@ static bool HandleCastToPointer(BasicBlock::iterator BI,
|
||||
Value *OtherPtr = I->getOperand((I->getOperand(0) == &CI) ? 1 : 0);
|
||||
|
||||
Instruction *GEP = new GetElementPtrInst(OtherPtr, Indices, I->getName());
|
||||
PRINT_PEEPHOLE1("cast-add-to-gep:i", I);
|
||||
PRINT_PEEPHOLE1("cast-add-to-gep:i", *I);
|
||||
|
||||
// If the instruction is actually a subtract, we are guaranteed to only have
|
||||
// one index (from code above), so we just need to negate the pointer index
|
||||
@ -173,14 +173,14 @@ static bool HandleCastToPointer(BasicBlock::iterator BI,
|
||||
// Insert the GEP instruction before the old add instruction...
|
||||
I->getParent()->getInstList().insert(I, GEP);
|
||||
|
||||
PRINT_PEEPHOLE1("cast-add-to-gep:o", GEP);
|
||||
PRINT_PEEPHOLE1("cast-add-to-gep:o", *GEP);
|
||||
GEP = new CastInst(GEP, I->getType());
|
||||
|
||||
// Replace the old add instruction with the shiny new GEP inst
|
||||
ReplaceInstWithInst(I, GEP);
|
||||
}
|
||||
|
||||
PRINT_PEEPHOLE1("cast-add-to-gep:o", GEP);
|
||||
PRINT_PEEPHOLE1("cast-add-to-gep:o", *GEP);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@ -220,9 +220,9 @@ static bool PeepholeOptimizeAddCast(BasicBlock *BB, BasicBlock::iterator &BI,
|
||||
return false; // Not convertible... perhaps next time
|
||||
|
||||
if (getPointedToComposite(AddOp1->getType())) { // case 1
|
||||
PRINT_PEEPHOLE2("add-to-gep1:in", AddOp2, *BI);
|
||||
PRINT_PEEPHOLE2("add-to-gep1:in", *AddOp2, *BI);
|
||||
} else {
|
||||
PRINT_PEEPHOLE3("add-to-gep2:in", AddOp1, AddOp2, *BI);
|
||||
PRINT_PEEPHOLE3("add-to-gep2:in", *AddOp1, *AddOp2, *BI);
|
||||
}
|
||||
|
||||
GetElementPtrInst *GEP = new GetElementPtrInst(SrcPtr, Indices,
|
||||
@ -230,7 +230,7 @@ static bool PeepholeOptimizeAddCast(BasicBlock *BB, BasicBlock::iterator &BI,
|
||||
|
||||
Instruction *NCI = new CastInst(GEP, AddOp1->getType());
|
||||
ReplaceInstWithInst(BB->getInstList(), BI, NCI);
|
||||
PRINT_PEEPHOLE2("add-to-gep:out", GEP, NCI);
|
||||
PRINT_PEEPHOLE2("add-to-gep:out", *GEP, *NCI);
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -249,7 +249,7 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
|
||||
// Into: <nothing>
|
||||
//
|
||||
if (DestTy == Src->getType()) { // Check for a cast to same type as src!!
|
||||
PRINT_PEEPHOLE1("cast-of-self-ty", CI);
|
||||
PRINT_PEEPHOLE1("cast-of-self-ty", *CI);
|
||||
CI->replaceAllUsesWith(Src);
|
||||
if (!Src->hasName() && CI->hasName()) {
|
||||
std::string Name = CI->getName();
|
||||
@ -276,7 +276,7 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
|
||||
//
|
||||
ConvertedTypes[CI] = CI->getType(); // Make sure the cast doesn't change
|
||||
if (ExpressionConvertibleToType(Src, DestTy, ConvertedTypes, TD)) {
|
||||
PRINT_PEEPHOLE3("CAST-SRC-EXPR-CONV:in ", Src, CI, BB->getParent());
|
||||
PRINT_PEEPHOLE3("CAST-SRC-EXPR-CONV:in ", *Src, *CI, *BB->getParent());
|
||||
|
||||
DEBUG(std::cerr << "\nCONVERTING SRC EXPR TYPE:\n");
|
||||
{ // ValueMap must be destroyed before function verified!
|
||||
@ -286,9 +286,9 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
|
||||
if (Constant *CPV = dyn_cast<Constant>(E))
|
||||
CI->replaceAllUsesWith(CPV);
|
||||
|
||||
PRINT_PEEPHOLE1("CAST-SRC-EXPR-CONV:out", E);
|
||||
PRINT_PEEPHOLE1("CAST-SRC-EXPR-CONV:out", *E);
|
||||
DEBUG(std::cerr << "DONE CONVERTING SRC EXPR TYPE: \n"
|
||||
<< BB->getParent());
|
||||
<< *BB->getParent());
|
||||
}
|
||||
|
||||
BI = BB->begin(); // Rescan basic block. BI might be invalidated.
|
||||
@ -303,7 +303,7 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
|
||||
// Make sure the source doesn't change type
|
||||
ConvertedTypes[Src] = Src->getType();
|
||||
if (ValueConvertibleToType(CI, Src->getType(), ConvertedTypes, TD)) {
|
||||
PRINT_PEEPHOLE3("CAST-DEST-EXPR-CONV:in ", Src, CI, BB->getParent());
|
||||
PRINT_PEEPHOLE3("CAST-DEST-EXPR-CONV:in ", *Src, *CI, *BB->getParent());
|
||||
|
||||
DEBUG(std::cerr << "\nCONVERTING EXPR TYPE:\n");
|
||||
{ // ValueMap must be destroyed before function verified!
|
||||
@ -311,8 +311,9 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
|
||||
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());
|
||||
PRINT_PEEPHOLE1("CAST-DEST-EXPR-CONV:out", *Src);
|
||||
DEBUG(std::cerr << "DONE CONVERTING EXPR TYPE: \n\n" <<
|
||||
*BB->getParent());
|
||||
|
||||
BI = BB->begin(); // Rescan basic block. BI might be invalidated.
|
||||
++NumExprTreesConv;
|
||||
@ -398,7 +399,7 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
|
||||
|
||||
// Did we find what we were looking for? If so, do the transformation
|
||||
if (ElTy) {
|
||||
PRINT_PEEPHOLE1("cast-for-first:in", CI);
|
||||
PRINT_PEEPHOLE1("cast-for-first:in", *CI);
|
||||
|
||||
std::string Name = CI->getName(); CI->setName("");
|
||||
|
||||
@ -411,7 +412,7 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
|
||||
//
|
||||
CI->setOperand(0, GEP);
|
||||
|
||||
PRINT_PEEPHOLE2("cast-for-first:out", GEP, CI);
|
||||
PRINT_PEEPHOLE2("cast-for-first:out", *GEP, *CI);
|
||||
++NumGEPInstFormed;
|
||||
return true;
|
||||
}
|
||||
@ -440,7 +441,7 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
|
||||
if (const PointerType *CSPT = dyn_cast<PointerType>(CastSrc->getType()))
|
||||
// convertible types?
|
||||
if (Val->getType()->isLosslesslyConvertibleTo(CSPT->getElementType())) {
|
||||
PRINT_PEEPHOLE3("st-src-cast:in ", Pointer, Val, SI);
|
||||
PRINT_PEEPHOLE3("st-src-cast:in ", *Pointer, *Val, *SI);
|
||||
|
||||
// Insert the new T cast instruction... stealing old T's name
|
||||
std::string Name(CI->getName()); CI->setName("");
|
||||
@ -450,7 +451,7 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
|
||||
// Replace the old store with a new one!
|
||||
ReplaceInstWithInst(BB->getInstList(), BI,
|
||||
SI = new StoreInst(NCI, CastSrc));
|
||||
PRINT_PEEPHOLE3("st-src-cast:out", NCI, CastSrc, SI);
|
||||
PRINT_PEEPHOLE3("st-src-cast:out", *NCI, *CastSrc, *SI);
|
||||
++NumLoadStorePeepholes;
|
||||
return true;
|
||||
}
|
||||
@ -478,7 +479,7 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
|
||||
if (const PointerType *CSPT = dyn_cast<PointerType>(CastSrc->getType()))
|
||||
// convertible types?
|
||||
if (PtrElType->isLosslesslyConvertibleTo(CSPT->getElementType())) {
|
||||
PRINT_PEEPHOLE2("load-src-cast:in ", Pointer, LI);
|
||||
PRINT_PEEPHOLE2("load-src-cast:in ", *Pointer, *LI);
|
||||
|
||||
// Create the new load instruction... loading the pre-casted value
|
||||
LoadInst *NewLI = new LoadInst(CastSrc, LI->getName(), BI);
|
||||
@ -488,7 +489,7 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
|
||||
|
||||
// Replace the old store with a new one!
|
||||
ReplaceInstWithInst(BB->getInstList(), BI, NCI);
|
||||
PRINT_PEEPHOLE3("load-src-cast:out", NCI, CastSrc, NewLI);
|
||||
PRINT_PEEPHOLE3("load-src-cast:out", *NCI, *CastSrc, *NewLI);
|
||||
++NumLoadStorePeepholes;
|
||||
return true;
|
||||
}
|
||||
|
@ -262,23 +262,23 @@ Function *CodeExtractor::constructFunction(const Values &inputs,
|
||||
for (Values::const_iterator i = inputs.begin(),
|
||||
e = inputs.end(); i != e; ++i) {
|
||||
const Value *value = *i;
|
||||
DEBUG(std::cerr << "value used in func: " << value << "\n");
|
||||
DEBUG(std::cerr << "value used in func: " << *value << "\n");
|
||||
paramTy.push_back(value->getType());
|
||||
}
|
||||
|
||||
// Add the types of the output values to the function's argument list.
|
||||
for (Values::const_iterator I = outputs.begin(), E = outputs.end();
|
||||
I != E; ++I) {
|
||||
DEBUG(std::cerr << "instr used in func: " << *I << "\n");
|
||||
DEBUG(std::cerr << "instr used in func: " << **I << "\n");
|
||||
if (AggregateArgs)
|
||||
paramTy.push_back((*I)->getType());
|
||||
else
|
||||
paramTy.push_back(PointerType::get((*I)->getType()));
|
||||
}
|
||||
|
||||
DEBUG(std::cerr << "Function type: " << RetTy << " f(");
|
||||
DEBUG(std::cerr << "Function type: " << *RetTy << " f(");
|
||||
DEBUG(for (std::vector<const Type*>::iterator i = paramTy.begin(),
|
||||
e = paramTy.end(); i != e; ++i) std::cerr << *i << ", ");
|
||||
e = paramTy.end(); i != e; ++i) std::cerr << **i << ", ");
|
||||
DEBUG(std::cerr << ")\n");
|
||||
|
||||
if (AggregateArgs && (inputs.size() + outputs.size() > 0)) {
|
||||
|
@ -567,7 +567,7 @@ bool llvm::SimplifyCFG(BasicBlock *BB) {
|
||||
// Remove basic blocks that have no predecessors... which are unreachable.
|
||||
if (pred_begin(BB) == pred_end(BB) ||
|
||||
*pred_begin(BB) == BB && ++pred_begin(BB) == pred_end(BB)) {
|
||||
DEBUG(std::cerr << "Removing BB: \n" << BB);
|
||||
DEBUG(std::cerr << "Removing BB: \n" << *BB);
|
||||
|
||||
// Loop through all of our successors and make sure they know that one
|
||||
// of their predecessors is going away.
|
||||
@ -615,7 +615,7 @@ bool llvm::SimplifyCFG(BasicBlock *BB) {
|
||||
// we cannot do this transformation!
|
||||
//
|
||||
if (!PropagatePredecessorsForPHIs(BB, Succ)) {
|
||||
DEBUG(std::cerr << "Killing Trivial BB: \n" << BB);
|
||||
DEBUG(std::cerr << "Killing Trivial BB: \n" << *BB);
|
||||
std::string OldName = BB->getName();
|
||||
|
||||
std::vector<BasicBlock*>
|
||||
@ -921,7 +921,7 @@ bool llvm::SimplifyCFG(BasicBlock *BB) {
|
||||
}
|
||||
|
||||
if (OnlySucc) {
|
||||
DEBUG(std::cerr << "Merging: " << BB << "into: " << OnlyPred);
|
||||
DEBUG(std::cerr << "Merging: " << *BB << "into: " << *OnlyPred);
|
||||
TerminatorInst *Term = OnlyPred->getTerminator();
|
||||
|
||||
// Resolve any PHI nodes at the start of the block. They are all
|
||||
|
@ -112,8 +112,8 @@ void llvm::RemapInstruction(Instruction *I,
|
||||
Value *V = MapValue(Op, ValueMap);
|
||||
#ifndef NDEBUG
|
||||
if (!V) {
|
||||
std::cerr << "Val = \n" << Op << "Addr = " << (void*)Op;
|
||||
std::cerr << "\nInst = " << I;
|
||||
std::cerr << "Val = \n" << *Op << "Addr = " << (void*)Op;
|
||||
std::cerr << "\nInst = " << *I;
|
||||
}
|
||||
#endif
|
||||
assert(V && "Referenced value not in value map!");
|
||||
|
Loading…
Reference in New Issue
Block a user