X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FTransforms%2FLevelRaise.cpp;h=9cbe3b813eba1620bd070563ea545a309dcbe76a;hb=7e6e44139429d1b8003426b29f14126b89591262;hp=b2c6b05ab46fdabd71aabdee0f6e0852a08c4ecc;hpb=cdeb81d41273220bb35171fe9eeee44f46d8d8b1;p=oota-llvm.git diff --git a/lib/Transforms/LevelRaise.cpp b/lib/Transforms/LevelRaise.cpp index b2c6b05ab46..9cbe3b813eb 100644 --- a/lib/Transforms/LevelRaise.cpp +++ b/lib/Transforms/LevelRaise.cpp @@ -1,4 +1,11 @@ -//===- LevelRaise.cpp - Code to change LLVM to higher level -----------------=// +//===- 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 // useful because, in general, it makes the LLVM code terser and easier to @@ -6,21 +13,19 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Transforms/RaisePointerReferences.h" +#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/ConstantHandling.h" -#include "llvm/Analysis/Expressions.h" -#include "llvm/Analysis/Verifier.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" -#include "Support/STLExtras.h" -#include "Support/Statistic.h" -#include "Support/CommandLine.h" +#include "llvm/Support/CommandLine.h" +#include "llvm/Support/Debug.h" +#include "llvm/ADT/Statistic.h" +#include "llvm/ADT/STLExtras.h" #include -using std::cerr; +#include +using namespace llvm; // StartInst - This enables the -raise-start-inst=foo option to cause the level // raising pass to start at instruction "foo", which is immensely useful for @@ -33,7 +38,7 @@ StartInst("raise-start-inst", cl::Hidden, cl::value_desc("inst name"), static Statistic<> NumLoadStorePeepholes("raise", "Number of load/store peepholes"); -static Statistic<> +static Statistic<> NumGEPInstFormed("raise", "Number of other getelementptr's formed"); static Statistic<> @@ -48,7 +53,6 @@ NumDCEorCP("raise", "Number of insts DCEd or constprop'd"); static Statistic<> NumVarargCallChanges("raise", "Number of vararg call peepholes"); - #define PRINT_PEEPHOLE(ID, NUM, I) \ DEBUG(std::cerr << "Inst P/H " << ID << "[" << NUM << "] " << I) @@ -79,139 +83,18 @@ namespace { RegisterOpt X("raise", "Raise Pointer References"); } -Pass *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()->isLosslesslyConvertableTo(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, -// %t2 = cast * %t3 to {<...>}* -// -static bool HandleCastToPointer(BasicBlock::iterator BI, - const PointerType *DestPTy, - const TargetData &TD) { - CastInst &CI = cast(*BI); - if (CI.use_empty()) return false; - - // Scan all of the uses, looking for any uses that are not add - // instructions. If we have non-adds, do not make this transformation. - // - for (Value::use_iterator I = CI.use_begin(), E = CI.use_end(); - I != E; ++I) { - if (BinaryOperator *BO = dyn_cast(*I)) { - if (BO->getOpcode() != Instruction::Add || - // Avoid add sbyte* %X, %X cases... - BO->getOperand(0) == BO->getOperand(1)) - return false; - } else { - return false; - } - } - - std::vector Indices; - Value *Src = CI.getOperand(0); - const Type *Result = ConvertableToGEP(DestPTy, Src, Indices, TD, &BI); - if (Result == 0) return false; // Not convertable... - - 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(*CI.use_begin()); - assert(I->getOpcode() == Instruction::Add && I->getNumOperands() == 2 && - "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 (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 to {<...>} * -// %t2 = add {<...>} * %SP, %t1 ;; Constant must be 2nd operand -// -// or -// %t1 = cast {<...>}* %SP to int* -// %t5 = cast ulong to int* -// %t2 = add int* %t1, %t5 ;; int is same size as field -// -// Into: %t3 = getelementptr {<...>} * %SP, -// %t2 = cast * %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(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 Indices; - if (!ConvertableToGEP(SrcPtr->getType(), OffsetVal, Indices, TD, &BI)) - return false; // Not convertable... 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; + return!CI->getOperand(0)->getType()->isLosslesslyConvertibleTo(CI->getType()); } bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { @@ -220,7 +103,6 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { if (CastInst *CI = dyn_cast(I)) { Value *Src = CI->getOperand(0); - Instruction *SrcI = dyn_cast(Src); // Nonnull if instr source const Type *DestTy = CI->getType(); // Peephole optimize the following instruction: @@ -229,12 +111,12 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { // Into: // 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 @@ -255,23 +137,22 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { // destination type of the cast... // ConvertedTypes[CI] = CI->getType(); // Make sure the cast doesn't change - if (ExpressionConvertableToType(Src, DestTy, ConvertedTypes, TD)) { - PRINT_PEEPHOLE3("CAST-SRC-EXPR-CONV:in ", Src, CI, BB->getParent()); - - DEBUG(cerr << "\nCONVERTING SRC EXPR TYPE:\n"); + 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"); { // ValueMap must be destroyed before function verified! ValueMapCache ValueMap; Value *E = ConvertExpressionToType(Src, DestTy, ValueMap, TD); if (Constant *CPV = dyn_cast(E)) CI->replaceAllUsesWith(CPV); - - PRINT_PEEPHOLE1("CAST-SRC-EXPR-CONV:out", E); - DEBUG(cerr << "DONE CONVERTING SRC EXPR TYPE: \n" << BB->getParent()); + + PRINT_PEEPHOLE1("CAST-SRC-EXPR-CONV:out", *E); + DEBUG(std::cerr << "DONE CONVERTING SRC EXPR TYPE: \n" + << *BB->getParent()); } - DEBUG(assert(verifyFunction(*BB->getParent()) == false && - "Function broken!")); BI = BB->begin(); // Rescan basic block. BI might be invalidated. ++NumExprTreesConv; return true; @@ -283,38 +164,26 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { ConvertedTypes.clear(); // Make sure the source doesn't change type ConvertedTypes[Src] = Src->getType(); - if (ValueConvertableToType(CI, Src->getType(), ConvertedTypes, TD)) { - PRINT_PEEPHOLE3("CAST-DEST-EXPR-CONV:in ", Src, CI, BB->getParent()); + if (ValueConvertibleToType(CI, Src->getType(), ConvertedTypes, TD)) { + //PRINT_PEEPHOLE3("CAST-DEST-EXPR-CONV:in ", *Src, *CI, + // *BB->getParent()); - DEBUG(cerr << "\nCONVERTING EXPR TYPE:\n"); + DEBUG(std::cerr << "\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(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()); - DEBUG(assert(verifyFunction(*BB->getParent()) == false && - "Function broken!")); BI = BB->begin(); // Rescan basic block. BI might be invalidated. ++NumExprTreesConv; return true; } } - // 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(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. @@ -341,7 +210,7 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { } // If it doesn't have an add use, check to see if the dest type is - // losslessly convertable to one of the types in the start of the struct + // losslessly convertible to one of the types in the start of the struct // type. // if (!HasAddUse) { @@ -352,35 +221,36 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { // Build the index vector, full of all zeros std::vector Indices; - Indices.push_back(ConstantSInt::get(Type::LongTy, 0)); + + Indices.push_back(Constant::getNullValue(Type::UIntTy)); while (CurCTy && !isa(CurCTy)) { if (const StructType *CurSTy = dyn_cast(CurCTy)) { // Check for a zero element struct type... if we have one, bail. - if (CurSTy->getElementTypes().size() == 0) break; - + if (CurSTy->getNumElements() == 0) break; + // Grab the first element of the struct type, which must lie at // offset zero in the struct. // - ElTy = CurSTy->getElementTypes()[0]; + ElTy = CurSTy->getElementType(0); } else { - ElTy = cast(CurCTy)->getElementType(); + ElTy = cast(CurCTy)->getElementType(); } // Insert a zero to index through this type... - Indices.push_back(Constant::getNullValue(CurCTy->getIndexType())); + Indices.push_back(Constant::getNullValue(Type::UIntTy)); // Did we find what we're looking for? - if (ElTy->isLosslesslyConvertableTo(DestPointedTy)) break; - + if (ElTy->isLosslesslyConvertibleTo(DestPointedTy)) break; + // Nope, go a level deeper. ++Depth; CurCTy = dyn_cast(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(""); @@ -392,8 +262,8 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { // the old src value. // CI->setOperand(0, GEP); - - PRINT_PEEPHOLE2("cast-for-first:out", GEP, CI); + + PRINT_PEEPHOLE2("cast-for-first:out", *GEP, *CI); ++NumGEPInstFormed; return true; } @@ -403,12 +273,12 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { } else if (StoreInst *SI = dyn_cast(I)) { Value *Val = SI->getOperand(0); Value *Pointer = SI->getPointerOperand(); - + // Peephole optimize the following instructions: - // %t = cast * %P to * ;; If T1 is losslessly convertable to T2 + // %t = cast * %P to * ;; If T1 is losslessly convertible to T2 // store %V, * %t // - // Into: + // Into: // %t = cast %V to // store %t2, * %P // @@ -420,9 +290,9 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { if (CastInst *CI = dyn_cast(Pointer)) if (Value *CastSrc = CI->getOperand(0)) // CSPT = CastSrcPointerType if (const PointerType *CSPT = dyn_cast(CastSrc->getType())) - // convertable types? - if (Val->getType()->isLosslesslyConvertableTo(CSPT->getElementType())) { - PRINT_PEEPHOLE3("st-src-cast:in ", Pointer, Val, SI); + // convertible types? + if (Val->getType()->isLosslesslyConvertibleTo(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(""); @@ -432,7 +302,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; } @@ -441,12 +311,12 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { Value *Pointer = LI->getOperand(0); const Type *PtrElType = cast(Pointer->getType())->getElementType(); - + // Peephole optimize the following instructions: - // %Val = cast * to * ;; If T1 is losslessly convertable to T2 + // %Val = cast * to * ;; If T1 is losslessly convertible to T2 // %t = load * %P // - // Into: + // Into: // %t = load * %P // %Val = cast to // @@ -458,31 +328,23 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { if (CastInst *CI = dyn_cast(Pointer)) if (Value *CastSrc = CI->getOperand(0)) // CSPT = CastSrcPointerType if (const PointerType *CSPT = dyn_cast(CastSrc->getType())) - // convertable types? - if (PtrElType->isLosslesslyConvertableTo(CSPT->getElementType())) { - PRINT_PEEPHOLE2("load-src-cast:in ", Pointer, LI); + // convertible types? + if (PtrElType->isLosslesslyConvertibleTo(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()); // 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(I->getOperand(1))) { - - if (PeepholeOptimizeAddCast(BB, BI, I->getOperand(0), - cast(I->getOperand(1)), TD)) { - ++NumGEPInstFormed; - return true; - } } else if (CallInst *CI = dyn_cast(I)) { // If we have a call with all varargs arguments, convert the call to use the // actual argument types present... @@ -509,8 +371,6 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { Constant *ConstantCallSrc = 0; if (Constant *CS = dyn_cast(CI->getCalledValue())) ConstantCallSrc = CS; - else if (GlobalValue *GV = dyn_cast(CI->getCalledValue())) - ConstantCallSrc = ConstantPointerRef::get(GV); if (ConstantCallSrc) NewCast = ConstantExpr::getCast(ConstantCallSrc, NewPFunTy); @@ -521,9 +381,11 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { // Create a new call instruction... CallInst *NewCall = new CallInst(NewCast, std::vector(CI->op_begin()+1, CI->op_end())); + if (CI->isTailCall()) NewCall->setTailCall(); + NewCall->setCallingConv(CI->getCallingConv()); ++BI; ReplaceInstWithInst(CI, NewCall); - + ++NumVarargCallChanges; return true; } @@ -540,11 +402,11 @@ 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(cerr << "Processing: " << *BI); - if (dceInstruction(BI) || doConstantPropogation(BI)) { - Changed = true; + DEBUG(std::cerr << "LevelRaising: " << *BI); + if (dceInstruction(BI) || doConstantPropagation(BI)) { + Changed = true; ++NumDCEorCP; - DEBUG(cerr << "***\t\t^^-- Dead code eliminated!\n"); + DEBUG(std::cerr << "***\t\t^^-- Dead code eliminated!\n"); } else if (PeepholeOptimize(BB, BI)) { Changed = true; } else { @@ -558,7 +420,8 @@ bool RPR::DoRaisePass(Function &F) { // runOnFunction - Raise a function representation to a higher level. bool RPR::runOnFunction(Function &F) { - DEBUG(cerr << "\n\n\nStarting to work on Function '" << F.getName() << "'\n"); + DEBUG(std::cerr << "\n\n\nStarting to work on Function '" << F.getName() + << "'\n"); // Insert casts for all incoming pointer pointer values that are treated as // arrays... @@ -580,7 +443,7 @@ bool RPR::runOnFunction(Function &F) { } do { - DEBUG(cerr << "Looping: \n" << F); + DEBUG(std::cerr << "Looping: \n" << F); // Iterate over the function, refining it, until it converges on a stable // state @@ -592,3 +455,4 @@ bool RPR::runOnFunction(Function &F) { return Changed; } +