mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-17 05:29:24 +00:00
Reverted r44163 per request
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@44177 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
07268172ff
commit
4e1a0e386c
@ -226,7 +226,6 @@ namespace llvm {
|
||||
return getMulExpr(Ops);
|
||||
}
|
||||
SCEVHandle getSDivExpr(const SCEVHandle &LHS, const SCEVHandle &RHS);
|
||||
SCEVHandle getUDivExpr(const SCEVHandle &LHS, const SCEVHandle &RHS);
|
||||
SCEVHandle getAddRecExpr(const SCEVHandle &Start, const SCEVHandle &Step,
|
||||
const Loop *L);
|
||||
SCEVHandle getAddRecExpr(std::vector<SCEVHandle> &Operands,
|
||||
|
@ -132,12 +132,6 @@ namespace llvm {
|
||||
return InsertBinop(Instruction::SDiv, LHS, RHS, InsertPt);
|
||||
}
|
||||
|
||||
Value *visitUDivExpr(SCEVUDivExpr *S) {
|
||||
Value *LHS = expand(S->getLHS());
|
||||
Value *RHS = expand(S->getRHS());
|
||||
return InsertBinop(Instruction::UDiv, LHS, RHS, InsertPt);
|
||||
}
|
||||
|
||||
Value *visitAddRecExpr(SCEVAddRecExpr *S);
|
||||
|
||||
Value *visitUnknown(SCEVUnknown *S) {
|
||||
|
@ -25,7 +25,7 @@ namespace llvm {
|
||||
// These should be ordered in terms of increasing complexity to make the
|
||||
// folders simpler.
|
||||
scConstant, scTruncate, scZeroExtend, scSignExtend, scAddExpr, scMulExpr,
|
||||
scSDivExpr, scUDivExpr, scAddRecExpr, scUnknown, scCouldNotCompute
|
||||
scSDivExpr, scAddRecExpr, scUnknown, scCouldNotCompute
|
||||
};
|
||||
|
||||
//===--------------------------------------------------------------------===//
|
||||
@ -369,55 +369,6 @@ namespace llvm {
|
||||
};
|
||||
|
||||
|
||||
//===--------------------------------------------------------------------===//
|
||||
/// SCEVUDivExpr - This class represents a binary unsigned division operation.
|
||||
///
|
||||
class SCEVUDivExpr : public SCEV {
|
||||
friend class ScalarEvolution;
|
||||
|
||||
SCEVHandle LHS, RHS;
|
||||
SCEVUDivExpr(const SCEVHandle &lhs, const SCEVHandle &rhs)
|
||||
: SCEV(scUDivExpr), LHS(lhs), RHS(rhs) {}
|
||||
|
||||
virtual ~SCEVUDivExpr();
|
||||
public:
|
||||
const SCEVHandle &getLHS() const { return LHS; }
|
||||
const SCEVHandle &getRHS() const { return RHS; }
|
||||
|
||||
virtual bool isLoopInvariant(const Loop *L) const {
|
||||
return LHS->isLoopInvariant(L) && RHS->isLoopInvariant(L);
|
||||
}
|
||||
|
||||
virtual bool hasComputableLoopEvolution(const Loop *L) const {
|
||||
return LHS->hasComputableLoopEvolution(L) &&
|
||||
RHS->hasComputableLoopEvolution(L);
|
||||
}
|
||||
|
||||
SCEVHandle replaceSymbolicValuesWithConcrete(const SCEVHandle &Sym,
|
||||
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 SE.getUDivExpr(L, R);
|
||||
}
|
||||
|
||||
|
||||
virtual const Type *getType() const;
|
||||
|
||||
void print(std::ostream &OS) const;
|
||||
void print(std::ostream *OS) const { if (OS) print(*OS); }
|
||||
|
||||
/// Methods for support type inquiry through isa, cast, and dyn_cast:
|
||||
static inline bool classof(const SCEVUDivExpr *S) { return true; }
|
||||
static inline bool classof(const SCEV *S) {
|
||||
return S->getSCEVType() == scUDivExpr;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
//===--------------------------------------------------------------------===//
|
||||
/// SCEVAddRecExpr - This node represents a polynomial recurrence on the trip
|
||||
/// count of the specified loop.
|
||||
@ -568,8 +519,6 @@ namespace llvm {
|
||||
return ((SC*)this)->visitMulExpr((SCEVMulExpr*)S);
|
||||
case scSDivExpr:
|
||||
return ((SC*)this)->visitSDivExpr((SCEVSDivExpr*)S);
|
||||
case scUDivExpr:
|
||||
return ((SC*)this)->visitUDivExpr((SCEVUDivExpr*)S);
|
||||
case scAddRecExpr:
|
||||
return ((SC*)this)->visitAddRecExpr((SCEVAddRecExpr*)S);
|
||||
case scUnknown:
|
||||
|
@ -344,24 +344,6 @@ const Type *SCEVSDivExpr::getType() const {
|
||||
return LHS->getType();
|
||||
}
|
||||
|
||||
// SCEVUDivs - Only allow the creation of one SCEVUDivExpr for any particular
|
||||
// input. Don't use a SCEVHandle here, or else the object will never be
|
||||
// deleted!
|
||||
static ManagedStatic<std::map<std::pair<SCEV*, SCEV*>,
|
||||
SCEVUDivExpr*> > SCEVUDivs;
|
||||
|
||||
SCEVUDivExpr::~SCEVUDivExpr() {
|
||||
SCEVUDivs->erase(std::make_pair(LHS, RHS));
|
||||
}
|
||||
|
||||
void SCEVUDivExpr::print(std::ostream &OS) const {
|
||||
OS << "(" << *LHS << " /u " << *RHS << ")";
|
||||
}
|
||||
|
||||
const Type *SCEVUDivExpr::getType() const {
|
||||
return LHS->getType();
|
||||
}
|
||||
|
||||
// SCEVAddRecExprs - Only allow the creation of one SCEVAddRecExpr for any
|
||||
// particular input. Don't use a SCEVHandle here, or else the object will never
|
||||
// be deleted!
|
||||
@ -591,7 +573,7 @@ SCEVHandle SCEVAddRecExpr::evaluateAtIteration(SCEVHandle It,
|
||||
for (unsigned i = 1, e = getNumOperands(); i != e; ++i) {
|
||||
SCEVHandle BC = PartialFact(It, i, SE);
|
||||
Divisor *= i;
|
||||
SCEVHandle Val = SE.getUDivExpr(SE.getMulExpr(BC, getOperand(i)),
|
||||
SCEVHandle Val = SE.getSDivExpr(SE.getMulExpr(BC, getOperand(i)),
|
||||
SE.getIntegerSCEV(Divisor,Ty));
|
||||
Result = SE.getAddExpr(Result, Val);
|
||||
}
|
||||
@ -1055,8 +1037,7 @@ SCEVHandle ScalarEvolution::getMulExpr(std::vector<SCEVHandle> &Ops) {
|
||||
return Result;
|
||||
}
|
||||
|
||||
SCEVHandle ScalarEvolution::getSDivExpr(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
|
||||
@ -1077,26 +1058,6 @@ SCEVHandle ScalarEvolution::getSDivExpr(const SCEVHandle &LHS,
|
||||
return Result;
|
||||
}
|
||||
|
||||
SCEVHandle ScalarEvolution::getUDivExpr(const SCEVHandle &LHS,
|
||||
const SCEVHandle &RHS) {
|
||||
if (SCEVConstant *RHSC = dyn_cast<SCEVConstant>(RHS)) {
|
||||
if (RHSC->getValue()->equalsInt(1))
|
||||
return LHS; // X udiv 1 --> x
|
||||
|
||||
if (SCEVConstant *LHSC = dyn_cast<SCEVConstant>(LHS)) {
|
||||
Constant *LHSCV = LHSC->getValue();
|
||||
Constant *RHSCV = RHSC->getValue();
|
||||
return getUnknown(ConstantExpr::getUDiv(LHSCV, RHSCV));
|
||||
}
|
||||
}
|
||||
|
||||
// FIXME: implement folding of (X*4)/4 when we know X*4 doesn't overflow.
|
||||
|
||||
SCEVUDivExpr *&Result = (*SCEVUDivs)[std::make_pair(LHS, RHS)];
|
||||
if (Result == 0) Result = new SCEVUDivExpr(LHS, RHS);
|
||||
return Result;
|
||||
}
|
||||
|
||||
|
||||
/// SCEVAddRecExpr::get - Get a add recurrence expression for the
|
||||
/// specified loop. Simplify the expression as much as possible.
|
||||
@ -1523,6 +1484,8 @@ SCEVHandle ScalarEvolutionsImpl::createSCEV(Value *V) {
|
||||
case Instruction::SDiv:
|
||||
return SE.getSDivExpr(getSCEV(I->getOperand(0)),
|
||||
getSCEV(I->getOperand(1)));
|
||||
break;
|
||||
|
||||
case Instruction::Sub:
|
||||
return SE.getMinusSCEV(getSCEV(I->getOperand(0)),
|
||||
getSCEV(I->getOperand(1)));
|
||||
@ -2182,16 +2145,6 @@ SCEVHandle ScalarEvolutionsImpl::getSCEVAtScope(SCEV *V, const Loop *L) {
|
||||
return SE.getSDivExpr(LHS, RHS);
|
||||
}
|
||||
|
||||
if (SCEVUDivExpr *Div = dyn_cast<SCEVUDivExpr>(V)) {
|
||||
SCEVHandle LHS = getSCEVAtScope(Div->getLHS(), L);
|
||||
if (LHS == UnknownValue) return LHS;
|
||||
SCEVHandle RHS = getSCEVAtScope(Div->getRHS(), L);
|
||||
if (RHS == UnknownValue) return RHS;
|
||||
if (LHS == Div->getLHS() && RHS == Div->getRHS())
|
||||
return Div; // must be loop invariant
|
||||
return SE.getUDivExpr(LHS, RHS);
|
||||
}
|
||||
|
||||
// If this is a loop recurrence for a loop that does not contain L, then we
|
||||
// are dealing with the final value computed by the loop.
|
||||
if (SCEVAddRecExpr *AddRec = dyn_cast<SCEVAddRecExpr>(V)) {
|
||||
@ -2735,4 +2688,3 @@ void ScalarEvolution::print(std::ostream &OS, const Module* ) const {
|
||||
for (LoopInfo::iterator I = LI.begin(), E = LI.end(); I != E; ++I)
|
||||
PrintLoopInfo(OS, this, *I);
|
||||
}
|
||||
|
||||
|
@ -1,5 +1,6 @@
|
||||
; RUN: llvm-as < %s | opt -indvars | llvm-dis | grep printd | grep 1206807378
|
||||
; PR1798
|
||||
; XFAIL: *
|
||||
|
||||
declare void @printd(i32)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user