[polly] r264775 - Bail as early as possible
Johannes Doerfert via llvm-commits
llvm-commits at lists.llvm.org
Tue Mar 29 13:02:06 PDT 2016
Author: jdoerfert
Date: Tue Mar 29 15:02:05 2016
New Revision: 264775
URL: http://llvm.org/viewvc/llvm-project?rev=264775&view=rev
Log:
Bail as early as possible
Instead of waiting for the domain construction to finish we will now
bail as early as possible in case a complexity problem is encountered.
This might save compile time but more importantly it makes the "abort"
explicit. While we can always check if we invalidated the assumed
context we can simply propagate the result of the construction back.
This also removes the HasComplexCFG flag that was used for the very
same reason.
Differential Revision: http://reviews.llvm.org/D18504
Modified:
polly/trunk/include/polly/ScopInfo.h
polly/trunk/lib/Analysis/ScopInfo.cpp
Modified: polly/trunk/include/polly/ScopInfo.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/ScopInfo.h?rev=264775&r1=264774&r2=264775&view=diff
==============================================================================
--- polly/trunk/include/polly/ScopInfo.h (original)
+++ polly/trunk/include/polly/ScopInfo.h Tue Mar 29 15:02:05 2016
@@ -1287,9 +1287,6 @@ private:
/// @brief Flag to remember if the SCoP contained an error block or not.
bool HasErrorBlock;
- /// @brief Flag to indicate if the SCop has a complex control flow.
- bool HasComplexCFG;
-
/// Max loop depth.
unsigned MaxLoopDepth;
@@ -1436,7 +1433,9 @@ private:
/// @param SD The ScopDetection analysis for the current function.
/// @param DT The DominatorTree for the current function.
/// @param LI The LoopInfo for the current function.
- void buildDomainsWithBranchConstraints(Region *R, ScopDetection &SD,
+ ///
+ /// @returns True if there was no problem and false otherwise.
+ bool buildDomainsWithBranchConstraints(Region *R, ScopDetection &SD,
DominatorTree &DT, LoopInfo &LI);
/// @brief Propagate the domain constraints through the region @p R.
@@ -1463,7 +1462,9 @@ private:
/// @param SD The ScopDetection analysis for the current function.
/// @param DT The DominatorTree for the current function.
/// @param LI The LoopInfo for the current function.
- void buildDomains(Region *R, ScopDetection &SD, DominatorTree &DT,
+ ///
+ /// @returns True if there was no problem and false otherwise.
+ bool buildDomains(Region *R, ScopDetection &SD, DominatorTree &DT,
LoopInfo &LI);
/// @brief Check if a region part should be represented in the SCoP or not.
Modified: polly/trunk/lib/Analysis/ScopInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopInfo.cpp?rev=264775&r1=264774&r2=264775&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/ScopInfo.cpp (original)
+++ polly/trunk/lib/Analysis/ScopInfo.cpp Tue Mar 29 15:02:05 2016
@@ -2143,7 +2143,7 @@ void Scop::removeErrorBlockDomains(ScopD
removeDomains(BB);
}
-void Scop::buildDomains(Region *R, ScopDetection &SD, DominatorTree &DT,
+bool Scop::buildDomains(Region *R, ScopDetection &SD, DominatorTree &DT,
LoopInfo &LI) {
bool IsOnlyNonAffineRegion = SD.isNonAffineSubRegion(R, R);
@@ -2160,9 +2160,11 @@ void Scop::buildDomains(Region *R, ScopD
DomainMap[EntryBB] = S;
if (IsOnlyNonAffineRegion)
- return;
+ return true;
+
+ if (!buildDomainsWithBranchConstraints(R, SD, DT, LI))
+ return false;
- buildDomainsWithBranchConstraints(R, SD, DT, LI);
propagateDomainConstraints(R, SD, DT, LI);
// Error blocks and blocks dominated by them have been assumed to never be
@@ -2174,9 +2176,10 @@ void Scop::buildDomains(Region *R, ScopD
// instructions in the error block which, if the error block is not modeled,
// can themselves not be constructed properly.
removeErrorBlockDomains(SD, DT, LI);
+ return true;
}
-void Scop::buildDomainsWithBranchConstraints(Region *R, ScopDetection &SD,
+bool Scop::buildDomainsWithBranchConstraints(Region *R, ScopDetection &SD,
DominatorTree &DT, LoopInfo &LI) {
auto &BoxedLoops = *SD.getBoxedLoops(&getRegion());
@@ -2199,7 +2202,8 @@ void Scop::buildDomainsWithBranchConstra
if (RN->isSubRegion()) {
Region *SubRegion = RN->getNodeAs<Region>();
if (!SD.isNonAffineSubRegion(SubRegion, &getRegion())) {
- buildDomainsWithBranchConstraints(SubRegion, SD, DT, LI);
+ if (!buildDomainsWithBranchConstraints(SubRegion, SD, DT, LI))
+ return false;
continue;
}
}
@@ -2279,25 +2283,24 @@ void Scop::buildDomainsWithBranchConstra
// successor block.
isl_set *&SuccDomain = DomainMap[SuccBB];
- if (HasComplexCFG) {
- isl_set_free(CondSet);
- continue;
- }
if (!SuccDomain)
SuccDomain = CondSet;
else
- SuccDomain = isl_set_union(SuccDomain, CondSet);
+ SuccDomain = isl_set_coalesce(isl_set_union(SuccDomain, CondSet));
- SuccDomain = isl_set_coalesce(SuccDomain);
- if (isl_set_n_basic_set(SuccDomain) > MaxConjunctsInDomain) {
- auto *Empty = isl_set_empty(isl_set_get_space(SuccDomain));
- isl_set_free(SuccDomain);
- SuccDomain = Empty;
- HasComplexCFG = true;
- invalidate(COMPLEXITY, DebugLoc());
- }
+ // Check if the maximal number of domain conjuncts was reached.
+ // In case this happens we will clean up and bail.
+ if (isl_set_n_basic_set(SuccDomain) <= MaxConjunctsInDomain)
+ continue;
+
+ invalidate(COMPLEXITY, DebugLoc());
+ while (++u < ConditionSets.size())
+ isl_set_free(ConditionSets[u]);
+ return false;
}
}
+
+ return true;
}
/// @brief Return the domain for @p BB wrt @p DomainMap.
@@ -2771,10 +2774,9 @@ Scop::Scop(Region &R, ScalarEvolution &S
unsigned MaxLoopDepth)
: SE(&ScalarEvolution), R(R), IsOptimized(false),
HasSingleExitEdge(R.getExitingBlock()), HasErrorBlock(false),
- HasComplexCFG(false), MaxLoopDepth(MaxLoopDepth),
- IslCtx(isl_ctx_alloc(), isl_ctx_free), Context(nullptr),
- Affinator(this, LI), AssumedContext(nullptr), InvalidContext(nullptr),
- Schedule(nullptr) {
+ MaxLoopDepth(MaxLoopDepth), IslCtx(isl_ctx_alloc(), isl_ctx_free),
+ Context(nullptr), Affinator(this, LI), AssumedContext(nullptr),
+ InvalidContext(nullptr), Schedule(nullptr) {
isl_options_set_on_error(getIslCtx(), ISL_ON_ERROR_ABORT);
buildContext();
}
@@ -2784,7 +2786,8 @@ void Scop::init(AliasAnalysis &AA, Assum
addUserAssumptions(AC, DT, LI);
buildInvariantEquivalenceClasses(SD);
- buildDomains(&R, SD, DT, LI);
+ if (!buildDomains(&R, SD, DT, LI))
+ return;
// Remove empty and ignored statements.
// Exit early in case there are no executable statements left in this scop.
More information about the llvm-commits
mailing list