[ScopInfo] Rename MaxDisjunctions -> MaxDisjuncts [NFC]

There is only a single disjunction. However, we bound the number of 'disjuncts'
in this disjunction. Name the variable accordingly.

llvm-svn: 295362
This commit is contained in:
Tobias Grosser 2017-02-16 19:11:33 +00:00
parent 76ec194951
commit 90411a967b
1 changed files with 8 additions and 8 deletions

View File

@ -77,7 +77,7 @@ STATISTIC(AssumptionsDelinearization,
// The maximal number of basic sets we allow during domain construction to
// be created. More complex scops will result in very high compile time and
// are also unlikely to result in good code
static int const MaxDisjunctionsInDomain = 20;
static int const MaxDisjunctsInDomain = 20;
// The number of disjunct in the context after which we stop to add more
// disjuncts. This parameter is there to avoid exponential growth in the
@ -1457,13 +1457,13 @@ buildConditionSets(ScopStmt &Stmt, Value *Condition, TerminatorInst *TI,
isl_set *AlternativeCondSet = nullptr;
bool TooComplex =
isl_set_n_basic_set(ConsequenceCondSet) >= MaxDisjunctionsInDomain;
isl_set_n_basic_set(ConsequenceCondSet) >= MaxDisjunctsInDomain;
if (!TooComplex) {
AlternativeCondSet = isl_set_subtract(isl_set_copy(Domain),
isl_set_copy(ConsequenceCondSet));
TooComplex =
isl_set_n_basic_set(AlternativeCondSet) >= MaxDisjunctionsInDomain;
isl_set_n_basic_set(AlternativeCondSet) >= MaxDisjunctsInDomain;
}
if (TooComplex) {
@ -2127,7 +2127,7 @@ static isl_stat buildMinMaxAccess(__isl_take isl_set *Set, void *User) {
Set = isl_set_remove_divs(Set);
if (isl_set_n_basic_set(Set) >= MaxDisjunctionsInDomain) {
if (isl_set_n_basic_set(Set) >= MaxDisjunctsInDomain) {
isl_set_free(Set);
return isl_stat_error;
}
@ -2454,7 +2454,7 @@ bool Scop::propagateInvalidStmtDomains(Region *R, DominatorTree &DT,
// Check if the maximal number of domain disjunctions was reached.
// In case this happens we will bail.
if (NumConjucts < MaxDisjunctionsInDomain)
if (NumConjucts < MaxDisjunctsInDomain)
continue;
isl_set_free(InvalidDomain);
@ -2633,7 +2633,7 @@ bool Scop::buildDomainsWithBranchConstraints(Region *R, DominatorTree &DT,
// Check if the maximal number of domain disjunctions was reached.
// In case this happens we will clean up and bail.
if (isl_set_n_basic_set(SuccDomain) < MaxDisjunctionsInDomain)
if (isl_set_n_basic_set(SuccDomain) < MaxDisjunctsInDomain)
continue;
invalidate(COMPLEXITY, DebugLoc());
@ -3490,7 +3490,7 @@ void Scop::addInvariantLoads(ScopStmt &Stmt, InvariantAccessesTy &InvMAs) {
isl_set *DomainCtx = isl_set_params(Stmt.getDomain());
DomainCtx = isl_set_subtract(DomainCtx, StmtInvalidCtx);
if (isl_set_n_basic_set(DomainCtx) >= MaxDisjunctionsInDomain) {
if (isl_set_n_basic_set(DomainCtx) >= MaxDisjunctsInDomain) {
auto *AccInst = InvMAs.front().MA->getAccessInstruction();
invalidate(COMPLEXITY, AccInst->getDebugLoc());
isl_set_free(DomainCtx);
@ -3657,7 +3657,7 @@ __isl_give isl_set *Scop::getNonHoistableCtx(MemoryAccess *Access,
return WrittenCtx;
WrittenCtx = isl_set_remove_divs(WrittenCtx);
bool TooComplex = isl_set_n_basic_set(WrittenCtx) >= MaxDisjunctionsInDomain;
bool TooComplex = isl_set_n_basic_set(WrittenCtx) >= MaxDisjunctsInDomain;
if (TooComplex || !isRequiredInvariantLoad(LI)) {
isl_set_free(WrittenCtx);
return nullptr;