X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FTransforms%2FLevelRaise.cpp;h=9cbe3b813eba1620bd070563ea545a309dcbe76a;hb=7e6e44139429d1b8003426b29f14126b89591262;hp=f470e504610f6b403286918f0bf2b42c76cfea5d;hpb=5e2e27284bd838af61453571e3989230e675b66f;p=oota-llvm.git diff --git a/lib/Transforms/LevelRaise.cpp b/lib/Transforms/LevelRaise.cpp index f470e504610..9cbe3b813eb 100644 --- a/lib/Transforms/LevelRaise.cpp +++ b/lib/Transforms/LevelRaise.cpp @@ -1,10 +1,10 @@ //===- 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 @@ -19,11 +19,12 @@ #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 +#include using namespace llvm; // StartInst - This enables the -raise-start-inst=foo option to cause the level @@ -37,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<> @@ -83,7 +84,7 @@ namespace { } -Pass *llvm::createRaisePointerReferencesPass() { +FunctionPass *llvm::createRaisePointerReferencesPass() { return new RPR(); } @@ -96,150 +97,12 @@ 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, -// %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 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(*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 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(*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 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 (!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(); 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: @@ -253,7 +116,7 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { 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 @@ -276,7 +139,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()); - + DEBUG(std::cerr << "\nCONVERTING SRC EXPR TYPE:\n"); { // ValueMap must be destroyed before function verified! ValueMapCache ValueMap; @@ -284,7 +147,7 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { if (Constant *CPV = dyn_cast(E)) CI->replaceAllUsesWith(CPV); - + PRINT_PEEPHOLE1("CAST-SRC-EXPR-CONV:out", *E); DEBUG(std::cerr << "DONE CONVERTING SRC EXPR TYPE: \n" << *BB->getParent()); @@ -321,18 +184,6 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { } } - // 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. @@ -376,13 +227,13 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { if (const StructType *CurSTy = dyn_cast(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(CurCTy)->getElementType(); + ElTy = cast(CurCTy)->getElementType(); } // Insert a zero to index through this type... @@ -390,13 +241,13 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { // Did we find what we're looking for? 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); @@ -411,7 +262,7 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { // the old src value. // CI->setOperand(0, GEP); - + PRINT_PEEPHOLE2("cast-for-first:out", *GEP, *CI); ++NumGEPInstFormed; return true; @@ -422,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 convertible to T2 // store %V, * %t // - // Into: + // Into: // %t = cast %V to // store %t2, * %P // @@ -460,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 convertible to T2 // %t = load * %P // - // Into: + // Into: // %t = load * %P // %Val = cast to // @@ -483,7 +334,7 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { // 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()); @@ -494,14 +345,6 @@ bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { 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... @@ -538,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; } @@ -559,7 +404,7 @@ bool RPR::DoRaisePass(Function &F) { for (BasicBlock::iterator BI = BB->begin(); BI != BB->end();) { DEBUG(std::cerr << "LevelRaising: " << *BI); if (dceInstruction(BI) || doConstantPropagation(BI)) { - Changed = true; + Changed = true; ++NumDCEorCP; DEBUG(std::cerr << "***\t\t^^-- Dead code eliminated!\n"); } else if (PeepholeOptimize(BB, BI)) {