6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2026-04-21 23:17:16 +00:00
Code Issues Projects Releases Wiki Activity

do not assert when delinearization fails

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@208615 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Sebastian Pop
2014-05-12 19:01:53 +00:00
parent d9673ebd34
commit 2f5f1c2ccb
2 changed files with 74 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Analysis/ScalarEvolution.cpp
+31 -9
View File
@@ -7192,7 +7192,7 @@ findGCD(ScalarEvolution &SE, SmallVectorImpl<const SCEV *> &Terms) {
return GCD;
}
static void findArrayDimensionsRec(ScalarEvolution &SE,
static bool findArrayDimensionsRec(ScalarEvolution &SE,
SmallVectorImpl<const SCEV *> &Terms,
SmallVectorImpl<const SCEV *> &Sizes) {
// The GCD of all Terms is the dimension of the innermost dimension.
@@ -7210,14 +7210,18 @@ static void findArrayDimensionsRec(ScalarEvolution &SE,
}
Sizes.push_back(GCD);
return;
return true;
}
for (const SCEV *&Term : Terms) {
// Normalize the terms before the next call to findArrayDimensionsRec.
const SCEV *Q, *R;
SCEVDivision::divide(SE, Term, GCD, &Q, &R);
assert(R->isZero() && "GCD does not evenly divide one of the terms");
// Bail out when GCD does not evenly divide one of the terms.
if (!R->isZero())
return false;
Term = Q;
}
@@ -7228,8 +7232,11 @@ static void findArrayDimensionsRec(ScalarEvolution &SE,
Terms.end());
if (Terms.size() > 0)
findArrayDimensionsRec(SE, Terms, Sizes);
if (!findArrayDimensionsRec(SE, Terms, Sizes))
return false;
Sizes.push_back(GCD);
return true;
}
namespace {
@@ -7315,7 +7322,12 @@ void ScalarEvolution::findArrayDimensions(
});
ScalarEvolution &SE = *const_cast<ScalarEvolution *>(this);
findArrayDimensionsRec(SE, Terms, Sizes);
bool Res = findArrayDimensionsRec(SE, Terms, Sizes);
if (!Res) {
Sizes.clear();
return;
}
DEBUG({
dbgs() << "Sizes:\n";
@@ -7329,11 +7341,12 @@ void ScalarEvolution::findArrayDimensions(
const SCEV *SCEVAddRecExpr::computeAccessFunctions(
ScalarEvolution &SE, SmallVectorImpl<const SCEV *> &Subscripts,
SmallVectorImpl<const SCEV *> &Sizes) const {
// Early exit in case this SCEV is not an affine multivariate function.
const SCEV *Zero = SE.getConstant(this->getType(), 0);
if (!this->isAffine())
return Zero;
// Early exit in case this SCEV is not an affine multivariate function.
if (Sizes.empty() || !this->isAffine())
return NULL;
const SCEV *Zero = SE.getConstant(this->getType(), 0);
const SCEV *Res = this, *Remainder = Zero;
int Last = Sizes.size() - 1;
for (int i = Last; i >= 0; i--) {
@@ -7432,12 +7445,21 @@ SCEVAddRecExpr::delinearize(ScalarEvolution &SE,
SmallVector<const SCEV *, 4> Terms;
collectParametricTerms(SE, Terms);
if (Terms.empty())
return NULL;
// Second step: find subscript sizes.
SE.findArrayDimensions(Terms, Sizes);
if (Sizes.empty())
return NULL;
// Third step: compute the access functions for each subscript.
const SCEV *Remainder = computeAccessFunctions(SE, Subscripts, Sizes);
if (!Remainder || Subscripts.empty())
return NULL;
DEBUG({
dbgs() << "succeeded to delinearize " << *this << "\n";
dbgs() << "ArrayDecl[UnknownSize]";