//===- LevelRaise.cpp - Code to change LLVM to higher level ---------------===//
-//
+//
// The LLVM Compiler Infrastructure
//
// This file was developed by the LLVM research group and is distributed under
// the University of Illinois Open Source License. See LICENSE.TXT for details.
-//
+//
//===----------------------------------------------------------------------===//
//
// This file implements the 'raising' part of the LevelChange API. This is
//
//===----------------------------------------------------------------------===//
+#define DEBUG_TYPE "raise"
#include "llvm/Transforms/Scalar.h"
#include "llvm/Transforms/Utils/Local.h"
#include "TransformInternals.h"
-#include "llvm/iOther.h"
-#include "llvm/iMemory.h"
+#include "llvm/Instructions.h"
#include "llvm/Pass.h"
#include "llvm/Transforms/Utils/BasicBlockUtils.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
#include <algorithm>
using namespace llvm;
StartInst("raise-start-inst", cl::Hidden, cl::value_desc("inst name"),
cl::desc("Start raise pass at the instruction with the specified name"));
-static Statistic<>
-NumLoadStorePeepholes("raise", "Number of load/store peepholes");
+STATISTIC(NumLoadStorePeepholes, "Number of load/store peepholes");
-static Statistic<>
-NumGEPInstFormed("raise", "Number of other getelementptr's formed");
+STATISTIC(NumGEPInstFormed, "Number of other getelementptr's formed");
-static Statistic<>
-NumExprTreesConv("raise", "Number of expression trees converted");
+STATISTIC(NumExprTreesConv, "Number of expression trees converted");
-static Statistic<>
-NumCastOfCast("raise", "Number of cast-of-self removed");
+STATISTIC(NumCastOfCast, "Number of cast-of-self removed");
-static Statistic<>
-NumDCEorCP("raise", "Number of insts DCEd or constprop'd");
+STATISTIC(NumDCEorCP, "Number of insts DCEd or constprop'd");
-static Statistic<>
-NumVarargCallChanges("raise", "Number of vararg call peepholes");
+STATISTIC(NumVarargCallChanges, "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) \
bool PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI);
};
- RegisterOpt<RPR> X("raise", "Raise Pointer References");
+ RegisterPass<RPR> X("raise", "Raise Pointer References");
}
-Pass *llvm::createRaisePointerReferencesPass() {
+FunctionPass *llvm::createRaisePointerReferencesPass() {
return new RPR();
}
-
-// isReinterpretingCast - Return true if the cast instruction specified will
-// cause the operand to be "reinterpreted". A value is reinterpreted if the
-// cast instruction would cause the underlying bits to change.
-//
-static inline bool isReinterpretingCast(const CastInst *CI) {
- return!CI->getOperand(0)->getType()->isLosslesslyConvertibleTo(CI->getType());
-}
-
-
-// Peephole optimize the following instructions:
-// %t1 = cast ? to x *
-// %t2 = add x * %SP, %t1 ;; Constant must be 2nd operand
-//
-// Into: %t3 = getelementptr {<...>} * %SP, <element indices>
-// %t2 = cast <eltype> * %t3 to {<...>}*
-//
-static bool HandleCastToPointer(BasicBlock::iterator BI,
- const PointerType *DestPTy,
- const TargetData &TD) {
- CastInst &CI = cast<CastInst>(*BI);
- if (CI.use_empty()) return false;
-
- // Scan all of the uses, looking for any uses that are not add or sub
- // instructions. If we have non-adds, do not make this transformation.
- //
- bool HasSubUse = false; // Keep track of any subtracts...
- for (Value::use_iterator I = CI.use_begin(), E = CI.use_end();
- I != E; ++I)
- if (BinaryOperator *BO = dyn_cast<BinaryOperator>(*I)) {
- if ((BO->getOpcode() != Instruction::Add &&
- BO->getOpcode() != Instruction::Sub) ||
- // Avoid add sbyte* %X, %X cases...
- BO->getOperand(0) == BO->getOperand(1))
- return false;
- else
- HasSubUse |= BO->getOpcode() == Instruction::Sub;
- } else {
- return false;
- }
-
- std::vector<Value*> Indices;
- Value *Src = CI.getOperand(0);
- const Type *Result = ConvertibleToGEP(DestPTy, Src, Indices, TD, &BI);
- if (Result == 0) return false; // Not convertible...
-
- // 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);
-
- // If we have a getelementptr capability... transform all of the
- // add instruction uses into getelementptr's.
- while (!CI.use_empty()) {
- BinaryOperator *I = cast<BinaryOperator>(*CI.use_begin());
- assert((I->getOpcode() == Instruction::Add ||
- I->getOpcode() == Instruction::Sub) &&
- "Use is not a valid add instruction!");
-
- // Get the value added to the cast result pointer...
- 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);
-
- // 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
- // long value.
- if (I->getOpcode() == Instruction::Sub) {
- Instruction *Neg = BinaryOperator::createNeg(GEP->getOperand(1),
- GEP->getOperand(1)->getName()+".neg", I);
- GEP->setOperand(1, Neg);
- }
-
- if (GEP->getType() == I->getType()) {
- // Replace the old add instruction with the shiny new GEP inst
- ReplaceInstWithInst(I, GEP);
- } else {
- // If the type produced by the gep instruction differs from the original
- // add instruction type, insert a cast now.
- //
-
- // Insert the GEP instruction before the old add instruction...
- I->getParent()->getInstList().insert(I, 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);
- }
- return true;
-}
-
-// Peephole optimize the following instructions:
-// %t1 = cast ulong <const int> to {<...>} *
-// %t2 = add {<...>} * %SP, %t1 ;; Constant must be 2nd operand
-//
-// or
-// %t1 = cast {<...>}* %SP to int*
-// %t5 = cast ulong <const int> to int*
-// %t2 = add int* %t1, %t5 ;; int is same size as field
-//
-// Into: %t3 = getelementptr {<...>} * %SP, <element indices>
-// %t2 = cast <eltype> * %t3 to {<...>}*
-//
-static bool PeepholeOptimizeAddCast(BasicBlock *BB, BasicBlock::iterator &BI,
- Value *AddOp1, CastInst *AddOp2,
- const TargetData &TD) {
- const CompositeType *CompTy;
- Value *OffsetVal = AddOp2->getOperand(0);
- Value *SrcPtr = 0; // Of type pointer to struct...
-
- if ((CompTy = getPointedToComposite(AddOp1->getType()))) {
- SrcPtr = AddOp1; // Handle the first case...
- } else if (CastInst *AddOp1c = dyn_cast<CastInst>(AddOp1)) {
- SrcPtr = AddOp1c->getOperand(0); // Handle the second case...
- CompTy = getPointedToComposite(SrcPtr->getType());
- }
-
- // Only proceed if we have detected all of our conditions successfully...
- if (!CompTy || !SrcPtr || !OffsetVal->getType()->isInteger())
- return false;
-
- std::vector<Value*> Indices;
- if (!ConvertibleToGEP(SrcPtr->getType(), OffsetVal, Indices, TD, &BI))
- return false; // Not convertible... perhaps next time
-
- if (getPointedToComposite(AddOp1->getType())) { // case 1
- PRINT_PEEPHOLE2("add-to-gep1:in", AddOp2, *BI);
- } else {
- PRINT_PEEPHOLE3("add-to-gep2:in", AddOp1, AddOp2, *BI);
- }
-
- GetElementPtrInst *GEP = new GetElementPtrInst(SrcPtr, Indices,
- AddOp2->getName(), BI);
-
- Instruction *NCI = new CastInst(GEP, AddOp1->getType());
- ReplaceInstWithInst(BB->getInstList(), BI, NCI);
- PRINT_PEEPHOLE2("add-to-gep:out", GEP, NCI);
- return true;
-}
-
bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
Instruction *I = BI;
const TargetData &TD = getAnalysis<TargetData>();
if (CastInst *CI = dyn_cast<CastInst>(I)) {
Value *Src = CI->getOperand(0);
- Instruction *SrcI = dyn_cast<Instruction>(Src); // Nonnull if instr source
const Type *DestTy = CI->getType();
// Peephole optimize the following instruction:
// 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();
CI->setName("");
- Src->setName(Name, &BB->getParent()->getSymbolTable());
+ Src->setName(Name);
}
// DCE the instruction now, to avoid having the iterative version of DCE
// Check to see if it's a cast of an instruction that does not depend on the
// specific type of the operands to do it's job.
- if (!isReinterpretingCast(CI)) {
+ if (CI->isLosslessCast()) {
ValueTypeCache ConvertedTypes;
// Check to see if we can convert the source of the cast to match the
//
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());
-
- DEBUG(std::cerr << "\nCONVERTING SRC EXPR TYPE:\n");
+ PRINT_PEEPHOLE3("CAST-SRC-EXPR-CONV:in ", *Src, *CI, *BB->getParent());
+
+ DOUT << "\nCONVERTING SRC EXPR TYPE:\n";
{ // ValueMap must be destroyed before function verified!
ValueMapCache ValueMap;
Value *E = ConvertExpressionToType(Src, DestTy, ValueMap, TD);
if (Constant *CPV = dyn_cast<Constant>(E))
CI->replaceAllUsesWith(CPV);
-
- PRINT_PEEPHOLE1("CAST-SRC-EXPR-CONV:out", E);
- DEBUG(std::cerr << "DONE CONVERTING SRC EXPR TYPE: \n"
- << BB->getParent());
+
+ PRINT_PEEPHOLE1("CAST-SRC-EXPR-CONV:out", *E);
+ DOUT << "DONE CONVERTING SRC EXPR TYPE: \n"
+ << *BB->getParent();
}
BI = BB->begin(); // Rescan basic block. BI might be invalidated.
// 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");
+ 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());
+ PRINT_PEEPHOLE1("CAST-DEST-EXPR-CONV:out", *Src);
+ DOUT << "DONE CONVERTING EXPR TYPE: \n\n" << *BB->getParent();
BI = BB->begin(); // Rescan basic block. BI might be invalidated.
++NumExprTreesConv;
}
}
- // Otherwise find out it this cast is a cast to a pointer type, which is
- // then added to some other pointer, then loaded or stored through. If
- // so, convert the add into a getelementptr instruction...
- //
- if (const PointerType *DestPTy = dyn_cast<PointerType>(DestTy)) {
- if (HandleCastToPointer(BI, DestPTy, TD)) {
- BI = BB->begin(); // Rescan basic block. BI might be invalidated.
- ++NumGEPInstFormed;
- return true;
- }
- }
-
// Check to see if we are casting from a structure pointer to a pointer to
// the first element of the structure... to avoid munching other peepholes,
// we only let this happen if there are no add uses of the cast.
if (const StructType *CurSTy = dyn_cast<StructType>(CurCTy)) {
// Check for a zero element struct type... if we have one, bail.
if (CurSTy->getNumElements() == 0) break;
-
+
// Grab the first element of the struct type, which must lie at
// offset zero in the struct.
//
ElTy = CurSTy->getElementType(0);
} else {
- ElTy = cast<ArrayType>(CurCTy)->getElementType();
+ ElTy = cast<SequentialType>(CurCTy)->getElementType();
}
// Insert a zero to index through this type...
Indices.push_back(Constant::getNullValue(Type::UIntTy));
// Did we find what we're looking for?
- if (ElTy->isLosslesslyConvertibleTo(DestPointedTy)) break;
-
+ if (ElTy->canLosslesslyBitCastTo(DestPointedTy)) break;
+
// Nope, go a level deeper.
++Depth;
CurCTy = dyn_cast<CompositeType>(ElTy);
ElTy = 0;
}
-
+
// 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("");
Name, BI);
// Make the old cast instruction reference the new GEP instead of
- // the old src value.
- //
- CI->setOperand(0, GEP);
-
- PRINT_PEEPHOLE2("cast-for-first:out", GEP, CI);
+ // the old src value.
+ if (CI->getOperand(0)->getType() == GEP->getType()) {
+ // If the source types are the same we can safely replace the
+ // first operand of the CastInst because the opcode won't
+ // change as a result.
+ CI->setOperand(0, GEP);
+ } else {
+ // The existing and new operand 0 types are different so we must
+ // replace CI with a new CastInst so that we are assured to
+ // get the correct cast opcode.
+ CastInst *NewCI = new BitCastInst(GEP, CI->getType(),
+ CI->getName(), CI);
+ CI->replaceAllUsesWith(NewCI);
+ CI->eraseFromParent();
+ CI = NewCI;
+ BI = NewCI; // Don't let the iterator invalidate
+ }
+
+ PRINT_PEEPHOLE2("cast-for-first:out", *GEP, *CI);
++NumGEPInstFormed;
return true;
}
} else if (StoreInst *SI = dyn_cast<StoreInst>(I)) {
Value *Val = SI->getOperand(0);
Value *Pointer = SI->getPointerOperand();
-
+
// Peephole optimize the following instructions:
- // %t = cast <T1>* %P to <T2> * ;; If T1 is losslessly convertible to T2
+ // %t = cast <T1>* %P to <T2> * ;; If T1 is losslessly castable to T2
// store <T2> %V, <T2>* %t
//
- // Into:
+ // Into:
// %t = cast <T2> %V to <T1>
// store <T1> %t2, <T1>* %P
//
if (Value *CastSrc = CI->getOperand(0)) // CSPT = CastSrcPointerType
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);
+ if (Val->getType()->canLosslesslyBitCastTo(CSPT->getElementType()))
+ {
+ 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("");
- CastInst *NCI = new CastInst(Val, CSPT->getElementType(),
- Name, BI);
+ CastInst *NCI = CastInst::create(Instruction::BitCast, Val,
+ CSPT->getElementType(), Name, 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;
}
Value *Pointer = LI->getOperand(0);
const Type *PtrElType =
cast<PointerType>(Pointer->getType())->getElementType();
-
+
// Peephole optimize the following instructions:
// %Val = cast <T1>* to <T2>* ;; If T1 is losslessly convertible to T2
// %t = load <T2>* %P
//
- // Into:
+ // Into:
// %t = load <T1>* %P
// %Val = cast <T1> to <T2>
//
if (Value *CastSrc = CI->getOperand(0)) // CSPT = CastSrcPointerType
if (const PointerType *CSPT = dyn_cast<PointerType>(CastSrc->getType()))
// convertible types?
- if (PtrElType->isLosslesslyConvertibleTo(CSPT->getElementType())) {
- PRINT_PEEPHOLE2("load-src-cast:in ", Pointer, LI);
+ if (PtrElType->canLosslesslyBitCastTo(CSPT->getElementType())) {
+ 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);
-
+
// Insert the new T cast instruction... stealing old T's name
- CastInst *NCI = new CastInst(NewLI, LI->getType(), CI->getName());
+ CastInst *NCI =
+ CastInst::create(Instruction::BitCast, NewLI, LI->getType(),
+ CI->getName());
// 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;
}
- } else if (I->getOpcode() == Instruction::Add &&
- isa<CastInst>(I->getOperand(1))) {
-
- if (PeepholeOptimizeAddCast(BB, BI, I->getOperand(0),
- cast<CastInst>(I->getOperand(1)), TD)) {
- ++NumGEPInstFormed;
- return true;
- }
} else if (CallInst *CI = dyn_cast<CallInst>(I)) {
// If we have a call with all varargs arguments, convert the call to use the
// actual argument types present...
// Create a new cast, inserting it right before the function call...
Value *NewCast;
- Constant *ConstantCallSrc = 0;
if (Constant *CS = dyn_cast<Constant>(CI->getCalledValue()))
- ConstantCallSrc = CS;
- else if (GlobalValue *GV = dyn_cast<GlobalValue>(CI->getCalledValue()))
- ConstantCallSrc = ConstantPointerRef::get(GV);
-
- if (ConstantCallSrc)
- NewCast = ConstantExpr::getCast(ConstantCallSrc, NewPFunTy);
+ NewCast = ConstantExpr::getBitCast(CS, NewPFunTy);
else
- NewCast = new CastInst(CI->getCalledValue(), NewPFunTy,
- CI->getCalledValue()->getName()+"_c",CI);
-
- // Strip off unneeded CPR's.
- if (ConstantPointerRef *CPR = dyn_cast<ConstantPointerRef>(NewCast))
- NewCast = CPR->getValue();
+ NewCast = CastInst::create(Instruction::BitCast, CI->getCalledValue(),
+ NewPFunTy,
+ CI->getCalledValue()->getName()+"_c", CI);
// Create a new call instruction...
CallInst *NewCall = new CallInst(NewCast,
std::vector<Value*>(CI->op_begin()+1, CI->op_end()));
+ if (CI->isTailCall()) NewCall->setTailCall();
+ NewCall->setCallingConv(CI->getCallingConv());
++BI;
ReplaceInstWithInst(CI, NewCall);
-
+
++NumVarargCallChanges;
return true;
}
return false;
}
-
-
-
bool RPR::DoRaisePass(Function &F) {
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;
+ 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 {
// 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...
}
do {
- DEBUG(std::cerr << "Looping: \n" << F);
+ DOUT << "Looping: \n" << F;
// Iterate over the function, refining it, until it converges on a stable
// state
projects / oota-llvm.git / blobdiff