Index: include/polly/ScopInfo.h =================================================================== --- include/polly/ScopInfo.h +++ include/polly/ScopInfo.h @@ -1846,7 +1846,7 @@ void propagateDomainConstraintsToRegionExit( BasicBlock *BB, Loop *BBLoop, SmallPtrSetImpl &FinishedExitBlocks, LoopInfo &LI, - DenseMap &InvalidDomainMap); + DenseMap &InvalidDomainMap); /// Compute the union of predecessor domains for @p BB. /// @@ -1874,7 +1874,7 @@ /// @returns True if there was no problem and false otherwise. bool addLoopBoundsToHeaderDomain( Loop *L, LoopInfo &LI, - DenseMap &InvalidDomainMap); + DenseMap &InvalidDomainMap); /// Compute the branching constraints for each basic block in @p R. /// @@ -1888,7 +1888,7 @@ /// @returns True if there was no problem and false otherwise. bool buildDomainsWithBranchConstraints( Region *R, DominatorTree &DT, LoopInfo &LI, - DenseMap &InvalidDomainMap); + DenseMap &InvalidDomainMap); /// Propagate the domain constraints through the region @p R. /// @@ -1902,7 +1902,7 @@ /// @returns True if there was no problem and false otherwise. bool propagateDomainConstraints( Region *R, DominatorTree &DT, LoopInfo &LI, - DenseMap &InvalidDomainMap); + DenseMap &InvalidDomainMap); /// Propagate invalid domains of statements through @p R. /// @@ -1920,7 +1920,7 @@ /// @returns True if there was no problem and false otherwise. bool propagateInvalidStmtDomains( Region *R, DominatorTree &DT, LoopInfo &LI, - DenseMap &InvalidDomainMap); + DenseMap &InvalidDomainMap); /// Compute the domain for each basic block in @p R. /// @@ -1931,9 +1931,8 @@ /// region. /// /// @returns True if there was no problem and false otherwise. - bool - buildDomains(Region *R, DominatorTree &DT, LoopInfo &LI, - DenseMap &InvalidDomainMap); + bool buildDomains(Region *R, DominatorTree &DT, LoopInfo &LI, + DenseMap &InvalidDomainMap); /// Add parameter constraints to @p C that imply a non-empty domain. __isl_give isl_set *addNonEmptyDomainConstraints(__isl_take isl_set *C) const; @@ -2041,9 +2040,8 @@ void buildContext(); /// Add user provided parameter constraints to context (source code). - void addUserAssumptions( - AssumptionCache &AC, DominatorTree &DT, LoopInfo &LI, - DenseMap &InvalidDomainMap); + void addUserAssumptions(AssumptionCache &AC, DominatorTree &DT, LoopInfo &LI, + DenseMap &InvalidDomainMap); /// Add user provided parameter constraints to context (command line). void addUserContext(); Index: lib/Analysis/ScopBuilder.cpp =================================================================== --- lib/Analysis/ScopBuilder.cpp +++ lib/Analysis/ScopBuilder.cpp @@ -964,28 +964,21 @@ scop->buildInvariantEquivalenceClasses(); /// A map from basic blocks to their invalid domains. - DenseMap InvalidDomainMap; + DenseMap InvalidDomainMap; - if (!scop->buildDomains(&R, DT, LI, InvalidDomainMap)) { - for (auto It : InvalidDomainMap) - isl_set_free(It.second); + if (!scop->buildDomains(&R, DT, LI, InvalidDomainMap)) return; - } scop->addUserAssumptions(AC, DT, LI, InvalidDomainMap); // Initialize the invalid domain. for (ScopStmt &Stmt : scop->Stmts) if (Stmt.isBlockStmt()) - Stmt.setInvalidDomain( - isl_set_copy(InvalidDomainMap[Stmt.getEntryBlock()])); + Stmt.setInvalidDomain(InvalidDomainMap[Stmt.getEntryBlock()].copy()); else Stmt.setInvalidDomain( - isl_set_copy(InvalidDomainMap[getRegionNodeBasicBlock( - Stmt.getRegion()->getNode())])); - - for (auto It : InvalidDomainMap) - isl_set_free(It.second); + InvalidDomainMap[getRegionNodeBasicBlock(Stmt.getRegion()->getNode())] + .copy()); // Remove empty statements. // Exit early in case there are no executable statements left in this scop. Index: lib/Analysis/ScopInfo.cpp =================================================================== --- lib/Analysis/ScopInfo.cpp +++ lib/Analysis/ScopInfo.cpp @@ -1483,10 +1483,10 @@ __isl_give isl_pw_aff * getPwAff(Scop &S, BasicBlock *BB, - DenseMap &InvalidDomainMap, - const SCEV *E, bool NonNegative = false) { + DenseMap &InvalidDomainMap, const SCEV *E, + bool NonNegative = false) { PWACtx PWAC = S.getPwAff(E, BB, NonNegative); - InvalidDomainMap[BB] = isl_set_union(InvalidDomainMap[BB], PWAC.second); + InvalidDomainMap[BB] = InvalidDomainMap[BB].unite(isl::manage(PWAC.second)); return PWAC.first; } @@ -1495,11 +1495,11 @@ /// This will fill @p ConditionSets with the conditions under which control /// will be moved from @p SI to its successors. Hence, @p ConditionSets will /// have as many elements as @p SI has successors. -static bool buildConditionSets( - Scop &S, BasicBlock *BB, SwitchInst *SI, Loop *L, - __isl_keep isl_set *Domain, - DenseMap &InvalidDomainMap, - SmallVectorImpl<__isl_give isl_set *> &ConditionSets) { +static bool +buildConditionSets(Scop &S, BasicBlock *BB, SwitchInst *SI, Loop *L, + __isl_keep isl_set *Domain, + DenseMap &InvalidDomainMap, + SmallVectorImpl<__isl_give isl_set *> &ConditionSets) { Value *Condition = getConditionFromTerminator(SI); assert(Condition && "No condition for switch"); @@ -1542,11 +1542,11 @@ /// have as many elements as @p TI has successors. If @p TI is nullptr the /// context under which @p Condition is true/false will be returned as the /// new elements of @p ConditionSets. -static bool buildConditionSets( - Scop &S, BasicBlock *BB, Value *Condition, TerminatorInst *TI, Loop *L, - __isl_keep isl_set *Domain, - DenseMap &InvalidDomainMap, - SmallVectorImpl<__isl_give isl_set *> &ConditionSets) { +static bool +buildConditionSets(Scop &S, BasicBlock *BB, Value *Condition, + TerminatorInst *TI, Loop *L, __isl_keep isl_set *Domain, + DenseMap &InvalidDomainMap, + SmallVectorImpl<__isl_give isl_set *> &ConditionSets) { isl_set *ConsequenceCondSet = nullptr; if (auto *CCond = dyn_cast(Condition)) { @@ -1633,11 +1633,11 @@ /// This will fill @p ConditionSets with the conditions under which control /// will be moved from @p TI to its successors. Hence, @p ConditionSets will /// have as many elements as @p TI has successors. -static bool buildConditionSets( - Scop &S, BasicBlock *BB, TerminatorInst *TI, Loop *L, - __isl_keep isl_set *Domain, - DenseMap &InvalidDomainMap, - SmallVectorImpl<__isl_give isl_set *> &ConditionSets) { +static bool +buildConditionSets(Scop &S, BasicBlock *BB, TerminatorInst *TI, Loop *L, + __isl_keep isl_set *Domain, + DenseMap &InvalidDomainMap, + SmallVectorImpl<__isl_give isl_set *> &ConditionSets) { if (SwitchInst *SI = dyn_cast(TI)) return buildConditionSets(S, BB, SI, L, Domain, InvalidDomainMap, @@ -2161,7 +2161,7 @@ void Scop::addUserAssumptions( AssumptionCache &AC, DominatorTree &DT, LoopInfo &LI, - DenseMap &InvalidDomainMap) { + DenseMap &InvalidDomainMap) { auto &F = getFunction(); for (auto &Assumption : AC.assumptions()) { auto *CI = dyn_cast_or_null(Assumption); @@ -2658,9 +2658,8 @@ return getDomainConditions(BBR->getEntry()); } -bool Scop::buildDomains( - Region *R, DominatorTree &DT, LoopInfo &LI, - DenseMap &InvalidDomainMap) { +bool Scop::buildDomains(Region *R, DominatorTree &DT, LoopInfo &LI, + DenseMap &InvalidDomainMap) { bool IsOnlyNonAffineRegion = isNonAffineSubRegion(R); auto *EntryBB = R->getEntry(); @@ -2673,7 +2672,7 @@ L = L->getParentLoop(); } - InvalidDomainMap[EntryBB] = isl_set_empty(isl_set_get_space(S)); + InvalidDomainMap[EntryBB] = isl::manage(isl_set_empty(isl_set_get_space(S))); DomainMap[EntryBB] = S; if (IsOnlyNonAffineRegion) @@ -2755,7 +2754,7 @@ bool Scop::propagateInvalidStmtDomains( Region *R, DominatorTree &DT, LoopInfo &LI, - DenseMap &InvalidDomainMap) { + DenseMap &InvalidDomainMap) { ReversePostOrderTraversal RTraversal(R); for (auto *RN : RTraversal) { @@ -2775,7 +2774,7 @@ isl_set *&Domain = DomainMap[BB]; assert(Domain && "Cannot propagate a nullptr"); - auto *InvalidDomain = InvalidDomainMap[BB]; + auto *InvalidDomain = InvalidDomainMap[BB].copy(); bool IsInvalidBlock = ContainsErrorBlock || isl_set_is_subset(Domain, InvalidDomain); @@ -2792,7 +2791,7 @@ } if (isl_set_is_empty(InvalidDomain)) { - InvalidDomainMap[BB] = InvalidDomain; + InvalidDomainMap[BB] = isl::manage(InvalidDomain); continue; } @@ -2815,13 +2814,13 @@ auto *AdjustedInvalidDomain = adjustDomainDimensions( *this, isl_set_copy(InvalidDomain), BBLoop, SuccBBLoop); - auto *SuccInvalidDomain = InvalidDomainMap[SuccBB]; + auto *SuccInvalidDomain = InvalidDomainMap[SuccBB].copy(); SuccInvalidDomain = isl_set_union(SuccInvalidDomain, AdjustedInvalidDomain); SuccInvalidDomain = isl_set_coalesce(SuccInvalidDomain); unsigned NumConjucts = isl_set_n_basic_set(SuccInvalidDomain); - InvalidDomainMap[SuccBB] = SuccInvalidDomain; + InvalidDomainMap[SuccBB] = isl::manage(SuccInvalidDomain); // Check if the maximal number of domain disjunctions was reached. // In case this happens we will bail. @@ -2834,7 +2833,7 @@ return false; } - InvalidDomainMap[BB] = InvalidDomain; + InvalidDomainMap[BB] = isl::manage(InvalidDomain); } return true; @@ -2843,7 +2842,7 @@ void Scop::propagateDomainConstraintsToRegionExit( BasicBlock *BB, Loop *BBLoop, SmallPtrSetImpl &FinishedExitBlocks, LoopInfo &LI, - DenseMap &InvalidDomainMap) { + DenseMap &InvalidDomainMap) { // Check if the block @p BB is the entry of a region. If so we propagate it's // domain to the exit block of the region. Otherwise we are done. @@ -2882,17 +2881,15 @@ ExitDomain ? isl_set_union(AdjustedDomain, ExitDomain) : AdjustedDomain; // Initialize the invalid domain. - auto IDIt = InvalidDomainMap.find(ExitBB); - if (IDIt != InvalidDomainMap.end()) - isl_set_free(IDIt->getSecond()); - InvalidDomainMap[ExitBB] = isl_set_empty(isl_set_get_space(ExitDomain)); + InvalidDomainMap[ExitBB] = + isl::manage(isl_set_empty(isl_set_get_space(ExitDomain))); FinishedExitBlocks.insert(ExitBB); } bool Scop::buildDomainsWithBranchConstraints( Region *R, DominatorTree &DT, LoopInfo &LI, - DenseMap &InvalidDomainMap) { + DenseMap &InvalidDomainMap) { // To create the domain for each block in R we iterate over all blocks and // subregions in R and propagate the conditions under which the current region @@ -3004,10 +3001,8 @@ SuccDomain = isl_set_coalesce(isl_set_union(SuccDomain, CondSet)); } else { // Initialize the invalid domain. - auto IDIt = InvalidDomainMap.find(SuccBB); - if (IDIt != InvalidDomainMap.end()) - isl_set_free(IDIt->getSecond()); - InvalidDomainMap[SuccBB] = isl_set_empty(isl_set_get_space(CondSet)); + InvalidDomainMap[SuccBB] = + isl::manage(isl_set_empty(isl_set_get_space(CondSet))); SuccDomain = CondSet; } @@ -3087,7 +3082,7 @@ bool Scop::propagateDomainConstraints( Region *R, DominatorTree &DT, LoopInfo &LI, - DenseMap &InvalidDomainMap) { + DenseMap &InvalidDomainMap) { // Iterate over the region R and propagate the domain constrains from the // predecessors to the current node. In contrast to the // buildDomainsWithBranchConstraints function, this one will pull the domain @@ -3153,8 +3148,7 @@ } bool Scop::addLoopBoundsToHeaderDomain( - Loop *L, LoopInfo &LI, - DenseMap &InvalidDomainMap) { + Loop *L, LoopInfo &LI, DenseMap &InvalidDomainMap) { int LoopDepth = getRelativeLoopDepth(L); assert(LoopDepth >= 0 && "Loop in region should have at least depth one");