X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FTransforms%2FLevelRaise.cpp;h=9f93c27f5382c8d7e3c718bc39b29a57e180b0d0;hb=97f4b664cd8a537cd2bf37b6a9d06a174078e947;hp=6ea60059eae45790fd72e5cf84deed0e98c9934f;hpb=cb2610ea037a17115ef3a01a6bdaab4e3cfdca27;p=oota-llvm.git diff --git a/lib/Transforms/LevelRaise.cpp b/lib/Transforms/LevelRaise.cpp index 6ea60059eae..9f93c27f538 100644 --- a/lib/Transforms/LevelRaise.cpp +++ b/lib/Transforms/LevelRaise.cpp @@ -62,13 +62,35 @@ NumVarargCallChanges("raise", "Number of vararg call peepholes"); do { PRINT_PEEPHOLE(ID, 0, I1); PRINT_PEEPHOLE(ID, 1, I2); \ PRINT_PEEPHOLE(ID, 2, I3); PRINT_PEEPHOLE(ID, 3, I4); } while (0) +namespace { + struct RPR : public FunctionPass { + virtual bool runOnFunction(Function &F); + + virtual void getAnalysisUsage(AnalysisUsage &AU) const { + AU.setPreservesCFG(); + AU.addRequired(); + } + + private: + bool DoRaisePass(Function &F); + bool PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI); + }; + + RegisterOpt X("raise", "Raise Pointer References"); +} + +Pass *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()); + return!CI->getOperand(0)->getType()->isLosslesslyConvertibleTo(CI->getType()); } @@ -80,29 +102,36 @@ static inline bool isReinterpretingCast(const CastInst *CI) { // %t2 = cast * %t3 to {<...>}* // static bool HandleCastToPointer(BasicBlock::iterator BI, - const PointerType *DestPTy) { + 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 + // 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) { + I != E; ++I) if (BinaryOperator *BO = dyn_cast(*I)) { - if (BO->getOpcode() != Instruction::Add || + 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 = ConvertableToGEP(DestPTy, Src, Indices, &BI); - if (Result == 0) return false; // Not convertable... + 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); @@ -110,7 +139,8 @@ static bool HandleCastToPointer(BasicBlock::iterator BI, // add instruction uses into getelementptr's. while (!CI.use_empty()) { BinaryOperator *I = cast(*CI.use_begin()); - assert(I->getOpcode() == Instruction::Add && I->getNumOperands() == 2 && + 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... @@ -119,6 +149,15 @@ static bool HandleCastToPointer(BasicBlock::iterator BI, 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); @@ -155,10 +194,11 @@ static bool HandleCastToPointer(BasicBlock::iterator BI, // %t2 = cast * %t3 to {<...>}* // static bool PeepholeOptimizeAddCast(BasicBlock *BB, BasicBlock::iterator &BI, - Value *AddOp1, CastInst *AddOp2) { + Value *AddOp1, CastInst *AddOp2, + const TargetData &TD) { const CompositeType *CompTy; Value *OffsetVal = AddOp2->getOperand(0); - Value *SrcPtr; // Of type pointer to struct... + Value *SrcPtr = 0; // Of type pointer to struct... if ((CompTy = getPointedToComposite(AddOp1->getType()))) { SrcPtr = AddOp1; // Handle the first case... @@ -172,8 +212,8 @@ static bool PeepholeOptimizeAddCast(BasicBlock *BB, BasicBlock::iterator &BI, return false; std::vector Indices; - if (!ConvertableToGEP(SrcPtr->getType(), OffsetVal, Indices, &BI)) - return false; // Not convertable... perhaps next time + 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); @@ -190,8 +230,9 @@ static bool PeepholeOptimizeAddCast(BasicBlock *BB, BasicBlock::iterator &BI, return true; } -static bool PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { +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); @@ -209,7 +250,7 @@ static bool 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, &BB->getParent()->getSymbolTable()); } // DCE the instruction now, to avoid having the iterative version of DCE @@ -230,13 +271,13 @@ static bool 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)) { + if (ExpressionConvertibleToType(Src, DestTy, ConvertedTypes, TD)) { PRINT_PEEPHOLE3("CAST-SRC-EXPR-CONV:in ", Src, CI, BB->getParent()); DEBUG(cerr << "\nCONVERTING SRC EXPR TYPE:\n"); { // ValueMap must be destroyed before function verified! ValueMapCache ValueMap; - Value *E = ConvertExpressionToType(Src, DestTy, ValueMap); + Value *E = ConvertExpressionToType(Src, DestTy, ValueMap, TD); if (Constant *CPV = dyn_cast(E)) CI->replaceAllUsesWith(CPV); @@ -258,13 +299,13 @@ static bool 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)) { + if (ValueConvertibleToType(CI, Src->getType(), ConvertedTypes, TD)) { PRINT_PEEPHOLE3("CAST-DEST-EXPR-CONV:in ", Src, CI, BB->getParent()); DEBUG(cerr << "\nCONVERTING EXPR TYPE:\n"); { // ValueMap must be destroyed before function verified! ValueMapCache ValueMap; - ConvertValueToNewType(CI, Src, ValueMap); // This will delete CI! + ConvertValueToNewType(CI, Src, ValueMap, TD); // This will delete CI! } PRINT_PEEPHOLE1("CAST-DEST-EXPR-CONV:out", Src); @@ -283,7 +324,7 @@ static bool PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { // so, convert the add into a getelementptr instruction... // if (const PointerType *DestPTy = dyn_cast(DestTy)) { - if (HandleCastToPointer(BI, DestPTy)) { + if (HandleCastToPointer(BI, DestPTy, TD)) { BI = BB->begin(); // Rescan basic block. BI might be invalidated. ++NumGEPInstFormed; return true; @@ -316,7 +357,7 @@ static bool 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) { @@ -345,7 +386,7 @@ static bool PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { Indices.push_back(Constant::getNullValue(CurCTy->getIndexType())); // Did we find what we're looking for? - if (ElTy->isLosslesslyConvertableTo(DestPointedTy)) break; + if (ElTy->isLosslesslyConvertibleTo(DestPointedTy)) break; // Nope, go a level deeper. ++Depth; @@ -380,7 +421,7 @@ static bool PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { 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: @@ -395,8 +436,8 @@ static bool 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())) { + // 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 @@ -418,7 +459,7 @@ static bool PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { 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: @@ -433,8 +474,8 @@ static bool 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())) { + // 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 @@ -454,7 +495,7 @@ static bool PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { isa(I->getOperand(1))) { if (PeepholeOptimizeAddCast(BB, BI, I->getOperand(0), - cast(I->getOperand(1)))) { + cast(I->getOperand(1)), TD)) { ++NumGEPInstFormed; return true; } @@ -466,7 +507,8 @@ static bool PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { const FunctionType *FTy = cast(PTy->getElementType()); // Is the call to a vararg variable with no real parameters? - if (FTy->isVarArg() && FTy->getNumParams() == 0) { + if (FTy->isVarArg() && FTy->getNumParams() == 0 && + !CI->getCalledFunction()) { // If so, insert a new cast instruction, casting it to a function type // that matches the current arguments... // @@ -479,8 +521,18 @@ static bool PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { PointerType *NewPFunTy = PointerType::get(NewFT); // Create a new cast, inserting it right before the function call... - CastInst *NewCast = new CastInst(CI->getCalledValue(), NewPFunTy, - CI->getCalledValue()->getName(), CI); + Value *NewCast; + 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); + else + NewCast = new CastInst(CI->getCalledValue(), NewPFunTy, + CI->getCalledValue()->getName()+"_c",CI); // Create a new call instruction... CallInst *NewCall = new CallInst(NewCast, @@ -500,12 +552,12 @@ static bool PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { -static bool DoRaisePass(Function &F) { +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)) { + if (dceInstruction(BI) || doConstantPropagation(BI)) { Changed = true; ++NumDCEorCP; DEBUG(cerr << "***\t\t^^-- Dead code eliminated!\n"); @@ -520,17 +572,14 @@ static bool DoRaisePass(Function &F) { } -// RaisePointerReferences::doit - Raise a function representation to a higher -// level. -// -static bool doRPR(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"); // Insert casts for all incoming pointer pointer values that are treated as // arrays... // bool Changed = false, LocalChange; - // If the StartInst option was specified, then Peephole optimize that // instruction first if it occurs in this function. @@ -559,24 +608,3 @@ static bool doRPR(Function &F) { return Changed; } - -namespace { - struct RaisePointerReferences : public FunctionPass { - - // FIXME: constructor should save and use target data here!! - RaisePointerReferences(const TargetData &TD) {} - - virtual bool runOnFunction(Function &F) { return doRPR(F); } - - virtual void getAnalysisUsage(AnalysisUsage &AU) const { - AU.setPreservesCFG(); - } - }; -} - -Pass *createRaisePointerReferencesPass(const TargetData &TD) { - return new RaisePointerReferences(TD); -} - -static RegisterOpt -X("raise", "Raise Pointer References", createRaisePointerReferencesPass);