[llvm-commits] [llvm] r43224 - in /llvm/trunk: include/llvm/Analysis/ScalarEvolution.h include/llvm/Analysis/ScalarEvolutionExpander.h include/llvm/Analysis/ScalarEvolutionExpressions.h lib/Analysis/ScalarEvolution.cpp lib/Analysis/ScalarEvolutionExpander.cpp lib/Transforms/Scalar/IndVarSimplify.cpp lib/Transforms/Scalar/LoopStrengthReduce.cpp
Dan Gohman
djg at cray.com
Mon Oct 22 11:31:59 PDT 2007
Author: djg
Date: Mon Oct 22 13:31:58 2007
New Revision: 43224
URL: http://llvm.org/viewvc/llvm-project?rev=43224&view=rev
Log:
Move the SCEV object factors from being static members of the individual
SCEV subclasses to being non-static member functions of the ScalarEvolution
class.
Modified:
llvm/trunk/include/llvm/Analysis/ScalarEvolution.h
llvm/trunk/include/llvm/Analysis/ScalarEvolutionExpander.h
llvm/trunk/include/llvm/Analysis/ScalarEvolutionExpressions.h
llvm/trunk/lib/Analysis/ScalarEvolution.cpp
llvm/trunk/lib/Analysis/ScalarEvolutionExpander.cpp
llvm/trunk/lib/Transforms/Scalar/IndVarSimplify.cpp
llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp
Modified: llvm/trunk/include/llvm/Analysis/ScalarEvolution.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/ScalarEvolution.h?rev=43224&r1=43223&r2=43224&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Analysis/ScalarEvolution.h (original)
+++ llvm/trunk/include/llvm/Analysis/ScalarEvolution.h Mon Oct 22 13:31:58 2007
@@ -27,12 +27,15 @@
#include <set>
namespace llvm {
+ class APInt;
+ class ConstantInt;
class Instruction;
class Type;
class ConstantRange;
class Loop;
class LoopInfo;
class SCEVHandle;
+ class ScalarEvolution;
/// SCEV - This class represent an analyzed expression in the program. These
/// are reference counted opaque objects that the client is not allowed to
@@ -56,16 +59,6 @@
public:
explicit SCEV(unsigned SCEVTy) : SCEVType(SCEVTy), RefCount(0) {}
- /// getNegativeSCEV - Return the SCEV object corresponding to -V.
- ///
- static SCEVHandle getNegativeSCEV(const SCEVHandle &V);
-
- /// getMinusSCEV - Return LHS-RHS.
- ///
- static SCEVHandle getMinusSCEV(const SCEVHandle &LHS,
- const SCEVHandle &RHS);
-
-
unsigned getSCEVType() const { return SCEVType; }
/// getValueRange - Return the tightest constant bounds that this value is
@@ -97,7 +90,8 @@
/// returns itself.
virtual SCEVHandle
replaceSymbolicValuesWithConcrete(const SCEVHandle &Sym,
- const SCEVHandle &Conc) const = 0;
+ const SCEVHandle &Conc,
+ ScalarEvolution &SE) const = 0;
/// print - Print out the internal representation of this scalar to the
/// specified stream. This should really only be used for debugging
@@ -131,7 +125,8 @@
void print(std::ostream *OS) const { if (OS) print(*OS); }
virtual SCEVHandle
replaceSymbolicValuesWithConcrete(const SCEVHandle &Sym,
- const SCEVHandle &Conc) const;
+ const SCEVHandle &Conc,
+ ScalarEvolution &SE) const;
/// Methods for support type inquiry through isa, cast, and dyn_cast:
static inline bool classof(const SCEVCouldNotCompute *S) { return true; }
@@ -204,6 +199,58 @@
/// specified expression.
SCEVHandle getSCEV(Value *V) const;
+ SCEVHandle getConstant(ConstantInt *V);
+ SCEVHandle getConstant(const APInt& Val);
+ SCEVHandle getTruncateExpr(const SCEVHandle &Op, const Type *Ty);
+ SCEVHandle getZeroExtendExpr(const SCEVHandle &Op, const Type *Ty);
+ SCEVHandle getSignExtendExpr(const SCEVHandle &Op, const Type *Ty);
+ SCEVHandle getAddExpr(std::vector<SCEVHandle> &Ops);
+ SCEVHandle getAddExpr(const SCEVHandle &LHS, const SCEVHandle &RHS) {
+ std::vector<SCEVHandle> Ops;
+ Ops.push_back(LHS);
+ Ops.push_back(RHS);
+ return getAddExpr(Ops);
+ }
+ SCEVHandle getAddExpr(const SCEVHandle &Op0, const SCEVHandle &Op1,
+ const SCEVHandle &Op2) {
+ std::vector<SCEVHandle> Ops;
+ Ops.push_back(Op0);
+ Ops.push_back(Op1);
+ Ops.push_back(Op2);
+ return getAddExpr(Ops);
+ }
+ SCEVHandle getMulExpr(std::vector<SCEVHandle> &Ops);
+ SCEVHandle getMulExpr(const SCEVHandle &LHS, const SCEVHandle &RHS) {
+ std::vector<SCEVHandle> Ops;
+ Ops.push_back(LHS);
+ Ops.push_back(RHS);
+ return getMulExpr(Ops);
+ }
+ SCEVHandle getSDivExpr(const SCEVHandle &LHS, const SCEVHandle &RHS);
+ SCEVHandle getAddRecExpr(const SCEVHandle &Start, const SCEVHandle &Step,
+ const Loop *L);
+ SCEVHandle getAddRecExpr(std::vector<SCEVHandle> &Operands,
+ const Loop *L);
+ SCEVHandle getAddRecExpr(const std::vector<SCEVHandle> &Operands,
+ const Loop *L) {
+ std::vector<SCEVHandle> NewOp(Operands);
+ return getAddRecExpr(NewOp, L);
+ }
+ SCEVHandle getUnknown(Value *V);
+
+ /// getNegativeSCEV - Return the SCEV object corresponding to -V.
+ ///
+ SCEVHandle getNegativeSCEV(const SCEVHandle &V);
+
+ /// getMinusSCEV - Return LHS-RHS.
+ ///
+ SCEVHandle getMinusSCEV(const SCEVHandle &LHS,
+ const SCEVHandle &RHS);
+
+ /// getIntegerSCEV - Given an integer or FP type, create a constant for the
+ /// specified signed integer value and return a SCEV for the constant.
+ SCEVHandle getIntegerSCEV(int Val, const Type *Ty);
+
/// hasSCEV - Return true if the SCEV for this value has already been
/// computed.
bool hasSCEV(Value *V) const;
Modified: llvm/trunk/include/llvm/Analysis/ScalarEvolutionExpander.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/ScalarEvolutionExpander.h?rev=43224&r1=43223&r2=43224&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Analysis/ScalarEvolutionExpander.h (original)
+++ llvm/trunk/include/llvm/Analysis/ScalarEvolutionExpander.h Mon Oct 22 13:31:58 2007
@@ -61,8 +61,8 @@
/// starts at zero and steps by one on each iteration.
Value *getOrInsertCanonicalInductionVariable(const Loop *L, const Type *Ty){
assert(Ty->isInteger() && "Can only insert integer induction variables!");
- SCEVHandle H = SCEVAddRecExpr::get(SCEVUnknown::getIntegerSCEV(0, Ty),
- SCEVUnknown::getIntegerSCEV(1, Ty), L);
+ SCEVHandle H = SE.getAddRecExpr(SE.getIntegerSCEV(0, Ty),
+ SE.getIntegerSCEV(1, Ty), L);
return expand(H);
}
Modified: llvm/trunk/include/llvm/Analysis/ScalarEvolutionExpressions.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/ScalarEvolutionExpressions.h?rev=43224&r1=43223&r2=43224&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Analysis/ScalarEvolutionExpressions.h (original)
+++ llvm/trunk/include/llvm/Analysis/ScalarEvolutionExpressions.h Mon Oct 22 13:31:58 2007
@@ -32,16 +32,13 @@
/// SCEVConstant - This class represents a constant integer value.
///
class SCEVConstant : public SCEV {
+ friend class ScalarEvolution;
+
ConstantInt *V;
explicit SCEVConstant(ConstantInt *v) : SCEV(scConstant), V(v) {}
virtual ~SCEVConstant();
public:
- /// get method - This just gets and returns a new SCEVConstant object.
- ///
- static SCEVHandle get(ConstantInt *V);
- static SCEVHandle get(const APInt& Val);
-
ConstantInt *getValue() const { return V; }
/// getValueRange - Return the tightest constant bounds that this value is
@@ -59,7 +56,8 @@
virtual const Type *getType() const;
SCEVHandle replaceSymbolicValuesWithConcrete(const SCEVHandle &Sym,
- const SCEVHandle &Conc) const {
+ const SCEVHandle &Conc,
+ ScalarEvolution &SE) const {
return this;
}
@@ -78,15 +76,13 @@
/// to a smaller integer value.
///
class SCEVTruncateExpr : public SCEV {
+ friend class ScalarEvolution;
+
SCEVHandle Op;
const Type *Ty;
SCEVTruncateExpr(const SCEVHandle &op, const Type *ty);
virtual ~SCEVTruncateExpr();
public:
- /// get method - This just gets and returns a new SCEVTruncate object
- ///
- static SCEVHandle get(const SCEVHandle &Op, const Type *Ty);
-
const SCEVHandle &getOperand() const { return Op; }
virtual const Type *getType() const { return Ty; }
@@ -99,11 +95,12 @@
}
SCEVHandle replaceSymbolicValuesWithConcrete(const SCEVHandle &Sym,
- const SCEVHandle &Conc) const {
- SCEVHandle H = Op->replaceSymbolicValuesWithConcrete(Sym, Conc);
+ const SCEVHandle &Conc,
+ ScalarEvolution &SE) const {
+ SCEVHandle H = Op->replaceSymbolicValuesWithConcrete(Sym, Conc, SE);
if (H == Op)
return this;
- return get(H, Ty);
+ return SE.getTruncateExpr(H, Ty);
}
/// getValueRange - Return the tightest constant bounds that this value is
@@ -125,15 +122,13 @@
/// integer value to a larger integer value.
///
class SCEVZeroExtendExpr : public SCEV {
+ friend class ScalarEvolution;
+
SCEVHandle Op;
const Type *Ty;
SCEVZeroExtendExpr(const SCEVHandle &op, const Type *ty);
virtual ~SCEVZeroExtendExpr();
public:
- /// get method - This just gets and returns a new SCEVZeroExtend object
- ///
- static SCEVHandle get(const SCEVHandle &Op, const Type *Ty);
-
const SCEVHandle &getOperand() const { return Op; }
virtual const Type *getType() const { return Ty; }
@@ -150,11 +145,12 @@
virtual ConstantRange getValueRange() const;
SCEVHandle replaceSymbolicValuesWithConcrete(const SCEVHandle &Sym,
- const SCEVHandle &Conc) const {
- SCEVHandle H = Op->replaceSymbolicValuesWithConcrete(Sym, Conc);
+ const SCEVHandle &Conc,
+ ScalarEvolution &SE) const {
+ SCEVHandle H = Op->replaceSymbolicValuesWithConcrete(Sym, Conc, SE);
if (H == Op)
return this;
- return get(H, Ty);
+ return SE.getZeroExtendExpr(H, Ty);
}
virtual void print(std::ostream &OS) const;
@@ -172,15 +168,13 @@
/// integer value to a larger integer value.
///
class SCEVSignExtendExpr : public SCEV {
+ friend class ScalarEvolution;
+
SCEVHandle Op;
const Type *Ty;
SCEVSignExtendExpr(const SCEVHandle &op, const Type *ty);
virtual ~SCEVSignExtendExpr();
public:
- /// get method - This just gets and returns a new SCEVSignExtend object
- ///
- static SCEVHandle get(const SCEVHandle &Op, const Type *Ty);
-
const SCEVHandle &getOperand() const { return Op; }
virtual const Type *getType() const { return Ty; }
@@ -197,11 +191,12 @@
virtual ConstantRange getValueRange() const;
SCEVHandle replaceSymbolicValuesWithConcrete(const SCEVHandle &Sym,
- const SCEVHandle &Conc) const {
- SCEVHandle H = Op->replaceSymbolicValuesWithConcrete(Sym, Conc);
+ const SCEVHandle &Conc,
+ ScalarEvolution &SE) const {
+ SCEVHandle H = Op->replaceSymbolicValuesWithConcrete(Sym, Conc, SE);
if (H == Op)
return this;
- return get(H, Ty);
+ return SE.getSignExtendExpr(H, Ty);
}
virtual void print(std::ostream &OS) const;
@@ -220,6 +215,8 @@
/// operators.
///
class SCEVCommutativeExpr : public SCEV {
+ friend class ScalarEvolution;
+
std::vector<SCEVHandle> Operands;
protected:
@@ -264,7 +261,8 @@
}
SCEVHandle replaceSymbolicValuesWithConcrete(const SCEVHandle &Sym,
- const SCEVHandle &Conc) const;
+ const SCEVHandle &Conc,
+ ScalarEvolution &SE) const;
virtual const char *getOperationStr() const = 0;
@@ -285,29 +283,13 @@
/// SCEVAddExpr - This node represents an addition of some number of SCEVs.
///
class SCEVAddExpr : public SCEVCommutativeExpr {
+ friend class ScalarEvolution;
+
SCEVAddExpr(const std::vector<SCEVHandle> &ops)
: SCEVCommutativeExpr(scAddExpr, ops) {
}
public:
- static SCEVHandle get(std::vector<SCEVHandle> &Ops);
-
- static SCEVHandle get(const SCEVHandle &LHS, const SCEVHandle &RHS) {
- std::vector<SCEVHandle> Ops;
- Ops.push_back(LHS);
- Ops.push_back(RHS);
- return get(Ops);
- }
-
- static SCEVHandle get(const SCEVHandle &Op0, const SCEVHandle &Op1,
- const SCEVHandle &Op2) {
- std::vector<SCEVHandle> Ops;
- Ops.push_back(Op0);
- Ops.push_back(Op1);
- Ops.push_back(Op2);
- return get(Ops);
- }
-
virtual const char *getOperationStr() const { return " + "; }
/// Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -321,20 +303,13 @@
/// SCEVMulExpr - This node represents multiplication of some number of SCEVs.
///
class SCEVMulExpr : public SCEVCommutativeExpr {
+ friend class ScalarEvolution;
+
SCEVMulExpr(const std::vector<SCEVHandle> &ops)
: SCEVCommutativeExpr(scMulExpr, ops) {
}
public:
- static SCEVHandle get(std::vector<SCEVHandle> &Ops);
-
- static SCEVHandle get(const SCEVHandle &LHS, const SCEVHandle &RHS) {
- std::vector<SCEVHandle> Ops;
- Ops.push_back(LHS);
- Ops.push_back(RHS);
- return get(Ops);
- }
-
virtual const char *getOperationStr() const { return " * "; }
/// Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -349,16 +324,14 @@
/// SCEVSDivExpr - This class represents a binary signed division operation.
///
class SCEVSDivExpr : public SCEV {
+ friend class ScalarEvolution;
+
SCEVHandle LHS, RHS;
SCEVSDivExpr(const SCEVHandle &lhs, const SCEVHandle &rhs)
: SCEV(scSDivExpr), LHS(lhs), RHS(rhs) {}
virtual ~SCEVSDivExpr();
public:
- /// get method - This just gets and returns a new SCEVSDiv object.
- ///
- static SCEVHandle get(const SCEVHandle &LHS, const SCEVHandle &RHS);
-
const SCEVHandle &getLHS() const { return LHS; }
const SCEVHandle &getRHS() const { return RHS; }
@@ -372,13 +345,14 @@
}
SCEVHandle replaceSymbolicValuesWithConcrete(const SCEVHandle &Sym,
- const SCEVHandle &Conc) const {
- SCEVHandle L = LHS->replaceSymbolicValuesWithConcrete(Sym, Conc);
- SCEVHandle R = RHS->replaceSymbolicValuesWithConcrete(Sym, Conc);
+ const SCEVHandle &Conc,
+ ScalarEvolution &SE) const {
+ SCEVHandle L = LHS->replaceSymbolicValuesWithConcrete(Sym, Conc, SE);
+ SCEVHandle R = RHS->replaceSymbolicValuesWithConcrete(Sym, Conc, SE);
if (L == LHS && R == RHS)
return this;
else
- return get(L, R);
+ return SE.getSDivExpr(L, R);
}
@@ -402,6 +376,8 @@
/// All operands of an AddRec are required to be loop invariant.
///
class SCEVAddRecExpr : public SCEV {
+ friend class ScalarEvolution;
+
std::vector<SCEVHandle> Operands;
const Loop *L;
@@ -413,16 +389,6 @@
}
~SCEVAddRecExpr();
public:
- static SCEVHandle get(const SCEVHandle &Start, const SCEVHandle &Step,
- const Loop *);
- static SCEVHandle get(std::vector<SCEVHandle> &Operands,
- const Loop *);
- static SCEVHandle get(const std::vector<SCEVHandle> &Operands,
- const Loop *L) {
- std::vector<SCEVHandle> NewOp(Operands);
- return get(NewOp, L);
- }
-
typedef std::vector<SCEVHandle>::const_iterator op_iterator;
op_iterator op_begin() const { return Operands.begin(); }
op_iterator op_end() const { return Operands.end(); }
@@ -436,10 +402,10 @@
/// getStepRecurrence - This method constructs and returns the recurrence
/// indicating how much this expression steps by. If this is a polynomial
/// of degree N, it returns a chrec of degree N-1.
- SCEVHandle getStepRecurrence() const {
+ SCEVHandle getStepRecurrence(ScalarEvolution &SE) const {
if (getNumOperands() == 2) return getOperand(1);
- return SCEVAddRecExpr::get(std::vector<SCEVHandle>(op_begin()+1,op_end()),
- getLoop());
+ return SE.getAddRecExpr(std::vector<SCEVHandle>(op_begin()+1,op_end()),
+ getLoop());
}
virtual bool hasComputableLoopEvolution(const Loop *QL) const {
@@ -468,7 +434,7 @@
/// evaluateAtIteration - Return the value of this chain of recurrences at
/// the specified iteration number.
- SCEVHandle evaluateAtIteration(SCEVHandle It) const;
+ SCEVHandle evaluateAtIteration(SCEVHandle It, ScalarEvolution &SE) const;
/// getNumIterationsInRange - Return the number of iterations of this loop
/// that produce values in the specified constant range. Another way of
@@ -476,10 +442,12 @@
/// value is not in the condition, thus computing the exit count. If the
/// iteration count can't be computed, an instance of SCEVCouldNotCompute is
/// returned.
- SCEVHandle getNumIterationsInRange(ConstantRange Range) const;
+ SCEVHandle getNumIterationsInRange(ConstantRange Range,
+ ScalarEvolution &SE) const;
SCEVHandle replaceSymbolicValuesWithConcrete(const SCEVHandle &Sym,
- const SCEVHandle &Conc) const;
+ const SCEVHandle &Conc,
+ ScalarEvolution &SE) const;
virtual void print(std::ostream &OS) const;
void print(std::ostream *OS) const { if (OS) print(*OS); }
@@ -497,20 +465,14 @@
/// value for the analysis.
///
class SCEVUnknown : public SCEV {
+ friend class ScalarEvolution;
+
Value *V;
SCEVUnknown(Value *v) : SCEV(scUnknown), V(v) {}
protected:
~SCEVUnknown();
public:
- /// get method - For SCEVUnknown, this just gets and returns a new
- /// SCEVUnknown.
- static SCEVHandle get(Value *V);
-
- /// getIntegerSCEV - Given an integer or FP type, create a constant for the
- /// specified signed integer value and return a SCEV for the constant.
- static SCEVHandle getIntegerSCEV(int Val, const Type *Ty);
-
Value *getValue() const { return V; }
virtual bool isLoopInvariant(const Loop *L) const;
@@ -519,7 +481,8 @@
}
SCEVHandle replaceSymbolicValuesWithConcrete(const SCEVHandle &Sym,
- const SCEVHandle &Conc) const {
+ const SCEVHandle &Conc,
+ ScalarEvolution &SE) const {
if (&*Sym == this) return Conc;
return this;
}
Modified: llvm/trunk/lib/Analysis/ScalarEvolution.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ScalarEvolution.cpp?rev=43224&r1=43223&r2=43224&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/ScalarEvolution.cpp (original)
+++ llvm/trunk/lib/Analysis/ScalarEvolution.cpp Mon Oct 22 13:31:58 2007
@@ -154,7 +154,8 @@
SCEVHandle SCEVCouldNotCompute::
replaceSymbolicValuesWithConcrete(const SCEVHandle &Sym,
- const SCEVHandle &Conc) const {
+ const SCEVHandle &Conc,
+ ScalarEvolution &SE) const {
return this;
}
@@ -177,14 +178,14 @@
SCEVConstants->erase(V);
}
-SCEVHandle SCEVConstant::get(ConstantInt *V) {
+SCEVHandle ScalarEvolution::getConstant(ConstantInt *V) {
SCEVConstant *&R = (*SCEVConstants)[V];
if (R == 0) R = new SCEVConstant(V);
return R;
}
-SCEVHandle SCEVConstant::get(const APInt& Val) {
- return get(ConstantInt::get(Val));
+SCEVHandle ScalarEvolution::getConstant(const APInt& Val) {
+ return getConstant(ConstantInt::get(Val));
}
ConstantRange SCEVConstant::getValueRange() const {
@@ -298,9 +299,11 @@
SCEVHandle SCEVCommutativeExpr::
replaceSymbolicValuesWithConcrete(const SCEVHandle &Sym,
- const SCEVHandle &Conc) const {
+ const SCEVHandle &Conc,
+ ScalarEvolution &SE) const {
for (unsigned i = 0, e = getNumOperands(); i != e; ++i) {
- SCEVHandle H = getOperand(i)->replaceSymbolicValuesWithConcrete(Sym, Conc);
+ SCEVHandle H =
+ getOperand(i)->replaceSymbolicValuesWithConcrete(Sym, Conc, SE);
if (H != getOperand(i)) {
std::vector<SCEVHandle> NewOps;
NewOps.reserve(getNumOperands());
@@ -309,12 +312,12 @@
NewOps.push_back(H);
for (++i; i != e; ++i)
NewOps.push_back(getOperand(i)->
- replaceSymbolicValuesWithConcrete(Sym, Conc));
+ replaceSymbolicValuesWithConcrete(Sym, Conc, SE));
if (isa<SCEVAddExpr>(this))
- return SCEVAddExpr::get(NewOps);
+ return SE.getAddExpr(NewOps);
else if (isa<SCEVMulExpr>(this))
- return SCEVMulExpr::get(NewOps);
+ return SE.getMulExpr(NewOps);
else
assert(0 && "Unknown commutative expr!");
}
@@ -355,9 +358,11 @@
SCEVHandle SCEVAddRecExpr::
replaceSymbolicValuesWithConcrete(const SCEVHandle &Sym,
- const SCEVHandle &Conc) const {
+ const SCEVHandle &Conc,
+ ScalarEvolution &SE) const {
for (unsigned i = 0, e = getNumOperands(); i != e; ++i) {
- SCEVHandle H = getOperand(i)->replaceSymbolicValuesWithConcrete(Sym, Conc);
+ SCEVHandle H =
+ getOperand(i)->replaceSymbolicValuesWithConcrete(Sym, Conc, SE);
if (H != getOperand(i)) {
std::vector<SCEVHandle> NewOps;
NewOps.reserve(getNumOperands());
@@ -366,9 +371,9 @@
NewOps.push_back(H);
for (++i; i != e; ++i)
NewOps.push_back(getOperand(i)->
- replaceSymbolicValuesWithConcrete(Sym, Conc));
+ replaceSymbolicValuesWithConcrete(Sym, Conc, SE));
- return get(NewOps, L);
+ return SE.getAddRecExpr(NewOps, L);
}
}
return this;
@@ -480,7 +485,7 @@
/// getIntegerSCEV - Given an integer or FP type, create a constant for the
/// specified signed integer value and return a SCEV for the constant.
-SCEVHandle SCEVUnknown::getIntegerSCEV(int Val, const Type *Ty) {
+SCEVHandle ScalarEvolution::getIntegerSCEV(int Val, const Type *Ty) {
Constant *C;
if (Val == 0)
C = Constant::getNullValue(Ty);
@@ -489,42 +494,45 @@
APFloat::IEEEdouble, Val));
else
C = ConstantInt::get(Ty, Val);
- return SCEVUnknown::get(C);
+ return getUnknown(C);
}
/// getTruncateOrZeroExtend - Return a SCEV corresponding to a conversion of the
/// input value to the specified type. If the type must be extended, it is zero
/// extended.
-static SCEVHandle getTruncateOrZeroExtend(const SCEVHandle &V, const Type *Ty) {
+static SCEVHandle getTruncateOrZeroExtend(const SCEVHandle &V, const Type *Ty,
+ ScalarEvolution &SE) {
const Type *SrcTy = V->getType();
assert(SrcTy->isInteger() && Ty->isInteger() &&
"Cannot truncate or zero extend with non-integer arguments!");
if (SrcTy->getPrimitiveSizeInBits() == Ty->getPrimitiveSizeInBits())
return V; // No conversion
if (SrcTy->getPrimitiveSizeInBits() > Ty->getPrimitiveSizeInBits())
- return SCEVTruncateExpr::get(V, Ty);
- return SCEVZeroExtendExpr::get(V, Ty);
+ return SE.getTruncateExpr(V, Ty);
+ return SE.getZeroExtendExpr(V, Ty);
}
/// getNegativeSCEV - Return a SCEV corresponding to -V = -1*V
///
-SCEVHandle SCEV::getNegativeSCEV(const SCEVHandle &V) {
+SCEVHandle ScalarEvolution::getNegativeSCEV(const SCEVHandle &V) {
if (SCEVConstant *VC = dyn_cast<SCEVConstant>(V))
- return SCEVUnknown::get(ConstantExpr::getNeg(VC->getValue()));
+ return getUnknown(ConstantExpr::getNeg(VC->getValue()));
- return SCEVMulExpr::get(V, SCEVUnknown::getIntegerSCEV(-1, V->getType()));
+ return getMulExpr(V, getIntegerSCEV(-1, V->getType()));
}
/// getMinusSCEV - Return a SCEV corresponding to LHS - RHS.
///
-SCEVHandle SCEV::getMinusSCEV(const SCEVHandle &LHS, const SCEVHandle &RHS) {
+SCEVHandle ScalarEvolution::getMinusSCEV(const SCEVHandle &LHS,
+ const SCEVHandle &RHS) {
// X - Y --> X + -Y
- return SCEVAddExpr::get(LHS, SCEV::getNegativeSCEV(RHS));
+ return getAddExpr(LHS, getNegativeSCEV(RHS));
}
/// PartialFact - Compute V!/(V-NumSteps)!
-static SCEVHandle PartialFact(SCEVHandle V, unsigned NumSteps) {
+static SCEVHandle PartialFact(SCEVHandle V, unsigned NumSteps,
+ ScalarEvolution &SE) {
// Handle this case efficiently, it is common to have constant iteration
// counts while computing loop exit values.
if (SCEVConstant *SC = dyn_cast<SCEVConstant>(V)) {
@@ -532,17 +540,17 @@
APInt Result(Val.getBitWidth(), 1);
for (; NumSteps; --NumSteps)
Result *= Val-(NumSteps-1);
- return SCEVConstant::get(Result);
+ return SE.getConstant(Result);
}
const Type *Ty = V->getType();
if (NumSteps == 0)
- return SCEVUnknown::getIntegerSCEV(1, Ty);
+ return SE.getIntegerSCEV(1, Ty);
SCEVHandle Result = V;
for (unsigned i = 1; i != NumSteps; ++i)
- Result = SCEVMulExpr::get(Result, SCEV::getMinusSCEV(V,
- SCEVUnknown::getIntegerSCEV(i, Ty)));
+ Result = SE.getMulExpr(Result, SE.getMinusSCEV(V,
+ SE.getIntegerSCEV(i, Ty)));
return Result;
}
@@ -557,16 +565,17 @@
/// FIXME/VERIFY: I don't trust that this is correct in the face of overflow.
/// Is the binomial equation safe using modular arithmetic??
///
-SCEVHandle SCEVAddRecExpr::evaluateAtIteration(SCEVHandle It) const {
+SCEVHandle SCEVAddRecExpr::evaluateAtIteration(SCEVHandle It,
+ ScalarEvolution &SE) const {
SCEVHandle Result = getStart();
int Divisor = 1;
const Type *Ty = It->getType();
for (unsigned i = 1, e = getNumOperands(); i != e; ++i) {
- SCEVHandle BC = PartialFact(It, i);
+ SCEVHandle BC = PartialFact(It, i, SE);
Divisor *= i;
- SCEVHandle Val = SCEVSDivExpr::get(SCEVMulExpr::get(BC, getOperand(i)),
- SCEVUnknown::getIntegerSCEV(Divisor,Ty));
- Result = SCEVAddExpr::get(Result, Val);
+ SCEVHandle Val = SE.getSDivExpr(SE.getMulExpr(BC, getOperand(i)),
+ SE.getIntegerSCEV(Divisor,Ty));
+ Result = SE.getAddExpr(Result, Val);
}
return Result;
}
@@ -576,9 +585,9 @@
// SCEV Expression folder implementations
//===----------------------------------------------------------------------===//
-SCEVHandle SCEVTruncateExpr::get(const SCEVHandle &Op, const Type *Ty) {
+SCEVHandle ScalarEvolution::getTruncateExpr(const SCEVHandle &Op, const Type *Ty) {
if (SCEVConstant *SC = dyn_cast<SCEVConstant>(Op))
- return SCEVUnknown::get(
+ return getUnknown(
ConstantExpr::getTrunc(SC->getValue(), Ty));
// If the input value is a chrec scev made out of constants, truncate
@@ -588,11 +597,11 @@
for (unsigned i = 0, e = AddRec->getNumOperands(); i != e; ++i)
// FIXME: This should allow truncation of other expression types!
if (isa<SCEVConstant>(AddRec->getOperand(i)))
- Operands.push_back(get(AddRec->getOperand(i), Ty));
+ Operands.push_back(getTruncateExpr(AddRec->getOperand(i), Ty));
else
break;
if (Operands.size() == AddRec->getNumOperands())
- return SCEVAddRecExpr::get(Operands, AddRec->getLoop());
+ return getAddRecExpr(Operands, AddRec->getLoop());
}
SCEVTruncateExpr *&Result = (*SCEVTruncates)[std::make_pair(Op, Ty)];
@@ -600,9 +609,9 @@
return Result;
}
-SCEVHandle SCEVZeroExtendExpr::get(const SCEVHandle &Op, const Type *Ty) {
+SCEVHandle ScalarEvolution::getZeroExtendExpr(const SCEVHandle &Op, const Type *Ty) {
if (SCEVConstant *SC = dyn_cast<SCEVConstant>(Op))
- return SCEVUnknown::get(
+ return getUnknown(
ConstantExpr::getZExt(SC->getValue(), Ty));
// FIXME: If the input value is a chrec scev, and we can prove that the value
@@ -615,9 +624,9 @@
return Result;
}
-SCEVHandle SCEVSignExtendExpr::get(const SCEVHandle &Op, const Type *Ty) {
+SCEVHandle ScalarEvolution::getSignExtendExpr(const SCEVHandle &Op, const Type *Ty) {
if (SCEVConstant *SC = dyn_cast<SCEVConstant>(Op))
- return SCEVUnknown::get(
+ return getUnknown(
ConstantExpr::getSExt(SC->getValue(), Ty));
// FIXME: If the input value is a chrec scev, and we can prove that the value
@@ -631,7 +640,7 @@
}
// get - Get a canonical add expression, or something simpler if possible.
-SCEVHandle SCEVAddExpr::get(std::vector<SCEVHandle> &Ops) {
+SCEVHandle ScalarEvolution::getAddExpr(std::vector<SCEVHandle> &Ops) {
assert(!Ops.empty() && "Cannot get empty add!");
if (Ops.size() == 1) return Ops[0];
@@ -648,7 +657,7 @@
Constant *Fold = ConstantInt::get(LHSC->getValue()->getValue() +
RHSC->getValue()->getValue());
if (ConstantInt *CI = dyn_cast<ConstantInt>(Fold)) {
- Ops[0] = SCEVConstant::get(CI);
+ Ops[0] = getConstant(CI);
Ops.erase(Ops.begin()+1); // Erase the folded element
if (Ops.size() == 1) return Ops[0];
LHSC = cast<SCEVConstant>(Ops[0]);
@@ -677,13 +686,13 @@
if (Ops[i] == Ops[i+1]) { // X + Y + Y --> X + Y*2
// Found a match, merge the two values into a multiply, and add any
// remaining values to the result.
- SCEVHandle Two = SCEVUnknown::getIntegerSCEV(2, Ty);
- SCEVHandle Mul = SCEVMulExpr::get(Ops[i], Two);
+ SCEVHandle Two = getIntegerSCEV(2, Ty);
+ SCEVHandle Mul = getMulExpr(Ops[i], Two);
if (Ops.size() == 2)
return Mul;
Ops.erase(Ops.begin()+i, Ops.begin()+i+2);
Ops.push_back(Mul);
- return SCEVAddExpr::get(Ops);
+ return getAddExpr(Ops);
}
// Now we know the first non-constant operand. Skip past any cast SCEVs.
@@ -705,7 +714,7 @@
// and they are not necessarily sorted. Recurse to resort and resimplify
// any operands we just aquired.
if (DeletedAdd)
- return get(Ops);
+ return getAddExpr(Ops);
}
// Skip over the add expression until we get to a multiply.
@@ -728,11 +737,11 @@
// Y*Z term.
std::vector<SCEVHandle> MulOps(Mul->op_begin(), Mul->op_end());
MulOps.erase(MulOps.begin()+MulOp);
- InnerMul = SCEVMulExpr::get(MulOps);
+ InnerMul = getMulExpr(MulOps);
}
- SCEVHandle One = SCEVUnknown::getIntegerSCEV(1, Ty);
- SCEVHandle AddOne = SCEVAddExpr::get(InnerMul, One);
- SCEVHandle OuterMul = SCEVMulExpr::get(AddOne, Ops[AddOp]);
+ SCEVHandle One = getIntegerSCEV(1, Ty);
+ SCEVHandle AddOne = getAddExpr(InnerMul, One);
+ SCEVHandle OuterMul = getMulExpr(AddOne, Ops[AddOp]);
if (Ops.size() == 2) return OuterMul;
if (AddOp < Idx) {
Ops.erase(Ops.begin()+AddOp);
@@ -742,7 +751,7 @@
Ops.erase(Ops.begin()+AddOp-1);
}
Ops.push_back(OuterMul);
- return SCEVAddExpr::get(Ops);
+ return getAddExpr(Ops);
}
// Check this multiply against other multiplies being added together.
@@ -760,22 +769,22 @@
if (Mul->getNumOperands() != 2) {
std::vector<SCEVHandle> MulOps(Mul->op_begin(), Mul->op_end());
MulOps.erase(MulOps.begin()+MulOp);
- InnerMul1 = SCEVMulExpr::get(MulOps);
+ InnerMul1 = getMulExpr(MulOps);
}
SCEVHandle InnerMul2 = OtherMul->getOperand(OMulOp == 0);
if (OtherMul->getNumOperands() != 2) {
std::vector<SCEVHandle> MulOps(OtherMul->op_begin(),
OtherMul->op_end());
MulOps.erase(MulOps.begin()+OMulOp);
- InnerMul2 = SCEVMulExpr::get(MulOps);
+ InnerMul2 = getMulExpr(MulOps);
}
- SCEVHandle InnerMulSum = SCEVAddExpr::get(InnerMul1,InnerMul2);
- SCEVHandle OuterMul = SCEVMulExpr::get(MulOpSCEV, InnerMulSum);
+ SCEVHandle InnerMulSum = getAddExpr(InnerMul1,InnerMul2);
+ SCEVHandle OuterMul = getMulExpr(MulOpSCEV, InnerMulSum);
if (Ops.size() == 2) return OuterMul;
Ops.erase(Ops.begin()+Idx);
Ops.erase(Ops.begin()+OtherMulIdx-1);
Ops.push_back(OuterMul);
- return SCEVAddExpr::get(Ops);
+ return getAddExpr(Ops);
}
}
}
@@ -806,9 +815,9 @@
LIOps.push_back(AddRec->getStart());
std::vector<SCEVHandle> AddRecOps(AddRec->op_begin(), AddRec->op_end());
- AddRecOps[0] = SCEVAddExpr::get(LIOps);
+ AddRecOps[0] = getAddExpr(LIOps);
- SCEVHandle NewRec = SCEVAddRecExpr::get(AddRecOps, AddRec->getLoop());
+ SCEVHandle NewRec = getAddRecExpr(AddRecOps, AddRec->getLoop());
// If all of the other operands were loop invariant, we are done.
if (Ops.size() == 1) return NewRec;
@@ -818,7 +827,7 @@
Ops[i] = NewRec;
break;
}
- return SCEVAddExpr::get(Ops);
+ return getAddExpr(Ops);
}
// Okay, if there weren't any loop invariants to be folded, check to see if
@@ -837,16 +846,16 @@
OtherAddRec->op_end());
break;
}
- NewOps[i] = SCEVAddExpr::get(NewOps[i], OtherAddRec->getOperand(i));
+ NewOps[i] = getAddExpr(NewOps[i], OtherAddRec->getOperand(i));
}
- SCEVHandle NewAddRec = SCEVAddRecExpr::get(NewOps, AddRec->getLoop());
+ SCEVHandle NewAddRec = getAddRecExpr(NewOps, AddRec->getLoop());
if (Ops.size() == 2) return NewAddRec;
Ops.erase(Ops.begin()+Idx);
Ops.erase(Ops.begin()+OtherIdx-1);
Ops.push_back(NewAddRec);
- return SCEVAddExpr::get(Ops);
+ return getAddExpr(Ops);
}
}
@@ -864,7 +873,7 @@
}
-SCEVHandle SCEVMulExpr::get(std::vector<SCEVHandle> &Ops) {
+SCEVHandle ScalarEvolution::getMulExpr(std::vector<SCEVHandle> &Ops) {
assert(!Ops.empty() && "Cannot get empty mul!");
// Sort by complexity, this groups all similar expression types together.
@@ -879,8 +888,8 @@
if (SCEVAddExpr *Add = dyn_cast<SCEVAddExpr>(Ops[1]))
if (Add->getNumOperands() == 2 &&
isa<SCEVConstant>(Add->getOperand(0)))
- return SCEVAddExpr::get(SCEVMulExpr::get(LHSC, Add->getOperand(0)),
- SCEVMulExpr::get(LHSC, Add->getOperand(1)));
+ return getAddExpr(getMulExpr(LHSC, Add->getOperand(0)),
+ getMulExpr(LHSC, Add->getOperand(1)));
++Idx;
@@ -889,7 +898,7 @@
Constant *Fold = ConstantInt::get(LHSC->getValue()->getValue() *
RHSC->getValue()->getValue());
if (ConstantInt *CI = dyn_cast<ConstantInt>(Fold)) {
- Ops[0] = SCEVConstant::get(CI);
+ Ops[0] = getConstant(CI);
Ops.erase(Ops.begin()+1); // Erase the folded element
if (Ops.size() == 1) return Ops[0];
LHSC = cast<SCEVConstant>(Ops[0]);
@@ -933,7 +942,7 @@
// and they are not necessarily sorted. Recurse to resort and resimplify
// any operands we just aquired.
if (DeletedMul)
- return get(Ops);
+ return getMulExpr(Ops);
}
// If there are any add recurrences in the operands list, see if any other
@@ -963,16 +972,16 @@
if (LIOps.size() == 1) {
SCEV *Scale = LIOps[0];
for (unsigned i = 0, e = AddRec->getNumOperands(); i != e; ++i)
- NewOps.push_back(SCEVMulExpr::get(Scale, AddRec->getOperand(i)));
+ NewOps.push_back(getMulExpr(Scale, AddRec->getOperand(i)));
} else {
for (unsigned i = 0, e = AddRec->getNumOperands(); i != e; ++i) {
std::vector<SCEVHandle> MulOps(LIOps);
MulOps.push_back(AddRec->getOperand(i));
- NewOps.push_back(SCEVMulExpr::get(MulOps));
+ NewOps.push_back(getMulExpr(MulOps));
}
}
- SCEVHandle NewRec = SCEVAddRecExpr::get(NewOps, AddRec->getLoop());
+ SCEVHandle NewRec = getAddRecExpr(NewOps, AddRec->getLoop());
// If all of the other operands were loop invariant, we are done.
if (Ops.size() == 1) return NewRec;
@@ -983,7 +992,7 @@
Ops[i] = NewRec;
break;
}
- return SCEVMulExpr::get(Ops);
+ return getMulExpr(Ops);
}
// Okay, if there weren't any loop invariants to be folded, check to see if
@@ -996,21 +1005,21 @@
if (AddRec->getLoop() == OtherAddRec->getLoop()) {
// F * G --> {A,+,B} * {C,+,D} --> {A*C,+,F*D + G*B + B*D}
SCEVAddRecExpr *F = AddRec, *G = OtherAddRec;
- SCEVHandle NewStart = SCEVMulExpr::get(F->getStart(),
+ SCEVHandle NewStart = getMulExpr(F->getStart(),
G->getStart());
- SCEVHandle B = F->getStepRecurrence();
- SCEVHandle D = G->getStepRecurrence();
- SCEVHandle NewStep = SCEVAddExpr::get(SCEVMulExpr::get(F, D),
- SCEVMulExpr::get(G, B),
- SCEVMulExpr::get(B, D));
- SCEVHandle NewAddRec = SCEVAddRecExpr::get(NewStart, NewStep,
- F->getLoop());
+ SCEVHandle B = F->getStepRecurrence(*this);
+ SCEVHandle D = G->getStepRecurrence(*this);
+ SCEVHandle NewStep = getAddExpr(getMulExpr(F, D),
+ getMulExpr(G, B),
+ getMulExpr(B, D));
+ SCEVHandle NewAddRec = getAddRecExpr(NewStart, NewStep,
+ F->getLoop());
if (Ops.size() == 2) return NewAddRec;
Ops.erase(Ops.begin()+Idx);
Ops.erase(Ops.begin()+OtherIdx-1);
Ops.push_back(NewAddRec);
- return SCEVMulExpr::get(Ops);
+ return getMulExpr(Ops);
}
}
@@ -1028,17 +1037,17 @@
return Result;
}
-SCEVHandle SCEVSDivExpr::get(const SCEVHandle &LHS, const SCEVHandle &RHS) {
+SCEVHandle ScalarEvolution::getSDivExpr(const SCEVHandle &LHS, const SCEVHandle &RHS) {
if (SCEVConstant *RHSC = dyn_cast<SCEVConstant>(RHS)) {
if (RHSC->getValue()->equalsInt(1))
return LHS; // X sdiv 1 --> x
if (RHSC->getValue()->isAllOnesValue())
- return SCEV::getNegativeSCEV(LHS); // X sdiv -1 --> -x
+ return getNegativeSCEV(LHS); // X sdiv -1 --> -x
if (SCEVConstant *LHSC = dyn_cast<SCEVConstant>(LHS)) {
Constant *LHSCV = LHSC->getValue();
Constant *RHSCV = RHSC->getValue();
- return SCEVUnknown::get(ConstantExpr::getSDiv(LHSCV, RHSCV));
+ return getUnknown(ConstantExpr::getSDiv(LHSCV, RHSCV));
}
}
@@ -1052,7 +1061,7 @@
/// SCEVAddRecExpr::get - Get a add recurrence expression for the
/// specified loop. Simplify the expression as much as possible.
-SCEVHandle SCEVAddRecExpr::get(const SCEVHandle &Start,
+SCEVHandle ScalarEvolution::getAddRecExpr(const SCEVHandle &Start,
const SCEVHandle &Step, const Loop *L) {
std::vector<SCEVHandle> Operands;
Operands.push_back(Start);
@@ -1060,23 +1069,23 @@
if (StepChrec->getLoop() == L) {
Operands.insert(Operands.end(), StepChrec->op_begin(),
StepChrec->op_end());
- return get(Operands, L);
+ return getAddRecExpr(Operands, L);
}
Operands.push_back(Step);
- return get(Operands, L);
+ return getAddRecExpr(Operands, L);
}
/// SCEVAddRecExpr::get - Get a add recurrence expression for the
/// specified loop. Simplify the expression as much as possible.
-SCEVHandle SCEVAddRecExpr::get(std::vector<SCEVHandle> &Operands,
+SCEVHandle ScalarEvolution::getAddRecExpr(std::vector<SCEVHandle> &Operands,
const Loop *L) {
if (Operands.size() == 1) return Operands[0];
if (SCEVConstant *StepC = dyn_cast<SCEVConstant>(Operands.back()))
if (StepC->getValue()->isZero()) {
Operands.pop_back();
- return get(Operands, L); // { X,+,0 } --> X
+ return getAddRecExpr(Operands, L); // { X,+,0 } --> X
}
SCEVAddRecExpr *&Result =
@@ -1086,9 +1095,9 @@
return Result;
}
-SCEVHandle SCEVUnknown::get(Value *V) {
+SCEVHandle ScalarEvolution::getUnknown(Value *V) {
if (ConstantInt *CI = dyn_cast<ConstantInt>(V))
- return SCEVConstant::get(CI);
+ return getConstant(CI);
SCEVUnknown *&Result = (*SCEVUnknowns)[V];
if (Result == 0) Result = new SCEVUnknown(V);
return Result;
@@ -1104,6 +1113,9 @@
///
namespace {
struct VISIBILITY_HIDDEN ScalarEvolutionsImpl {
+ /// SE - A reference to the public ScalarEvolution object.
+ ScalarEvolution &SE;
+
/// F - The function we are analyzing.
///
Function &F;
@@ -1132,8 +1144,8 @@
std::map<PHINode*, Constant*> ConstantEvolutionLoopExitValue;
public:
- ScalarEvolutionsImpl(Function &f, LoopInfo &li)
- : F(f), LI(li), UnknownValue(new SCEVCouldNotCompute()) {}
+ ScalarEvolutionsImpl(ScalarEvolution &se, Function &f, LoopInfo &li)
+ : SE(se), F(f), LI(li), UnknownValue(new SCEVCouldNotCompute()) {}
/// getSCEV - Return an existing SCEV if it exists, otherwise analyze the
/// expression and create a new one.
@@ -1289,7 +1301,7 @@
if (SI == Scalars.end()) return;
SCEVHandle NV =
- SI->second->replaceSymbolicValuesWithConcrete(SymName, NewVal);
+ SI->second->replaceSymbolicValuesWithConcrete(SymName, NewVal, SE);
if (NV == SI->second) return; // No change.
SI->second = NV; // Update the scalars map!
@@ -1314,7 +1326,7 @@
unsigned BackEdge = IncomingEdge^1;
// While we are analyzing this PHI node, handle its value symbolically.
- SCEVHandle SymbolicName = SCEVUnknown::get(PN);
+ SCEVHandle SymbolicName = SE.getUnknown(PN);
assert(Scalars.find(PN) == Scalars.end() &&
"PHI node already processed?");
Scalars.insert(std::make_pair(PN, SymbolicName));
@@ -1345,7 +1357,7 @@
for (unsigned i = 0, e = Add->getNumOperands(); i != e; ++i)
if (i != FoundIndex)
Ops.push_back(Add->getOperand(i));
- SCEVHandle Accum = SCEVAddExpr::get(Ops);
+ SCEVHandle Accum = SE.getAddExpr(Ops);
// This is not a valid addrec if the step amount is varying each
// loop iteration, but is not itself an addrec in this loop.
@@ -1353,7 +1365,7 @@
(isa<SCEVAddRecExpr>(Accum) &&
cast<SCEVAddRecExpr>(Accum)->getLoop() == L)) {
SCEVHandle StartVal = getSCEV(PN->getIncomingValue(IncomingEdge));
- SCEVHandle PHISCEV = SCEVAddRecExpr::get(StartVal, Accum, L);
+ SCEVHandle PHISCEV = SE.getAddRecExpr(StartVal, Accum, L);
// Okay, for the entire analysis of this edge we assumed the PHI
// to be symbolic. We now need to go back and update all of the
@@ -1375,10 +1387,10 @@
// If StartVal = j.start - j.stride, we can use StartVal as the
// initial step of the addrec evolution.
- if (StartVal == SCEV::getMinusSCEV(AddRec->getOperand(0),
- AddRec->getOperand(1))) {
+ if (StartVal == SE.getMinusSCEV(AddRec->getOperand(0),
+ AddRec->getOperand(1))) {
SCEVHandle PHISCEV =
- SCEVAddRecExpr::get(StartVal, AddRec->getOperand(1), L);
+ SE.getAddRecExpr(StartVal, AddRec->getOperand(1), L);
// Okay, for the entire analysis of this edge we assumed the PHI
// to be symbolic. We now need to go back and update all of the
@@ -1395,7 +1407,7 @@
}
// If it's not a loop phi, we can't handle it yet.
- return SCEVUnknown::get(PN);
+ return SE.getUnknown(PN);
}
/// GetConstantFactor - Determine the largest constant factor that S has. For
@@ -1464,19 +1476,19 @@
if (Instruction *I = dyn_cast<Instruction>(V)) {
switch (I->getOpcode()) {
case Instruction::Add:
- return SCEVAddExpr::get(getSCEV(I->getOperand(0)),
- getSCEV(I->getOperand(1)));
+ return SE.getAddExpr(getSCEV(I->getOperand(0)),
+ getSCEV(I->getOperand(1)));
case Instruction::Mul:
- return SCEVMulExpr::get(getSCEV(I->getOperand(0)),
- getSCEV(I->getOperand(1)));
+ return SE.getMulExpr(getSCEV(I->getOperand(0)),
+ getSCEV(I->getOperand(1)));
case Instruction::SDiv:
- return SCEVSDivExpr::get(getSCEV(I->getOperand(0)),
- getSCEV(I->getOperand(1)));
+ return SE.getSDivExpr(getSCEV(I->getOperand(0)),
+ getSCEV(I->getOperand(1)));
break;
case Instruction::Sub:
- return SCEV::getMinusSCEV(getSCEV(I->getOperand(0)),
- getSCEV(I->getOperand(1)));
+ return SE.getMinusSCEV(getSCEV(I->getOperand(0)),
+ getSCEV(I->getOperand(1)));
case Instruction::Or:
// If the RHS of the Or is a constant, we may have something like:
// X*4+1 which got turned into X*4|1. Handle this as an add so loop
@@ -1488,8 +1500,8 @@
"Common factor should at least be 1!");
if (CommonFact.ugt(CI->getValue())) {
// If the LHS is a multiple that is larger than the RHS, use +.
- return SCEVAddExpr::get(LHS,
- getSCEV(I->getOperand(1)));
+ return SE.getAddExpr(LHS,
+ getSCEV(I->getOperand(1)));
}
}
break;
@@ -1498,8 +1510,8 @@
// Instcombine turns add of signbit into xor as a strength reduction step.
if (ConstantInt *CI = dyn_cast<ConstantInt>(I->getOperand(1))) {
if (CI->getValue().isSignBit())
- return SCEVAddExpr::get(getSCEV(I->getOperand(0)),
- getSCEV(I->getOperand(1)));
+ return SE.getAddExpr(getSCEV(I->getOperand(0)),
+ getSCEV(I->getOperand(1)));
}
break;
@@ -1509,18 +1521,18 @@
uint32_t BitWidth = cast<IntegerType>(V->getType())->getBitWidth();
Constant *X = ConstantInt::get(
APInt(BitWidth, 1).shl(SA->getLimitedValue(BitWidth)));
- return SCEVMulExpr::get(getSCEV(I->getOperand(0)), getSCEV(X));
+ return SE.getMulExpr(getSCEV(I->getOperand(0)), getSCEV(X));
}
break;
case Instruction::Trunc:
- return SCEVTruncateExpr::get(getSCEV(I->getOperand(0)), I->getType());
+ return SE.getTruncateExpr(getSCEV(I->getOperand(0)), I->getType());
case Instruction::ZExt:
- return SCEVZeroExtendExpr::get(getSCEV(I->getOperand(0)), I->getType());
+ return SE.getZeroExtendExpr(getSCEV(I->getOperand(0)), I->getType());
case Instruction::SExt:
- return SCEVSignExtendExpr::get(getSCEV(I->getOperand(0)), I->getType());
+ return SE.getSignExtendExpr(getSCEV(I->getOperand(0)), I->getType());
case Instruction::BitCast:
// BitCasts are no-op casts so we just eliminate the cast.
@@ -1537,7 +1549,7 @@
}
}
- return SCEVUnknown::get(V);
+ return SE.getUnknown(V);
}
@@ -1673,7 +1685,7 @@
ConstantRange CompRange(
ICmpInst::makeConstantRange(Cond, CompVal->getValue()));
- SCEVHandle Ret = AddRec->getNumIterationsInRange(CompRange);
+ SCEVHandle Ret = AddRec->getNumIterationsInRange(CompRange, SE);
if (!isa<SCEVCouldNotCompute>(Ret)) return Ret;
}
}
@@ -1681,13 +1693,13 @@
switch (Cond) {
case ICmpInst::ICMP_NE: { // while (X != Y)
// Convert to: while (X-Y != 0)
- SCEVHandle TC = HowFarToZero(SCEV::getMinusSCEV(LHS, RHS), L);
+ SCEVHandle TC = HowFarToZero(SE.getMinusSCEV(LHS, RHS), L);
if (!isa<SCEVCouldNotCompute>(TC)) return TC;
break;
}
case ICmpInst::ICMP_EQ: {
// Convert to: while (X-Y == 0) // while (X == Y)
- SCEVHandle TC = HowFarToNonZero(SCEV::getMinusSCEV(LHS, RHS), L);
+ SCEVHandle TC = HowFarToNonZero(SE.getMinusSCEV(LHS, RHS), L);
if (!isa<SCEVCouldNotCompute>(TC)) return TC;
break;
}
@@ -1697,8 +1709,8 @@
break;
}
case ICmpInst::ICMP_SGT: {
- SCEVHandle TC = HowManyLessThans(SCEV::getNegativeSCEV(LHS),
- SCEV::getNegativeSCEV(RHS), L, true);
+ SCEVHandle TC = HowManyLessThans(SE.getNegativeSCEV(LHS),
+ SE.getNegativeSCEV(RHS), L, true);
if (!isa<SCEVCouldNotCompute>(TC)) return TC;
break;
}
@@ -1708,8 +1720,8 @@
break;
}
case ICmpInst::ICMP_UGT: {
- SCEVHandle TC = HowManyLessThans(SCEV::getNegativeSCEV(LHS),
- SCEV::getNegativeSCEV(RHS), L, false);
+ SCEVHandle TC = HowManyLessThans(SE.getNegativeSCEV(LHS),
+ SE.getNegativeSCEV(RHS), L, false);
if (!isa<SCEVCouldNotCompute>(TC)) return TC;
break;
}
@@ -1729,9 +1741,10 @@
}
static ConstantInt *
-EvaluateConstantChrecAtConstant(const SCEVAddRecExpr *AddRec, ConstantInt *C) {
- SCEVHandle InVal = SCEVConstant::get(C);
- SCEVHandle Val = AddRec->evaluateAtIteration(InVal);
+EvaluateConstantChrecAtConstant(const SCEVAddRecExpr *AddRec, ConstantInt *C,
+ ScalarEvolution &SE) {
+ SCEVHandle InVal = SE.getConstant(C);
+ SCEVHandle Val = AddRec->evaluateAtIteration(InVal, SE);
assert(isa<SCEVConstant>(Val) &&
"Evaluation of SCEV at constant didn't fold correctly?");
return cast<SCEVConstant>(Val)->getValue();
@@ -1823,7 +1836,7 @@
for (unsigned IterationNum = 0; IterationNum != MaxSteps; ++IterationNum) {
ConstantInt *ItCst =
ConstantInt::get(IdxExpr->getType(), IterationNum);
- ConstantInt *Val = EvaluateConstantChrecAtConstant(IdxExpr, ItCst);
+ ConstantInt *Val = EvaluateConstantChrecAtConstant(IdxExpr, ItCst, SE);
// Form the GEP offset.
Indexes[VarIdxNum] = Val;
@@ -1841,7 +1854,7 @@
<< "***\n";
#endif
++NumArrayLenItCounts;
- return SCEVConstant::get(ItCst); // Found terminating iteration!
+ return SE.getConstant(ItCst); // Found terminating iteration!
}
}
return UnknownValue;
@@ -2012,7 +2025,7 @@
if (CondVal->getValue() == uint64_t(ExitWhen)) {
ConstantEvolutionLoopExitValue[PN] = PHIVal;
++NumBruteForceTripCountsComputed;
- return SCEVConstant::get(ConstantInt::get(Type::Int32Ty, IterationNum));
+ return SE.getConstant(ConstantInt::get(Type::Int32Ty, IterationNum));
}
// Compute the value of the PHI node for the next iteration.
@@ -2053,7 +2066,7 @@
Constant *RV = getConstantEvolutionLoopExitValue(PN,
ICC->getValue()->getValue(),
LI);
- if (RV) return SCEVUnknown::get(RV);
+ if (RV) return SE.getUnknown(RV);
}
}
@@ -2087,7 +2100,7 @@
}
}
Constant *C =ConstantFoldInstOperands(I, &Operands[0], Operands.size());
- return SCEVUnknown::get(C);
+ return SE.getUnknown(C);
}
}
@@ -2113,9 +2126,9 @@
NewOps.push_back(OpAtScope);
}
if (isa<SCEVAddExpr>(Comm))
- return SCEVAddExpr::get(NewOps);
+ return SE.getAddExpr(NewOps);
assert(isa<SCEVMulExpr>(Comm) && "Only know about add and mul!");
- return SCEVMulExpr::get(NewOps);
+ return SE.getMulExpr(NewOps);
}
}
// If we got here, all operands are loop invariant.
@@ -2129,7 +2142,7 @@
if (RHS == UnknownValue) return RHS;
if (LHS == Div->getLHS() && RHS == Div->getRHS())
return Div; // must be loop invariant
- return SCEVSDivExpr::get(LHS, RHS);
+ return SE.getSDivExpr(LHS, RHS);
}
// If this is a loop recurrence for a loop that does not contain L, then we
@@ -2141,17 +2154,17 @@
SCEVHandle IterationCount = getIterationCount(AddRec->getLoop());
if (IterationCount == UnknownValue) return UnknownValue;
IterationCount = getTruncateOrZeroExtend(IterationCount,
- AddRec->getType());
+ AddRec->getType(), SE);
// If the value is affine, simplify the expression evaluation to just
// Start + Step*IterationCount.
if (AddRec->isAffine())
- return SCEVAddExpr::get(AddRec->getStart(),
- SCEVMulExpr::get(IterationCount,
- AddRec->getOperand(1)));
+ return SE.getAddExpr(AddRec->getStart(),
+ SE.getMulExpr(IterationCount,
+ AddRec->getOperand(1)));
// Otherwise, evaluate it the hard way.
- return AddRec->evaluateAtIteration(IterationCount);
+ return AddRec->evaluateAtIteration(IterationCount, SE);
}
return UnknownValue;
}
@@ -2166,7 +2179,7 @@
/// might be the same) or two SCEVCouldNotCompute objects.
///
static std::pair<SCEVHandle,SCEVHandle>
-SolveQuadraticEquation(const SCEVAddRecExpr *AddRec) {
+SolveQuadraticEquation(const SCEVAddRecExpr *AddRec, ScalarEvolution &SE) {
assert(AddRec->getNumOperands() == 3 && "This is not a quadratic chrec!");
SCEVConstant *LC = dyn_cast<SCEVConstant>(AddRec->getOperand(0));
SCEVConstant *MC = dyn_cast<SCEVConstant>(AddRec->getOperand(1));
@@ -2212,8 +2225,8 @@
ConstantInt *Solution1 = ConstantInt::get((NegB + SqrtVal).sdiv(TwoA));
ConstantInt *Solution2 = ConstantInt::get((NegB - SqrtVal).sdiv(TwoA));
- return std::make_pair(SCEVConstant::get(Solution1),
- SCEVConstant::get(Solution2));
+ return std::make_pair(SE.getConstant(Solution1),
+ SE.getConstant(Solution2));
} // end APIntOps namespace
}
@@ -2248,7 +2261,7 @@
// FIXME: We should add DivExpr and RemExpr operations to our AST.
if (SCEVConstant *StepC = dyn_cast<SCEVConstant>(Step)) {
if (StepC->getValue()->equalsInt(1)) // N % 1 == 0
- return SCEV::getNegativeSCEV(Start); // 0 - Start/1 == -Start
+ return SE.getNegativeSCEV(Start); // 0 - Start/1 == -Start
if (StepC->getValue()->isAllOnesValue()) // N % -1 == 0
return Start; // 0 - Start/-1 == Start
@@ -2259,14 +2272,14 @@
Constant *Rem = ConstantExpr::getSRem(StartNegC, StepC->getValue());
if (Rem->isNullValue()) {
Constant *Result =ConstantExpr::getSDiv(StartNegC,StepC->getValue());
- return SCEVUnknown::get(Result);
+ return SE.getUnknown(Result);
}
}
}
} else if (AddRec->isQuadratic() && AddRec->getType()->isInteger()) {
// If this is a quadratic (3-term) AddRec {L,+,M,+,N}, find the roots of
// the quadratic equation to solve it.
- std::pair<SCEVHandle,SCEVHandle> Roots = SolveQuadraticEquation(AddRec);
+ std::pair<SCEVHandle,SCEVHandle> Roots = SolveQuadraticEquation(AddRec, SE);
SCEVConstant *R1 = dyn_cast<SCEVConstant>(Roots.first);
SCEVConstant *R2 = dyn_cast<SCEVConstant>(Roots.second);
if (R1) {
@@ -2284,7 +2297,7 @@
// We can only use this value if the chrec ends up with an exact zero
// value at this index. When solving for "X*X != 5", for example, we
// should not accept a root of 2.
- SCEVHandle Val = AddRec->evaluateAtIteration(R1);
+ SCEVHandle Val = AddRec->evaluateAtIteration(R1, SE);
if (SCEVConstant *EvalVal = dyn_cast<SCEVConstant>(Val))
if (EvalVal->getValue()->isZero())
return R1; // We found a quadratic root!
@@ -2333,16 +2346,17 @@
if (AddRec->isAffine()) {
// FORNOW: We only support unit strides.
- SCEVHandle One = SCEVUnknown::getIntegerSCEV(1, RHS->getType());
+ SCEVHandle Zero = SE.getIntegerSCEV(0, RHS->getType());
+ SCEVHandle One = SE.getIntegerSCEV(1, RHS->getType());
if (AddRec->getOperand(1) != One)
return UnknownValue;
- // The number of iterations for "[n,+,1] < m", is m-n. However, we don't
+ // The number of iterations for "{n,+,1} < m", is m-n. However, we don't
// know that m is >= n on input to the loop. If it is, the condition return
// true zero times. What we really should return, for full generality, is
// SMAX(0, m-n). Since we cannot check this, we will instead check for a
// canonical loop form: most do-loops will have a check that dominates the
- // loop, that only enters the loop if [n-1]<m. If we can find this check,
+ // loop, that only enters the loop if (n-1)<m. If we can find this check,
// we know that the SMAX will evaluate to m-n, because we know that m >= n.
// Search for the check.
@@ -2403,15 +2417,15 @@
if (RHS != getSCEV(PreCondRHS))
return UnknownValue; // Not a comparison against 'm'.
- if (SCEV::getMinusSCEV(AddRec->getOperand(0), One)
+ if (SE.getMinusSCEV(AddRec->getOperand(0), One)
!= getSCEV(PreCondLHS))
return UnknownValue; // Not a comparison against 'n-1'.
}
else return UnknownValue;
// cerr << "Computed Loop Trip Count as: "
- // << // *SCEV::getMinusSCEV(RHS, AddRec->getOperand(0)) << "\n";
- return SCEV::getMinusSCEV(RHS, AddRec->getOperand(0));
+ // << // *SE.getMinusSCEV(RHS, AddRec->getOperand(0)) << "\n";
+ return SE.getMinusSCEV(RHS, AddRec->getOperand(0));
}
else
return UnknownValue;
@@ -2425,7 +2439,8 @@
/// this is that it returns the first iteration number where the value is not in
/// the condition, thus computing the exit count. If the iteration count can't
/// be computed, an instance of SCEVCouldNotCompute is returned.
-SCEVHandle SCEVAddRecExpr::getNumIterationsInRange(ConstantRange Range) const {
+SCEVHandle SCEVAddRecExpr::getNumIterationsInRange(ConstantRange Range,
+ ScalarEvolution &SE) const {
if (Range.isFullSet()) // Infinite loop.
return new SCEVCouldNotCompute();
@@ -2433,11 +2448,11 @@
if (SCEVConstant *SC = dyn_cast<SCEVConstant>(getStart()))
if (!SC->getValue()->isZero()) {
std::vector<SCEVHandle> Operands(op_begin(), op_end());
- Operands[0] = SCEVUnknown::getIntegerSCEV(0, SC->getType());
- SCEVHandle Shifted = SCEVAddRecExpr::get(Operands, getLoop());
+ Operands[0] = SE.getIntegerSCEV(0, SC->getType());
+ SCEVHandle Shifted = SE.getAddRecExpr(Operands, getLoop());
if (SCEVAddRecExpr *ShiftedAddRec = dyn_cast<SCEVAddRecExpr>(Shifted))
return ShiftedAddRec->getNumIterationsInRange(
- Range.subtract(SC->getValue()->getValue()));
+ Range.subtract(SC->getValue()->getValue()), SE);
// This is strange and shouldn't happen.
return new SCEVCouldNotCompute();
}
@@ -2455,7 +2470,7 @@
// First check to see if the range contains zero. If not, the first
// iteration exits.
if (!Range.contains(APInt(getBitWidth(),0)))
- return SCEVConstant::get(ConstantInt::get(getType(),0));
+ return SE.getConstant(ConstantInt::get(getType(),0));
if (isAffine()) {
// If this is an affine expression then we have this situation:
@@ -2476,28 +2491,28 @@
// Evaluate at the exit value. If we really did fall out of the valid
// range, then we computed our trip count, otherwise wrap around or other
// things must have happened.
- ConstantInt *Val = EvaluateConstantChrecAtConstant(this, ExitValue);
+ ConstantInt *Val = EvaluateConstantChrecAtConstant(this, ExitValue, SE);
if (Range.contains(Val->getValue()))
return new SCEVCouldNotCompute(); // Something strange happened
// Ensure that the previous value is in the range. This is a sanity check.
assert(Range.contains(
EvaluateConstantChrecAtConstant(this,
- ConstantInt::get(ExitVal - One))->getValue()) &&
+ ConstantInt::get(ExitVal - One), SE)->getValue()) &&
"Linear scev computation is off in a bad way!");
- return SCEVConstant::get(ExitValue);
+ return SE.getConstant(ExitValue);
} else if (isQuadratic()) {
// If this is a quadratic (3-term) AddRec {L,+,M,+,N}, find the roots of the
// quadratic equation to solve it. To do this, we must frame our problem in
// terms of figuring out when zero is crossed, instead of when
// Range.getUpper() is crossed.
std::vector<SCEVHandle> NewOps(op_begin(), op_end());
- NewOps[0] = SCEV::getNegativeSCEV(SCEVConstant::get(Range.getUpper()));
- SCEVHandle NewAddRec = SCEVAddRecExpr::get(NewOps, getLoop());
+ NewOps[0] = SE.getNegativeSCEV(SE.getConstant(Range.getUpper()));
+ SCEVHandle NewAddRec = SE.getAddRecExpr(NewOps, getLoop());
// Next, solve the constructed addrec
std::pair<SCEVHandle,SCEVHandle> Roots =
- SolveQuadraticEquation(cast<SCEVAddRecExpr>(NewAddRec));
+ SolveQuadraticEquation(cast<SCEVAddRecExpr>(NewAddRec), SE);
SCEVConstant *R1 = dyn_cast<SCEVConstant>(Roots.first);
SCEVConstant *R2 = dyn_cast<SCEVConstant>(Roots.second);
if (R1) {
@@ -2512,21 +2527,22 @@
// not be in the range, but the previous one should be. When solving
// for "X*X < 5", for example, we should not return a root of 2.
ConstantInt *R1Val = EvaluateConstantChrecAtConstant(this,
- R1->getValue());
+ R1->getValue(),
+ SE);
if (Range.contains(R1Val->getValue())) {
// The next iteration must be out of the range...
ConstantInt *NextVal = ConstantInt::get(R1->getValue()->getValue()+1);
- R1Val = EvaluateConstantChrecAtConstant(this, NextVal);
+ R1Val = EvaluateConstantChrecAtConstant(this, NextVal, SE);
if (!Range.contains(R1Val->getValue()))
- return SCEVConstant::get(NextVal);
+ return SE.getConstant(NextVal);
return new SCEVCouldNotCompute(); // Something strange happened
}
// If R1 was not in the range, then it is a good return value. Make
// sure that R1-1 WAS in the range though, just in case.
ConstantInt *NextVal = ConstantInt::get(R1->getValue()->getValue()-1);
- R1Val = EvaluateConstantChrecAtConstant(this, NextVal);
+ R1Val = EvaluateConstantChrecAtConstant(this, NextVal, SE);
if (Range.contains(R1Val->getValue()))
return R1;
return new SCEVCouldNotCompute(); // Something strange happened
@@ -2543,13 +2559,13 @@
ConstantInt *EndVal = TestVal; // Stop when we wrap around.
do {
++NumBruteForceEvaluations;
- SCEVHandle Val = evaluateAtIteration(SCEVConstant::get(TestVal));
+ SCEVHandle Val = evaluateAtIteration(SE.getConstant(TestVal), SE);
if (!isa<SCEVConstant>(Val)) // This shouldn't happen.
return new SCEVCouldNotCompute();
// Check to see if we found the value!
if (!Range.contains(cast<SCEVConstant>(Val)->getValue()->getValue()))
- return SCEVConstant::get(TestVal);
+ return SE.getConstant(TestVal);
// Increment to test the next index.
TestVal = ConstantInt::get(TestVal->getValue()+1);
@@ -2565,7 +2581,7 @@
//===----------------------------------------------------------------------===//
bool ScalarEvolution::runOnFunction(Function &F) {
- Impl = new ScalarEvolutionsImpl(F, getAnalysis<LoopInfo>());
+ Impl = new ScalarEvolutionsImpl(*this, F, getAnalysis<LoopInfo>());
return false;
}
Modified: llvm/trunk/lib/Analysis/ScalarEvolutionExpander.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ScalarEvolutionExpander.cpp?rev=43224&r1=43223&r2=43224&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/ScalarEvolutionExpander.cpp (original)
+++ llvm/trunk/lib/Analysis/ScalarEvolutionExpander.cpp Mon Oct 22 13:31:58 2007
@@ -128,8 +128,8 @@
!cast<SCEVConstant>(S->getStart())->getValue()->isZero()) {
Value *Start = expand(S->getStart());
std::vector<SCEVHandle> NewOps(S->op_begin(), S->op_end());
- NewOps[0] = SCEVUnknown::getIntegerSCEV(0, Ty);
- Value *Rest = expand(SCEVAddRecExpr::get(NewOps, L));
+ NewOps[0] = SE.getIntegerSCEV(0, Ty);
+ Value *Rest = expand(SE.getAddRecExpr(NewOps, L));
// FIXME: look for an existing add to use.
return InsertBinop(Instruction::Add, Rest, Start, InsertPt);
@@ -137,7 +137,7 @@
// {0,+,1} --> Insert a canonical induction variable into the loop!
if (S->getNumOperands() == 2 &&
- S->getOperand(1) == SCEVUnknown::getIntegerSCEV(1, Ty)) {
+ S->getOperand(1) == SE.getIntegerSCEV(1, Ty)) {
// Create and insert the PHI node for the induction variable in the
// specified loop.
BasicBlock *Header = L->getHeader();
@@ -200,9 +200,9 @@
// folders, then expandCodeFor the closed form. This allows the folders to
// simplify the expression without having to build a bunch of special code
// into this folder.
- SCEVHandle IH = SCEVUnknown::get(I); // Get I as a "symbolic" SCEV.
+ SCEVHandle IH = SE.getUnknown(I); // Get I as a "symbolic" SCEV.
- SCEVHandle V = S->evaluateAtIteration(IH);
+ SCEVHandle V = S->evaluateAtIteration(IH, SE);
//cerr << "Evaluated: " << *this << "\n to: " << *V << "\n";
return expand(V);
Modified: llvm/trunk/lib/Transforms/Scalar/IndVarSimplify.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/IndVarSimplify.cpp?rev=43224&r1=43223&r2=43224&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/IndVarSimplify.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/IndVarSimplify.cpp Mon Oct 22 13:31:58 2007
@@ -268,7 +268,7 @@
// backedge actually branches to the loop header. This is one less than the
// number of times the loop executes, so add one to it.
ConstantInt *OneC = ConstantInt::get(IterationCount->getType(), 1);
- TripCount = SCEVAddExpr::get(IterationCount, SCEVConstant::get(OneC));
+ TripCount = SE->getAddExpr(IterationCount, SE->getConstant(OneC));
IndVar = L->getCanonicalInductionVariableIncrement();
} else {
// We have to use the preincremented value...
@@ -524,9 +524,9 @@
if (!isa<SCEVCouldNotCompute>(IterationCount)) {
if (IterationCount->getType()->getPrimitiveSizeInBits() <
LargestType->getPrimitiveSizeInBits())
- IterationCount = SCEVZeroExtendExpr::get(IterationCount, LargestType);
+ IterationCount = SE->getZeroExtendExpr(IterationCount, LargestType);
else if (IterationCount->getType() != LargestType)
- IterationCount = SCEVTruncateExpr::get(IterationCount, LargestType);
+ IterationCount = SE->getTruncateExpr(IterationCount, LargestType);
if (Instruction *DI = LinearFunctionTestReplace(L, IterationCount,Rewriter))
DeadInsts.insert(DI);
}
Modified: llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp?rev=43224&r1=43223&r2=43224&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp Mon Oct 22 13:31:58 2007
@@ -90,9 +90,6 @@
PHINode *PHI;
Value *IncV;
- IVExpr()
- : Stride(SCEVUnknown::getIntegerSCEV(0, Type::Int32Ty)),
- Base (SCEVUnknown::getIntegerSCEV(0, Type::Int32Ty)) {}
IVExpr(const SCEVHandle &stride, const SCEVHandle &base, PHINode *phi,
Value *incv)
: Stride(stride), Base(base), PHI(phi), IncV(incv) {}
@@ -261,7 +258,7 @@
// Build up the base expression. Insert an LLVM cast of the pointer to
// uintptr_t first.
- SCEVHandle GEPVal = SCEVUnknown::get(
+ SCEVHandle GEPVal = SE->getUnknown(
getCastedVersionOf(Instruction::PtrToInt, GEP->getOperand(0)));
gep_type_iterator GTI = gep_type_begin(GEP);
@@ -274,8 +271,8 @@
const StructLayout *SL = TD->getStructLayout(STy);
unsigned Idx = cast<ConstantInt>(GEP->getOperand(i))->getZExtValue();
uint64_t Offset = SL->getElementOffset(Idx);
- GEPVal = SCEVAddExpr::get(GEPVal,
- SCEVUnknown::getIntegerSCEV(Offset, UIntPtrTy));
+ GEPVal = SE->getAddExpr(GEPVal,
+ SE->getIntegerSCEV(Offset, UIntPtrTy));
} else {
unsigned GEPOpiBits =
GEP->getOperand(i)->getType()->getPrimitiveSizeInBits();
@@ -288,10 +285,10 @@
uint64_t TypeSize = TD->getABITypeSize(GTI.getIndexedType());
if (TypeSize != 1)
- Idx = SCEVMulExpr::get(Idx,
- SCEVConstant::get(ConstantInt::get(UIntPtrTy,
- TypeSize)));
- GEPVal = SCEVAddExpr::get(GEPVal, Idx);
+ Idx = SE->getMulExpr(Idx,
+ SE->getConstant(ConstantInt::get(UIntPtrTy,
+ TypeSize)));
+ GEPVal = SE->getAddExpr(GEPVal, Idx);
}
}
@@ -304,7 +301,8 @@
/// is. The stride must be a loop invariant expression, but the start may be
/// a mix of loop invariant and loop variant expressions.
static bool getSCEVStartAndStride(const SCEVHandle &SH, Loop *L,
- SCEVHandle &Start, SCEVHandle &Stride) {
+ SCEVHandle &Start, SCEVHandle &Stride,
+ ScalarEvolution *SE) {
SCEVHandle TheAddRec = Start; // Initialize to zero.
// If the outer level is an AddExpr, the operands are all start values except
@@ -314,11 +312,11 @@
if (SCEVAddRecExpr *AddRec =
dyn_cast<SCEVAddRecExpr>(AE->getOperand(i))) {
if (AddRec->getLoop() == L)
- TheAddRec = SCEVAddExpr::get(AddRec, TheAddRec);
+ TheAddRec = SE->getAddExpr(AddRec, TheAddRec);
else
return false; // Nested IV of some sort?
} else {
- Start = SCEVAddExpr::get(Start, AE->getOperand(i));
+ Start = SE->getAddExpr(Start, AE->getOperand(i));
}
} else if (isa<SCEVAddRecExpr>(SH)) {
@@ -333,7 +331,7 @@
// FIXME: Generalize to non-affine IV's.
if (!AddRec->isAffine()) return false;
- Start = SCEVAddExpr::get(Start, AddRec->getOperand(0));
+ Start = SE->getAddExpr(Start, AddRec->getOperand(0));
if (!isa<SCEVConstant>(AddRec->getOperand(1)))
DOUT << "[" << L->getHeader()->getName()
@@ -414,9 +412,9 @@
if (isa<SCEVCouldNotCompute>(ISE)) return false;
// Get the start and stride for this expression.
- SCEVHandle Start = SCEVUnknown::getIntegerSCEV(0, ISE->getType());
+ SCEVHandle Start = SE->getIntegerSCEV(0, ISE->getType());
SCEVHandle Stride = Start;
- if (!getSCEVStartAndStride(ISE, L, Start, Stride))
+ if (!getSCEVStartAndStride(ISE, L, Start, Stride, SE))
return false; // Non-reducible symbolic expression, bail out.
std::vector<Instruction *> IUsers;
@@ -458,7 +456,7 @@
if (IVUseShouldUsePostIncValue(User, I, L, DT, this)) {
// The value used will be incremented by the stride more than we are
// expecting, so subtract this off.
- SCEVHandle NewStart = SCEV::getMinusSCEV(Start, Stride);
+ SCEVHandle NewStart = SE->getMinusSCEV(Start, Stride);
StrideUses.addUser(NewStart, User, I);
StrideUses.Users.back().isUseOfPostIncrementedValue = true;
DOUT << " USING POSTINC SCEV, START=" << *NewStart<< "\n";
@@ -474,6 +472,9 @@
/// BasedUser - For a particular base value, keep information about how we've
/// partitioned the expression so far.
struct BasedUser {
+ /// SE - The current ScalarEvolution object.
+ ScalarEvolution *SE;
+
/// 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
/// field to the Imm field (below). BasedUser values are sorted by this
@@ -503,10 +504,10 @@
// the loop.
bool isUseOfPostIncrementedValue;
- BasedUser(IVStrideUse &IVSU)
- : Base(IVSU.Offset), Inst(IVSU.User),
+ BasedUser(IVStrideUse &IVSU, ScalarEvolution *se)
+ : SE(se), Base(IVSU.Offset), Inst(IVSU.User),
OperandValToReplace(IVSU.OperandValToReplace),
- Imm(SCEVUnknown::getIntegerSCEV(0, Base->getType())), EmittedBase(0),
+ Imm(SE->getIntegerSCEV(0, Base->getType())), EmittedBase(0),
isUseOfPostIncrementedValue(IVSU.isUseOfPostIncrementedValue) {}
// Once we rewrite the code to insert the new IVs we want, update the
@@ -565,7 +566,7 @@
IP = Rewriter.getInsertionPoint();
// Always emit the immediate (if non-zero) into the same block as the user.
- SCEVHandle NewValSCEV = SCEVAddExpr::get(SCEVUnknown::get(Base), Imm);
+ SCEVHandle NewValSCEV = SE->getAddExpr(SE->getUnknown(Base), Imm);
return Rewriter.expandCodeFor(NewValSCEV, IP);
}
@@ -703,7 +704,7 @@
/// MoveLoopVariantsToImediateField - Move any subexpressions from Val that are
/// loop varying to the Imm operand.
static void MoveLoopVariantsToImediateField(SCEVHandle &Val, SCEVHandle &Imm,
- Loop *L) {
+ Loop *L, ScalarEvolution *SE) {
if (Val->isLoopInvariant(L)) return; // Nothing to do.
if (SCEVAddExpr *SAE = dyn_cast<SCEVAddExpr>(Val)) {
@@ -714,27 +715,27 @@
if (!SAE->getOperand(i)->isLoopInvariant(L)) {
// If this is a loop-variant expression, it must stay in the immediate
// field of the expression.
- Imm = SCEVAddExpr::get(Imm, SAE->getOperand(i));
+ Imm = SE->getAddExpr(Imm, SAE->getOperand(i));
} else {
NewOps.push_back(SAE->getOperand(i));
}
if (NewOps.empty())
- Val = SCEVUnknown::getIntegerSCEV(0, Val->getType());
+ Val = SE->getIntegerSCEV(0, Val->getType());
else
- Val = SCEVAddExpr::get(NewOps);
+ Val = SE->getAddExpr(NewOps);
} else if (SCEVAddRecExpr *SARE = dyn_cast<SCEVAddRecExpr>(Val)) {
// Try to pull immediates out of the start value of nested addrec's.
SCEVHandle Start = SARE->getStart();
- MoveLoopVariantsToImediateField(Start, Imm, L);
+ MoveLoopVariantsToImediateField(Start, Imm, L, SE);
std::vector<SCEVHandle> Ops(SARE->op_begin(), SARE->op_end());
Ops[0] = Start;
- Val = SCEVAddRecExpr::get(Ops, SARE->getLoop());
+ Val = SE->getAddRecExpr(Ops, SARE->getLoop());
} else {
// Otherwise, all of Val is variant, move the whole thing over.
- Imm = SCEVAddExpr::get(Imm, Val);
- Val = SCEVUnknown::getIntegerSCEV(0, Val->getType());
+ Imm = SE->getAddExpr(Imm, Val);
+ Val = SE->getIntegerSCEV(0, Val->getType());
}
}
@@ -745,7 +746,8 @@
static void MoveImmediateValues(const TargetLowering *TLI,
Instruction *User,
SCEVHandle &Val, SCEVHandle &Imm,
- bool isAddress, Loop *L) {
+ bool isAddress, Loop *L,
+ ScalarEvolution *SE) {
const Type *UseTy = User->getType();
if (StoreInst *SI = dyn_cast<StoreInst>(User))
UseTy = SI->getOperand(0)->getType();
@@ -756,31 +758,31 @@
for (unsigned i = 0; i != SAE->getNumOperands(); ++i) {
SCEVHandle NewOp = SAE->getOperand(i);
- MoveImmediateValues(TLI, User, NewOp, Imm, isAddress, L);
+ MoveImmediateValues(TLI, User, NewOp, Imm, isAddress, L, SE);
if (!NewOp->isLoopInvariant(L)) {
// If this is a loop-variant expression, it must stay in the immediate
// field of the expression.
- Imm = SCEVAddExpr::get(Imm, NewOp);
+ Imm = SE->getAddExpr(Imm, NewOp);
} else {
NewOps.push_back(NewOp);
}
}
if (NewOps.empty())
- Val = SCEVUnknown::getIntegerSCEV(0, Val->getType());
+ Val = SE->getIntegerSCEV(0, Val->getType());
else
- Val = SCEVAddExpr::get(NewOps);
+ Val = SE->getAddExpr(NewOps);
return;
} else if (SCEVAddRecExpr *SARE = dyn_cast<SCEVAddRecExpr>(Val)) {
// Try to pull immediates out of the start value of nested addrec's.
SCEVHandle Start = SARE->getStart();
- MoveImmediateValues(TLI, User, Start, Imm, isAddress, L);
+ MoveImmediateValues(TLI, User, Start, Imm, isAddress, L, SE);
if (Start != SARE->getStart()) {
std::vector<SCEVHandle> Ops(SARE->op_begin(), SARE->op_end());
Ops[0] = Start;
- Val = SCEVAddRecExpr::get(Ops, SARE->getLoop());
+ Val = SE->getAddRecExpr(Ops, SARE->getLoop());
}
return;
} else if (SCEVMulExpr *SME = dyn_cast<SCEVMulExpr>(Val)) {
@@ -788,22 +790,22 @@
if (isAddress && isTargetConstant(SME->getOperand(0), UseTy, TLI) &&
SME->getNumOperands() == 2 && SME->isLoopInvariant(L)) {
- SCEVHandle SubImm = SCEVUnknown::getIntegerSCEV(0, Val->getType());
+ SCEVHandle SubImm = SE->getIntegerSCEV(0, Val->getType());
SCEVHandle NewOp = SME->getOperand(1);
- MoveImmediateValues(TLI, User, NewOp, SubImm, isAddress, L);
+ MoveImmediateValues(TLI, User, NewOp, SubImm, isAddress, L, SE);
// If we extracted something out of the subexpressions, see if we can
// simplify this!
if (NewOp != SME->getOperand(1)) {
// Scale SubImm up by "8". If the result is a target constant, we are
// good.
- SubImm = SCEVMulExpr::get(SubImm, SME->getOperand(0));
+ SubImm = SE->getMulExpr(SubImm, SME->getOperand(0));
if (isTargetConstant(SubImm, UseTy, TLI)) {
// Accumulate the immediate.
- Imm = SCEVAddExpr::get(Imm, SubImm);
+ Imm = SE->getAddExpr(Imm, SubImm);
// Update what is left of 'Val'.
- Val = SCEVMulExpr::get(SME->getOperand(0), NewOp);
+ Val = SE->getMulExpr(SME->getOperand(0), NewOp);
return;
}
}
@@ -814,8 +816,8 @@
// expression.
if ((isAddress && isTargetConstant(Val, UseTy, TLI)) ||
!Val->isLoopInvariant(L)) {
- Imm = SCEVAddExpr::get(Imm, Val);
- Val = SCEVUnknown::getIntegerSCEV(0, Val->getType());
+ Imm = SE->getAddExpr(Imm, Val);
+ Val = SE->getIntegerSCEV(0, Val->getType());
return;
}
@@ -827,22 +829,23 @@
/// added together. This is used to reassociate common addition subexprs
/// together for maximal sharing when rewriting bases.
static void SeparateSubExprs(std::vector<SCEVHandle> &SubExprs,
- SCEVHandle Expr) {
+ SCEVHandle Expr,
+ ScalarEvolution *SE) {
if (SCEVAddExpr *AE = dyn_cast<SCEVAddExpr>(Expr)) {
for (unsigned j = 0, e = AE->getNumOperands(); j != e; ++j)
- SeparateSubExprs(SubExprs, AE->getOperand(j));
+ SeparateSubExprs(SubExprs, AE->getOperand(j), SE);
} else if (SCEVAddRecExpr *SARE = dyn_cast<SCEVAddRecExpr>(Expr)) {
- SCEVHandle Zero = SCEVUnknown::getIntegerSCEV(0, Expr->getType());
+ SCEVHandle Zero = SE->getIntegerSCEV(0, Expr->getType());
if (SARE->getOperand(0) == Zero) {
SubExprs.push_back(Expr);
} else {
// Compute the addrec with zero as its base.
std::vector<SCEVHandle> Ops(SARE->op_begin(), SARE->op_end());
Ops[0] = Zero; // Start with zero base.
- SubExprs.push_back(SCEVAddRecExpr::get(Ops, SARE->getLoop()));
+ SubExprs.push_back(SE->getAddRecExpr(Ops, SARE->getLoop()));
- SeparateSubExprs(SubExprs, SARE->getOperand(0));
+ SeparateSubExprs(SubExprs, SARE->getOperand(0), SE);
}
} else if (!isa<SCEVConstant>(Expr) ||
!cast<SCEVConstant>(Expr)->getValue()->isZero()) {
@@ -857,11 +860,12 @@
/// removed, accumulated, and returned. This looks for things like (a+b+c) and
/// (a+c+d) -> (a+c). The common expression is *removed* from the Bases.
static SCEVHandle
-RemoveCommonExpressionsFromUseBases(std::vector<BasedUser> &Uses) {
+RemoveCommonExpressionsFromUseBases(std::vector<BasedUser> &Uses,
+ ScalarEvolution *SE) {
unsigned NumUses = Uses.size();
// Only one use? Use its base, regardless of what it is!
- SCEVHandle Zero = SCEVUnknown::getIntegerSCEV(0, Uses[0].Base->getType());
+ SCEVHandle Zero = SE->getIntegerSCEV(0, Uses[0].Base->getType());
SCEVHandle Result = Zero;
if (NumUses == 1) {
std::swap(Result, Uses[0].Base);
@@ -883,7 +887,7 @@
if (Uses[i].Base == Zero) return Zero;
// Split the expression into subexprs.
- SeparateSubExprs(SubExprs, Uses[i].Base);
+ SeparateSubExprs(SubExprs, Uses[i].Base, SE);
// Add one to SubExpressionUseCounts for each subexpr present.
for (unsigned j = 0, e = SubExprs.size(); j != e; ++j)
if (++SubExpressionUseCounts[SubExprs[j]] == 1)
@@ -898,7 +902,7 @@
SubExpressionUseCounts.find(UniqueSubExprs[i]);
assert(I != SubExpressionUseCounts.end() && "Entry not found?");
if (I->second == NumUses) { // Found CSE!
- Result = SCEVAddExpr::get(Result, I->first);
+ Result = SE->getAddExpr(Result, I->first);
} else {
// Remove non-cse's from SubExpressionUseCounts.
SubExpressionUseCounts.erase(I);
@@ -911,7 +915,7 @@
// Otherwise, remove all of the CSE's we found from each of the base values.
for (unsigned i = 0; i != NumUses; ++i) {
// Split the expression into subexprs.
- SeparateSubExprs(SubExprs, Uses[i].Base);
+ SeparateSubExprs(SubExprs, Uses[i].Base, SE);
// Remove any common subexpressions.
for (unsigned j = 0, e = SubExprs.size(); j != e; ++j)
@@ -924,7 +928,7 @@
if (SubExprs.empty())
Uses[i].Base = Zero;
else
- Uses[i].Base = SCEVAddExpr::get(SubExprs);
+ Uses[i].Base = SE->getAddExpr(SubExprs);
SubExprs.clear();
}
@@ -1037,13 +1041,13 @@
std::vector<BasedUser> UsersToProcess;
UsersToProcess.reserve(Uses.Users.size());
for (unsigned i = 0, e = Uses.Users.size(); i != e; ++i) {
- UsersToProcess.push_back(Uses.Users[i]);
+ UsersToProcess.push_back(BasedUser(Uses.Users[i], SE));
// Move any loop invariant operands from the offset field to the immediate
// field of the use, so that we don't try to use something before it is
// computed.
MoveLoopVariantsToImediateField(UsersToProcess.back().Base,
- UsersToProcess.back().Imm, L);
+ UsersToProcess.back().Imm, L, SE);
assert(UsersToProcess.back().Base->isLoopInvariant(L) &&
"Base value is not loop invariant!");
}
@@ -1056,7 +1060,7 @@
// "A+B"), emit it to the preheader, then remove the expression from the
// UsersToProcess base values.
SCEVHandle CommonExprs =
- RemoveCommonExpressionsFromUseBases(UsersToProcess);
+ RemoveCommonExpressionsFromUseBases(UsersToProcess, SE);
// Next, figure out what we can represent in the immediate fields of
// instructions. If we can represent anything there, move it to the imm
@@ -1067,10 +1071,10 @@
// value of the IV. Do not put anything in the base, make sure it's all in
// the immediate field to allow as much factoring as possible.
if (!L->contains(UsersToProcess[i].Inst->getParent())) {
- UsersToProcess[i].Imm = SCEVAddExpr::get(UsersToProcess[i].Imm,
- UsersToProcess[i].Base);
+ UsersToProcess[i].Imm = SE->getAddExpr(UsersToProcess[i].Imm,
+ UsersToProcess[i].Base);
UsersToProcess[i].Base =
- SCEVUnknown::getIntegerSCEV(0, UsersToProcess[i].Base->getType());
+ SE->getIntegerSCEV(0, UsersToProcess[i].Base->getType());
} else {
// Addressing modes can be folded into loads and stores. Be careful that
@@ -1088,7 +1092,7 @@
}
MoveImmediateValues(TLI, UsersToProcess[i].Inst, UsersToProcess[i].Base,
- UsersToProcess[i].Imm, isAddress, L);
+ UsersToProcess[i].Imm, isAddress, L, SE);
}
}
@@ -1098,7 +1102,9 @@
// instruction after this substition, including the immediate field, if any.
PHINode *NewPHI = NULL;
Value *IncV = NULL;
- IVExpr ReuseIV;
+ IVExpr ReuseIV(SE->getIntegerSCEV(0, Type::Int32Ty),
+ SE->getIntegerSCEV(0, Type::Int32Ty),
+ 0, 0);
unsigned RewriteFactor = CheckForIVReuse(Stride, ReuseIV,
CommonExprs->getType(),
UsersToProcess);
@@ -1143,7 +1149,7 @@
bool isNegative = isNonConstantNegative(Stride);
SCEVHandle IncAmount = Stride;
if (isNegative)
- IncAmount = SCEV::getNegativeSCEV(Stride);
+ IncAmount = SE->getNegativeSCEV(Stride);
// Insert the stride into the preheader.
Value *StrideV = PreheaderRewriter.expandCodeFor(IncAmount, PreInsertPt);
@@ -1151,10 +1157,10 @@
// Emit the increment of the base value before the terminator of the loop
// latch block, and add it to the Phi node.
- SCEVHandle IncExp = SCEVUnknown::get(StrideV);
+ SCEVHandle IncExp = SE->getUnknown(StrideV);
if (isNegative)
- IncExp = SCEV::getNegativeSCEV(IncExp);
- IncExp = SCEVAddExpr::get(SCEVUnknown::get(NewPHI), IncExp);
+ IncExp = SE->getNegativeSCEV(IncExp);
+ IncExp = SE->getAddExpr(SE->getUnknown(NewPHI), IncExp);
IncV = Rewriter.expandCodeFor(IncExp, LatchBlock->getTerminator());
IncV->setName(NewPHI->getName()+".inc");
@@ -1168,7 +1174,7 @@
Constant *C = dyn_cast<Constant>(CommonBaseV);
if (!C ||
(!C->isNullValue() &&
- !isTargetConstant(SCEVUnknown::get(CommonBaseV), ReplacedTy, TLI)))
+ !isTargetConstant(SE->getUnknown(CommonBaseV), ReplacedTy, TLI)))
// We want the common base emitted into the preheader! This is just
// using cast as a copy so BitCast (no-op cast) is appropriate
CommonBaseV = new BitCastInst(CommonBaseV, CommonBaseV->getType(),
@@ -1257,7 +1263,7 @@
RewriteOp = SCEVExpander::InsertCastOfTo(opcode, RewriteOp, ReplacedTy);
}
- SCEVHandle RewriteExpr = SCEVUnknown::get(RewriteOp);
+ SCEVHandle RewriteExpr = SE->getUnknown(RewriteOp);
// Clear the SCEVExpander's expression map so that we are guaranteed
// to have the code emitted where we expect it.
@@ -1267,8 +1273,8 @@
// factor take advantage of addressing mode scale component.
if (RewriteFactor != 0) {
RewriteExpr =
- SCEVMulExpr::get(SCEVUnknown::getIntegerSCEV(RewriteFactor,
- RewriteExpr->getType()),
+ SE->getMulExpr(SE->getIntegerSCEV(RewriteFactor,
+ RewriteExpr->getType()),
RewriteExpr);
// The common base is emitted in the loop preheader. But since we
@@ -1276,15 +1282,15 @@
// Add it to the expression used to rewrite the uses.
if (!isa<ConstantInt>(CommonBaseV) ||
!cast<ConstantInt>(CommonBaseV)->isZero())
- RewriteExpr = SCEVAddExpr::get(RewriteExpr,
- SCEVUnknown::get(CommonBaseV));
+ RewriteExpr = SE->getAddExpr(RewriteExpr,
+ SE->getUnknown(CommonBaseV));
}
// Now that we know what we need to do, insert code before User for the
// immediate and any loop-variant expressions.
if (!isa<ConstantInt>(BaseV) || !cast<ConstantInt>(BaseV)->isZero())
// Add BaseV to the PHI value if needed.
- RewriteExpr = SCEVAddExpr::get(RewriteExpr, SCEVUnknown::get(BaseV));
+ RewriteExpr = SE->getAddExpr(RewriteExpr, SE->getUnknown(BaseV));
User.RewriteInstructionToUseNewBase(RewriteExpr, Rewriter, L, this);
@@ -1380,7 +1386,7 @@
// If we get to here, we know that we can transform the setcc instruction to
// use the post-incremented version of the IV, allowing us to coalesce the
// live ranges for the IV correctly.
- CondUse->Offset = SCEV::getMinusSCEV(CondUse->Offset, *CondStride);
+ CondUse->Offset = SE->getMinusSCEV(CondUse->Offset, *CondStride);
CondUse->isUseOfPostIncrementedValue = true;
}
More information about the llvm-commits
mailing list