diff options
| author | Chris Lattner <sabre@nondot.org> | 2009-08-30 06:20:05 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2009-08-30 06:20:05 +0000 |
| commit | 059cfc7570d47711c1b53c909ab0f9c347cb23c3 (patch) | |
| tree | c91b0bc3dd1c4aac4a70a115e19c373fcfa6c8bd /lib/Transforms | |
| parent | a8d310b5231890e926000c6939540b93fe094b61 (diff) | |
| download | external_llvm-059cfc7570d47711c1b53c909ab0f9c347cb23c3.zip external_llvm-059cfc7570d47711c1b53c909ab0f9c347cb23c3.tar.gz external_llvm-059cfc7570d47711c1b53c909ab0f9c347cb23c3.tar.bz2 | |
rename AddUsesToWorkList -> AddOperandsToWorkList. The
former looks too much like AddUsersToWorkList and keeps
confusing me.
Remove AddSoonDeadInstToWorklist and change its two callers
to do the same thing in a simpler way.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80486 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms')
| -rw-r--r-- | lib/Transforms/Scalar/InstructionCombining.cpp | 44 |
1 files changed, 13 insertions, 31 deletions
diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp index 6163e80..bda1c21 100644 --- a/lib/Transforms/Scalar/InstructionCombining.cpp +++ b/lib/Transforms/Scalar/InstructionCombining.cpp @@ -151,34 +151,15 @@ namespace { Worklist.Add(cast<Instruction>(*UI)); } - /// AddUsesToWorkList - When an instruction is simplified, add operands to - /// the work lists because they might get more simplified now. + /// AddOperandsToWorkList - When an instruction is simplified, add operands + /// to the work lists because they might get more simplified now. /// - void AddUsesToWorkList(Instruction &I) { + void AddOperandsToWorkList(Instruction &I) { for (User::op_iterator i = I.op_begin(), e = I.op_end(); i != e; ++i) if (Instruction *Op = dyn_cast<Instruction>(*i)) Worklist.Add(Op); } - /// AddSoonDeadInstToWorklist - The specified instruction is about to become - /// dead. Add all of its operands to the worklist, turning them into - /// undef's to reduce the number of uses of those instructions. - /// - /// Return the specified operand before it is turned into an undef. - /// - Value *AddSoonDeadInstToWorklist(Instruction &I, unsigned op) { - Value *R = I.getOperand(op); - - for (User::op_iterator i = I.op_begin(), e = I.op_end(); i != e; ++i) - if (Instruction *Op = dyn_cast<Instruction>(*i)) { - Worklist.Add(Op); - // Set the operand to undef to drop the use. - *i = UndefValue::get(Op->getType()); - } - - return R; - } - public: virtual bool runOnFunction(Function &F); @@ -351,7 +332,7 @@ namespace { // Make sure that we reprocess all operands now that we reduced their // use counts. if (I.getNumOperands() < 8) - AddUsesToWorkList(I); + AddOperandsToWorkList(I); Worklist.Remove(&I); I.eraseFromParent(); return 0; // Don't do anything with FI @@ -1548,8 +1529,10 @@ Value *InstCombiner::SimplifyDemandedVectorElts(Value *V, APInt DemandedElts, // If this is inserting an element that isn't demanded, remove this // insertelement. unsigned IdxNo = Idx->getZExtValue(); - if (IdxNo >= VWidth || !DemandedElts[IdxNo]) - return AddSoonDeadInstToWorklist(*I, 0); + if (IdxNo >= VWidth || !DemandedElts[IdxNo]) { + Worklist.Add(I); + return I->getOperand(0); + } // Otherwise, the element inserted overwrites whatever was there, so the // input demanded set is simpler than the output set. @@ -1771,7 +1754,6 @@ Value *InstCombiner::SimplifyDemandedVectorElts(Value *V, APInt DemandedElts, UndefValue::get(II->getType()), TmpV, ConstantInt::get(Type::getInt32Ty(*Context), 0U, false), II->getName()); InsertNewInstBefore(New, *II); - AddSoonDeadInstToWorklist(*II, 0); return New; } } @@ -3265,7 +3247,7 @@ Instruction *InstCombiner::visitSRem(BinaryOperator &I) { (isa<ConstantInt>(RHSNeg) && cast<ConstantInt>(RHSNeg)->getValue().isStrictlyPositive())) { // X % -Y -> X % Y - AddUsesToWorkList(I); + AddOperandsToWorkList(I); I.setOperand(1, RHSNeg); return &I; } @@ -3303,7 +3285,7 @@ Instruction *InstCombiner::visitSRem(BinaryOperator &I) { Constant *NewRHSV = ConstantVector::get(Elts); if (NewRHSV != RHSV) { - AddUsesToWorkList(I); + AddOperandsToWorkList(I); I.setOperand(1, NewRHSV); return &I; } @@ -6902,7 +6884,7 @@ Instruction *InstCombiner::visitICmpInstWithInstAndIntCst(ICmpInst &ICI, LHSI->setOperand(1, NewAndCST); LHSI->setOperand(0, Shift->getOperand(0)); Worklist.Add(Shift); // Shift is dead. - AddUsesToWorkList(ICI); + AddOperandsToWorkList(ICI); return &ICI; } } @@ -7932,7 +7914,7 @@ Instruction *InstCombiner::PromoteCastOfAllocation(BitCastInst &CI, // things that used it to use the new cast. This will also hack on CI, but it // will die soon. else if (!AI.hasOneUse()) { - AddUsesToWorkList(AI); + AddOperandsToWorkList(AI); // New is the allocation instruction, pointer typed. AI is the original // allocation instruction, also pointer typed. Thus, cast to use is BitCast. CastInst *NewCast = new BitCastInst(New, AI.getType(), "tmpcast"); @@ -12419,7 +12401,7 @@ Instruction *InstCombiner::visitExtractElementInst(ExtractElementInst &EI) { // be the same value, extract from the pre-inserted value instead. if (isa<Constant>(IE->getOperand(2)) && isa<Constant>(EI.getOperand(1))) { - AddUsesToWorkList(EI); + AddOperandsToWorkList(EI); EI.setOperand(0, IE->getOperand(0)); return &EI; } |