6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-23 14:25:07 +00:00
Code Issues Projects Releases Wiki Activity

Convert SCEV from FoldingSetNode to FastFoldingSetNode. This eliminates

Browse Source 
a bunch of redundent code in Profile methods, and prepares for upcoming
changes to do improved memoization.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75494 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman
2009-07-13 20:50:19 +00:00
parent 2e4da5e4ab
commit c050fd94c2
3 changed files with 78 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/llvm/Analysis/ScalarEvolution.h
View File

@@ -42,7 +42,7 @@ namespace llvm {
/// are opaque objects that the client is not allowed to do much with
/// directly.
///
class SCEV : public FoldingSetNode {
class SCEV : public FastFoldingSetNode {
const unsigned SCEVType; // The SCEV baseclass this node corresponds to
SCEV(const SCEV &); // DO NOT IMPLEMENT
@@ -50,10 +50,8 @@ namespace llvm {
protected:
virtual ~SCEV();
public:
explicit SCEV(unsigned SCEVTy) :
SCEVType(SCEVTy) {}
virtual void Profile(FoldingSetNodeID &ID) const = 0;
explicit SCEV(const FoldingSetNodeID &ID, unsigned SCEVTy) :
FastFoldingSetNode(ID), SCEVType(SCEVTy) {}
unsigned getSCEVType() const { return SCEVType; }
@@ -129,7 +127,6 @@ namespace llvm {
SCEVCouldNotCompute();
// None of these methods are valid for this object.
virtual void Profile(FoldingSetNodeID &ID) const;
virtual bool isLoopInvariant(const Loop *L) const;
virtual const Type *getType() const;
virtual bool hasComputableLoopEvolution(const Loop *L) const;

79
include/llvm/Analysis/ScalarEvolutionExpressions.h
View File

@@ -37,11 +37,9 @@ namespace llvm {
friend class ScalarEvolution;
ConstantInt *V;
explicit SCEVConstant(ConstantInt *v) :
SCEV(scConstant), V(v) {}
SCEVConstant(const FoldingSetNodeID &ID, ConstantInt *v) :
SCEV(ID, scConstant), V(v) {}
public:
virtual void Profile(FoldingSetNodeID &ID) const;
ConstantInt *getValue() const { return V; }
virtual bool isLoopInvariant(const Loop *L) const {
@@ -81,11 +79,10 @@ namespace llvm {
const SCEV *Op;
const Type *Ty;
SCEVCastExpr(unsigned SCEVTy, const SCEV *op, const Type *ty);
SCEVCastExpr(const FoldingSetNodeID &ID,
unsigned SCEVTy, const SCEV *op, const Type *ty);
public:
virtual void Profile(FoldingSetNodeID &ID) const;
const SCEV *getOperand() const { return Op; }
virtual const Type *getType() const { return Ty; }
@@ -115,7 +112,8 @@ namespace llvm {
class SCEVTruncateExpr : public SCEVCastExpr {
friend class ScalarEvolution;
SCEVTruncateExpr(const SCEV *op, const Type *ty);
SCEVTruncateExpr(const FoldingSetNodeID &ID,
const SCEV *op, const Type *ty);
public:
const SCEV *replaceSymbolicValuesWithConcrete(const SCEV *Sym,
@@ -143,7 +141,8 @@ namespace llvm {
class SCEVZeroExtendExpr : public SCEVCastExpr {
friend class ScalarEvolution;
SCEVZeroExtendExpr(const SCEV *op, const Type *ty);
SCEVZeroExtendExpr(const FoldingSetNodeID &ID,
const SCEV *op, const Type *ty);
public:
const SCEV *replaceSymbolicValuesWithConcrete(const SCEV *Sym,
@@ -171,7 +170,8 @@ namespace llvm {
class SCEVSignExtendExpr : public SCEVCastExpr {
friend class ScalarEvolution;
SCEVSignExtendExpr(const SCEV *op, const Type *ty);
SCEVSignExtendExpr(const FoldingSetNodeID &ID,
const SCEV *op, const Type *ty);
public:
const SCEV *replaceSymbolicValuesWithConcrete(const SCEV *Sym,
@@ -201,12 +201,11 @@ namespace llvm {
protected:
SmallVector<const SCEV *, 8> Operands;
SCEVNAryExpr(enum SCEVTypes T, const SmallVectorImpl<const SCEV *> &ops)
: SCEV(T), Operands(ops.begin(), ops.end()) {}
SCEVNAryExpr(const FoldingSetNodeID &ID,
enum SCEVTypes T, const SmallVectorImpl<const SCEV *> &ops)
: SCEV(ID, T), Operands(ops.begin(), ops.end()) {}
public:
virtual void Profile(FoldingSetNodeID &ID) const;
unsigned getNumOperands() const { return (unsigned)Operands.size(); }
const SCEV *getOperand(unsigned i) const {
assert(i < Operands.size() && "Operand index out of range!");
@@ -262,9 +261,10 @@ namespace llvm {
///
class SCEVCommutativeExpr : public SCEVNAryExpr {
protected:
SCEVCommutativeExpr(enum SCEVTypes T,
SCEVCommutativeExpr(const FoldingSetNodeID &ID,
enum SCEVTypes T,
const SmallVectorImpl<const SCEV *> &ops)
: SCEVNAryExpr(T, ops) {}
: SCEVNAryExpr(ID, T, ops) {}
public:
const SCEV *replaceSymbolicValuesWithConcrete(const SCEV *Sym,
@@ -292,8 +292,9 @@ namespace llvm {
class SCEVAddExpr : public SCEVCommutativeExpr {
friend class ScalarEvolution;
explicit SCEVAddExpr(const SmallVectorImpl<const SCEV *> &ops)
: SCEVCommutativeExpr(scAddExpr, ops) {
SCEVAddExpr(const FoldingSetNodeID &ID,
const SmallVectorImpl<const SCEV *> &ops)
: SCEVCommutativeExpr(ID, scAddExpr, ops) {
}
public:
@@ -312,8 +313,9 @@ namespace llvm {
class SCEVMulExpr : public SCEVCommutativeExpr {
friend class ScalarEvolution;
explicit SCEVMulExpr(const SmallVectorImpl<const SCEV *> &ops)
: SCEVCommutativeExpr(scMulExpr, ops) {
SCEVMulExpr(const FoldingSetNodeID &ID,
const SmallVectorImpl<const SCEV *> &ops)
: SCEVCommutativeExpr(ID, scMulExpr, ops) {
}
public:
@@ -335,12 +337,10 @@ namespace llvm {
const SCEV *LHS;
const SCEV *RHS;
SCEVUDivExpr(const SCEV *lhs, const SCEV *rhs)
: SCEV(scUDivExpr), LHS(lhs), RHS(rhs) {}
SCEVUDivExpr(const FoldingSetNodeID &ID, const SCEV *lhs, const SCEV *rhs)
: SCEV(ID, scUDivExpr), LHS(lhs), RHS(rhs) {}
public:
virtual void Profile(FoldingSetNodeID &ID) const;
const SCEV *getLHS() const { return LHS; }
const SCEV *getRHS() const { return RHS; }
@@ -392,16 +392,15 @@ namespace llvm {
const Loop *L;
SCEVAddRecExpr(const SmallVectorImpl<const SCEV *> &ops, const Loop *l)
: SCEVNAryExpr(scAddRecExpr, ops), L(l) {
SCEVAddRecExpr(const FoldingSetNodeID &ID,
const SmallVectorImpl<const SCEV *> &ops, const Loop *l)
: SCEVNAryExpr(ID, scAddRecExpr, ops), L(l) {
for (size_t i = 0, e = Operands.size(); i != e; ++i)
assert(Operands[i]->isLoopInvariant(l) &&
"Operands of AddRec must be loop-invariant!");
}
public:
virtual void Profile(FoldingSetNodeID &ID) const;
const SCEV *getStart() const { return Operands[0]; }
const Loop *getLoop() const { return L; }
@@ -454,6 +453,12 @@ namespace llvm {
const SCEV *Conc,
ScalarEvolution &SE) const;
/// getPostIncExpr - Return an expression representing the value of
/// this expression one iteration of the loop ahead.
const SCEV *getPostIncExpr(ScalarEvolution &SE) const {
return SE.getAddExpr(this, getStepRecurrence(SE));
}
virtual void print(raw_ostream &OS) const;
/// Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -470,8 +475,9 @@ namespace llvm {
class SCEVSMaxExpr : public SCEVCommutativeExpr {
friend class ScalarEvolution;
explicit SCEVSMaxExpr(const SmallVectorImpl<const SCEV *> &ops)
: SCEVCommutativeExpr(scSMaxExpr, ops) {
SCEVSMaxExpr(const FoldingSetNodeID &ID,
const SmallVectorImpl<const SCEV *> &ops)
: SCEVCommutativeExpr(ID, scSMaxExpr, ops) {
}
public:
@@ -491,8 +497,9 @@ namespace llvm {
class SCEVUMaxExpr : public SCEVCommutativeExpr {
friend class ScalarEvolution;
explicit SCEVUMaxExpr(const SmallVectorImpl<const SCEV *> &ops)
: SCEVCommutativeExpr(scUMaxExpr, ops) {
SCEVUMaxExpr(const FoldingSetNodeID &ID,
const SmallVectorImpl<const SCEV *> &ops)
: SCEVCommutativeExpr(ID, scUMaxExpr, ops) {
}
public:
@@ -515,12 +522,10 @@ namespace llvm {
friend class ScalarEvolution;
Value *V;
explicit SCEVUnknown(Value *v) :
SCEV(scUnknown), V(v) {}
public:
virtual void Profile(FoldingSetNodeID &ID) const;
SCEVUnknown(const FoldingSetNodeID &ID, Value *v) :
SCEV(ID, scUnknown), V(v) {}
public:
Value *getValue() const { return V; }
virtual bool isLoopInvariant(const Loop *L) const;