maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Instead of having a ScalarEvolution pointer member in BasedUser, just pass 

the ScalarEvolution pointer into the functions which need it.

llvm-svn: 91289
This commit is contained in:
Dan Gohman 2009-12-14 17:12:51 +00:00
parent 8dbd4e3d16
commit 163fb26927
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp
View File

@ -325,9 +325,6 @@ namespace {
/// BasedUser - For a particular base value, keep information about how we've /// BasedUser - For a particular base value, keep information about how we've
/// partitioned the expression so far. /// partitioned the expression so far.
struct BasedUser { struct BasedUser {
/// SE - The current ScalarEvolution object.
ScalarEvolution *SE;
/// Base - The Base value for the PHI node that needs to be inserted for /// Base - The Base value for the PHI node that needs to be inserted for
/// this use. As the use is processed, information gets moved from this /// this use. As the use is processed, information gets moved from this
/// field to the Imm field (below). BasedUser values are sorted by this /// field to the Imm field (below). BasedUser values are sorted by this
@ -359,9 +356,9 @@ namespace {
bool isUseOfPostIncrementedValue; bool isUseOfPostIncrementedValue;
BasedUser(IVStrideUse &IVSU, ScalarEvolution *se) BasedUser(IVStrideUse &IVSU, ScalarEvolution *se)
: SE(se), Base(IVSU.getOffset()), Inst(IVSU.getUser()), : Base(IVSU.getOffset()), Inst(IVSU.getUser()),
OperandValToReplace(IVSU.getOperandValToReplace()), OperandValToReplace(IVSU.getOperandValToReplace()),
Imm(SE->getIntegerSCEV(0, Base->getType())), Imm(se->getIntegerSCEV(0, Base->getType())),
isUseOfPostIncrementedValue(IVSU.isUseOfPostIncrementedValue()) {} isUseOfPostIncrementedValue(IVSU.isUseOfPostIncrementedValue()) {}
// Once we rewrite the code to insert the new IVs we want, update the // Once we rewrite the code to insert the new IVs we want, update the
@ -370,12 +367,14 @@ namespace {
void RewriteInstructionToUseNewBase(const SCEV *const &NewBase, void RewriteInstructionToUseNewBase(const SCEV *const &NewBase,
Instruction *InsertPt, Instruction *InsertPt,
SCEVExpander &Rewriter, Loop *L, Pass *P, SCEVExpander &Rewriter, Loop *L, Pass *P,
SmallVectorImpl<WeakVH> &DeadInsts); SmallVectorImpl<WeakVH> &DeadInsts,
ScalarEvolution *SE);
Value *InsertCodeForBaseAtPosition(const SCEV *const &NewBase, Value *InsertCodeForBaseAtPosition(const SCEV *const &NewBase,
const Type *Ty, const Type *Ty,
SCEVExpander &Rewriter, SCEVExpander &Rewriter,
Instruction *IP); Instruction *IP,
ScalarEvolution *SE);
void dump() const; void dump() const;
}; };
} }
@ -389,7 +388,8 @@ void BasedUser::dump() const {
Value *BasedUser::InsertCodeForBaseAtPosition(const SCEV *const &NewBase, Value *BasedUser::InsertCodeForBaseAtPosition(const SCEV *const &NewBase,
const Type *Ty, const Type *Ty,
SCEVExpander &Rewriter, SCEVExpander &Rewriter,
Instruction *IP) { Instruction *IP,
ScalarEvolution *SE) {
Value *Base = Rewriter.expandCodeFor(NewBase, 0, IP); Value *Base = Rewriter.expandCodeFor(NewBase, 0, IP);
// Wrap the base in a SCEVUnknown so that ScalarEvolution doesn't try to // Wrap the base in a SCEVUnknown so that ScalarEvolution doesn't try to
@ -412,7 +412,8 @@ Value *BasedUser::InsertCodeForBaseAtPosition(const SCEV *const &NewBase,
void BasedUser::RewriteInstructionToUseNewBase(const SCEV *const &NewBase, void BasedUser::RewriteInstructionToUseNewBase(const SCEV *const &NewBase,
Instruction *NewBasePt, Instruction *NewBasePt,
SCEVExpander &Rewriter, Loop *L, Pass *P, SCEVExpander &Rewriter, Loop *L, Pass *P,
SmallVectorImpl<WeakVH> &DeadInsts) { SmallVectorImpl<WeakVH> &DeadInsts,
ScalarEvolution *SE) {
if (!isa<PHINode>(Inst)) { if (!isa<PHINode>(Inst)) {
// By default, insert code at the user instruction. // By default, insert code at the user instruction.
BasicBlock::iterator InsertPt = Inst; BasicBlock::iterator InsertPt = Inst;
@ -441,7 +442,7 @@ void BasedUser::RewriteInstructionToUseNewBase(const SCEV *const &NewBase,
} }
Value *NewVal = InsertCodeForBaseAtPosition(NewBase, Value *NewVal = InsertCodeForBaseAtPosition(NewBase,
OperandValToReplace->getType(), OperandValToReplace->getType(),
Rewriter, InsertPt); Rewriter, InsertPt, SE);
// Replace the use of the operand Value with the new Phi we just created. // Replace the use of the operand Value with the new Phi we just created.
Inst->replaceUsesOfWith(OperandValToReplace, NewVal); Inst->replaceUsesOfWith(OperandValToReplace, NewVal);
@ -503,7 +504,7 @@ void BasedUser::RewriteInstructionToUseNewBase(const SCEV *const &NewBase,
PHIPred->getTerminator() : PHIPred->getTerminator() :
OldLoc->getParent()->getTerminator(); OldLoc->getParent()->getTerminator();
Code = InsertCodeForBaseAtPosition(NewBase, PN->getType(), Code = InsertCodeForBaseAtPosition(NewBase, PN->getType(),
Rewriter, InsertPt); Rewriter, InsertPt, SE);
DEBUG(errs() << " Changing PHI use to "); DEBUG(errs() << " Changing PHI use to ");
DEBUG(WriteAsOperand(errs(), Code, /*PrintType=*/false)); DEBUG(WriteAsOperand(errs(), Code, /*PrintType=*/false));
@ -1745,7 +1746,7 @@ LoopStrengthReduce::StrengthReduceIVUsersOfStride(const SCEV *const &Stride,
User.RewriteInstructionToUseNewBase(RewriteExpr, NewBasePt, User.RewriteInstructionToUseNewBase(RewriteExpr, NewBasePt,
Rewriter, L, this, Rewriter, L, this,
DeadInsts); DeadInsts, SE);
// Mark old value we replaced as possibly dead, so that it is eliminated // Mark old value we replaced as possibly dead, so that it is eliminated
// if we just replaced the last use of that value. // if we just replaced the last use of that value.