diff --git a/polly/lib/Analysis/DependenceInfo.cpp b/polly/lib/Analysis/DependenceInfo.cpp --- a/polly/lib/Analysis/DependenceInfo.cpp +++ b/polly/lib/Analysis/DependenceInfo.cpp @@ -660,7 +660,7 @@ if (ScheduleSpace.is_null()) ScheduleSpace = StmtScat.get_space().range(); - Schedule = Schedule.add_map(StmtScat); + Schedule = Schedule.unite(StmtScat); } Dependences = Dependences.apply_domain(Schedule); diff --git a/polly/lib/Analysis/ScopBuilder.cpp b/polly/lib/Analysis/ScopBuilder.cpp --- a/polly/lib/Analysis/ScopBuilder.cpp +++ b/polly/lib/Analysis/ScopBuilder.cpp @@ -3369,7 +3369,7 @@ isl::union_map Accesses = isl::union_map::empty(scop->getIslCtx()); for (MemoryAccess *MA : AliasGroup) - Accesses = Accesses.add_map(MA->getAccessRelation()); + Accesses = Accesses.unite(MA->getAccessRelation()); Accesses = Accesses.intersect_domain(Domains); isl::union_set Locations = Accesses.range(); diff --git a/polly/lib/Analysis/ScopInfo.cpp b/polly/lib/Analysis/ScopInfo.cpp --- a/polly/lib/Analysis/ScopInfo.cpp +++ b/polly/lib/Analysis/ScopInfo.cpp @@ -2324,7 +2324,7 @@ isl::set Domain = Stmt.getDomain(); isl::map AccessDomain = MA->getAccessRelation(); AccessDomain = AccessDomain.intersect_domain(Domain); - Accesses = Accesses.add_map(AccessDomain); + Accesses = Accesses.unite(AccessDomain); } } diff --git a/polly/lib/Exchange/JSONExporter.cpp b/polly/lib/Exchange/JSONExporter.cpp --- a/polly/lib/Exchange/JSONExporter.cpp +++ b/polly/lib/Exchange/JSONExporter.cpp @@ -324,9 +324,9 @@ auto ScheduleMap = isl::union_map::empty(S.getIslCtx()); for (ScopStmt &Stmt : S) { if (NewSchedule.find(&Stmt) != NewSchedule.end()) - ScheduleMap = ScheduleMap.add_map(NewSchedule[&Stmt]); + ScheduleMap = ScheduleMap.unite(NewSchedule[&Stmt]); else - ScheduleMap = ScheduleMap.add_map(Stmt.getSchedule()); + ScheduleMap = ScheduleMap.unite(Stmt.getSchedule()); } S.setSchedule(ScheduleMap); diff --git a/polly/lib/External/isl/include/isl/isl-noexceptions.h b/polly/lib/External/isl/include/isl/isl-noexceptions.h --- a/polly/lib/External/isl/include/isl/isl-noexceptions.h +++ b/polly/lib/External/isl/include/isl/isl-noexceptions.h @@ -3211,7 +3211,6 @@ inline isl::ctx ctx() const; inline void dump() const; - inline isl::union_map add_map(isl::map map) const; inline isl::union_map affine_hull() const; inline isl::union_map align_params(isl::space model) const; inline isl::union_map apply_domain(isl::union_map umap2) const; @@ -17463,12 +17462,6 @@ } -isl::union_map union_map::add_map(isl::map map) const -{ - auto res = isl_union_map_add_map(copy(), map.release()); - return manage(res); -} - isl::union_map union_map::affine_hull() const { auto res = isl_union_map_affine_hull(copy()); diff --git a/polly/lib/Support/ISLTools.cpp b/polly/lib/Support/ISLTools.cpp --- a/polly/lib/Support/ISLTools.cpp +++ b/polly/lib/Support/ISLTools.cpp @@ -94,7 +94,7 @@ for (isl::map Map : UMap.get_map_list()) { isl::map After = beforeScatter(Map, Strict); - Result = Result.add_map(After); + Result = Result.unite(After); } return Result; @@ -111,7 +111,7 @@ isl::union_map Result = isl::union_map::empty(UMap.ctx()); for (isl::map Map : UMap.get_map_list()) { isl::map After = afterScatter(Map, Strict); - Result = Result.add_map(After); + Result = Result.unite(After); } return Result; } @@ -191,7 +191,7 @@ isl::union_map Result = isl::union_map::empty(USet.ctx()); for (isl::set Set : USet.get_set_list()) { isl::map IdentityMap = makeIdentityMap(Set, RestrictDomain); - Result = Result.add_map(IdentityMap); + Result = Result.unite(IdentityMap); } return Result; } @@ -208,7 +208,7 @@ isl::union_map Result = isl::union_map::empty(UMap.ctx()); for (isl::map Map : UMap.get_map_list()) { auto Reversed = reverseDomain(std::move(Map)); - Result = Result.add_map(Reversed); + Result = Result.unite(Reversed); } return Result; } @@ -269,7 +269,7 @@ for (isl::map Map : UMap.get_map_list()) { isl::map Shifted = shiftDim(Map, Dim, Pos, Amount); - Result = Result.add_map(Shifted); + Result = Result.unite(Shifted); } return Result; } @@ -489,7 +489,7 @@ isl::union_map Result = isl::union_map::empty(UMap.ctx()); for (isl::map Map : UMap.get_map_list()) { auto Distributed = distributeDomain(Map); - Result = Result.add_map(Distributed); + Result = Result.unite(Distributed); } return Result; } diff --git a/polly/lib/Transform/FlattenAlgo.cpp b/polly/lib/Transform/FlattenAlgo.cpp --- a/polly/lib/Transform/FlattenAlgo.cpp +++ b/polly/lib/Transform/FlattenAlgo.cpp @@ -119,7 +119,7 @@ auto Result = isl::union_map::empty(UMap.ctx()); for (isl::map Map : UMap.get_map_list()) { auto Outprojected = Map.project_out(isl::dim::out, first, n); - Result = Result.add_map(Outprojected); + Result = Result.unite(Outprojected); } return Result; } @@ -147,7 +147,7 @@ unsigned MapDims = Map.range_tuple_dim(); isl::map SingleMap = Map.project_out(isl::dim::out, 0, pos); SingleMap = SingleMap.project_out(isl::dim::out, 1, MapDims - pos - 1); - SingleUMap = SingleUMap.add_map(SingleMap); + SingleUMap = SingleUMap.unite(SingleMap); }; auto UAff = isl::union_pw_multi_aff(SingleUMap); diff --git a/polly/lib/Transform/ForwardOpTree.cpp b/polly/lib/Transform/ForwardOpTree.cpp --- a/polly/lib/Transform/ForwardOpTree.cpp +++ b/polly/lib/Transform/ForwardOpTree.cpp @@ -584,7 +584,7 @@ (void)Access; if (!LocalTranslator.is_null()) - Translator = Translator.add_map(LocalTranslator); + Translator = Translator.unite(LocalTranslator); NumKnownLoadsForwarded++; TotalKnownLoadsForwarded++; diff --git a/polly/lib/Transform/MaximalStaticExpansion.cpp b/polly/lib/Transform/MaximalStaticExpansion.cpp --- a/polly/lib/Transform/MaximalStaticExpansion.cpp +++ b/polly/lib/Transform/MaximalStaticExpansion.cpp @@ -161,7 +161,7 @@ continue; // Add the corresponding map to MapDependences. - MapDependences = MapDependences.add_map(NewMap); + MapDependences = MapDependences.unite(NewMap); } return MapDependences; diff --git a/polly/lib/Transform/ScheduleTreeTransform.cpp b/polly/lib/Transform/ScheduleTreeTransform.cpp --- a/polly/lib/Transform/ScheduleTreeTransform.cpp +++ b/polly/lib/Transform/ScheduleTreeTransform.cpp @@ -248,7 +248,7 @@ if (OuterDims > 0) { isl::map OuterSched = Ext.project_out(isl::dim::in, OuterDims, BandDims); - OuterExtensions = OuterExtensions.add_map(OuterSched); + OuterExtensions = OuterExtensions.unite(OuterSched); } } isl::multi_union_pw_aff NewPartialSchedAsAsMultiUnionPwAff = diff --git a/polly/lib/Transform/Simplify.cpp b/polly/lib/Transform/Simplify.cpp --- a/polly/lib/Transform/Simplify.cpp +++ b/polly/lib/Transform/Simplify.cpp @@ -81,7 +81,7 @@ return MA->isWrite() && MA->isOriginalScalarKind(); } -/// Like isl::union_map::add_map, but may also return an underapproximated +/// Like isl::union_map::unite, but may also return an underapproximated /// result if getting too complex. /// /// This is implemented by adding disjuncts to the results until the limit is @@ -97,7 +97,7 @@ // them. if (isl_map_n_basic_map(PrevMap.get()) + isl_map_n_basic_map(Map.get()) <= SimplifyMaxDisjuncts) - return UMap.add_map(Map); + return UMap.unite(Map); isl::map Result = isl::map::empty(PrevMap.get_space()); for (isl::basic_map BMap : PrevMap.get_basic_map_list()) { @@ -113,7 +113,7 @@ isl::union_map UResult = UMap.subtract(isl::map::universe(PrevMap.get_space())); - UResult.add_map(Result); + UResult.unite(Result); return UResult; } @@ -451,7 +451,7 @@ .get_tuple_id(isl::dim::out) .get_user(); if (!TouchedAccesses.count(MA)) - NewFutureWrites = NewFutureWrites.add_map(FutureWrite); + NewFutureWrites = NewFutureWrites.unite(FutureWrite); } FutureWrites = NewFutureWrites; @@ -467,7 +467,7 @@ // { [Domain[] -> Element[]] -> [Value[] -> MemoryAccess[]] } isl::map AccRelValAcc = isl::map::from_domain_and_range(AccRelWrapped, ValAccSet.wrap()); - FutureWrites = FutureWrites.add_map(AccRelValAcc); + FutureWrites = FutureWrites.unite(AccRelValAcc); } } } @@ -551,7 +551,7 @@ isl::map AccRelVal = isl::map::from_domain_and_range( AccRelWrapped, makeValueSet(LoadedVal)); - Known = Known.add_map(AccRelVal); + Known = Known.unite(AccRelVal); } } else if (MA->isWrite()) { // Remove (possibly) overwritten values from the known elements set. diff --git a/polly/lib/Transform/ZoneAlgo.cpp b/polly/lib/Transform/ZoneAlgo.cpp --- a/polly/lib/Transform/ZoneAlgo.cpp +++ b/polly/lib/Transform/ZoneAlgo.cpp @@ -253,7 +253,7 @@ isl::union_map Result = isl::union_map::empty(UMap.ctx()); for (isl::map Map : UMap.get_map_list()) { if (!isMapToUnknown(Map)) - Result = Result.add_map(Map); + Result = Result.unite(Map); } return Result; } @@ -394,7 +394,7 @@ // { DomainRead[] -> Element[] } auto AccRel = intersectRange(getAccessRelationFor(MA), CompatibleElts); - AllReads = AllReads.add_map(AccRel); + AllReads = AllReads.unite(AccRel); if (LoadInst *Load = dyn_cast_or_null(MA->getAccessInstruction())) { // { DomainRead[] -> ValInst[] } @@ -407,7 +407,7 @@ // { [Element[] -> DomainRead[]] -> ValInst[] } isl::map EltLoadValInst = LoadValInst.apply_domain(IncludeElement); - AllReadValInst = AllReadValInst.add_map(EltLoadValInst); + AllReadValInst = AllReadValInst.unite(EltLoadValInst); } } @@ -452,10 +452,10 @@ isl::map AccRel = intersectRange(getAccessRelationFor(MA), CompatibleElts); if (MA->isMustWrite()) - AllMustWrites = AllMustWrites.add_map(AccRel); + AllMustWrites = AllMustWrites.unite(AccRel); if (MA->isMayWrite()) - AllMayWrites = AllMayWrites.add_map(AccRel); + AllMayWrites = AllMayWrites.unite(AccRel); // { Domain[] -> ValInst[] } isl::union_map WriteValInstance = getWrittenValue(MA, AccRel); @@ -556,7 +556,7 @@ // Collect all incoming block timepoints. for (MemoryAccess *MA : S->getPHIIncomings(SAI)) { isl::map Scatter = getScatterFor(MA); - PHIWriteScatter = PHIWriteScatter.add_map(Scatter); + PHIWriteScatter = PHIWriteScatter.unite(Scatter); } // { DomainPHIRead[] -> Scatter[] } @@ -853,7 +853,7 @@ // Instructions within the SCoP are always wrapped. Non-wrapped tuples // are therefore invariant in the SCoP and don't need normalization. if (!RangeSpace.is_wrapping()) { - Result = Result.add_map(Map); + Result = Result.unite(Map); continue; } @@ -862,7 +862,7 @@ // If no normalization is necessary, then the ValInst stands for itself. if (!ComputedPHIs.count(PHI)) { - Result = Result.add_map(Map); + Result = Result.unite(Map); continue; } @@ -1057,7 +1057,7 @@ isl::map IncomingValInst = makeValInst( IncomingVal, IncomingStmt, IncomingStmt->getSurroundingLoop()); - IncomingValInsts = IncomingValInsts.add_map(IncomingValInst); + IncomingValInsts = IncomingValInsts.unite(IncomingValInst); } // { PHIValInst[] -> IncomingValInst[] } diff --git a/polly/unittests/DeLICM/DeLICMTest.cpp b/polly/unittests/DeLICM/DeLICMTest.cpp --- a/polly/unittests/DeLICM/DeLICMTest.cpp +++ b/polly/unittests/DeLICM/DeLICMTest.cpp @@ -53,7 +53,7 @@ for (isl::map Map : OccupiedAndKnown.get_map_list()) { if (!Map.has_tuple_name(isl::dim::out)) continue; - Known = Known.add_map(Map); + Known = Known.unite(Map); } }