[Polly][Isl] Use isl::union_set::unite() instead of isl::union_set::add_set(). NFC
This is part of an effort to reduce the differences between the custom C++ bindings used right now by polly in `lib/External/isl/include/isl/isl-noxceptions.h` and the official isl C++ interface.
Changes made:
- Use `isl::union_set::unite()` instead of `isl::union_set::add_set()`
- `isl-noexceptions.h` has been generated by this https://github.com/patacca/isl/commit/390c44982b5cee7eb43f8f7a80e185e6d21466b2
Depends on D104994
Reviewed By: Meinersbur
Differential Revision: https://reviews.llvm.org/D105444
GitOrigin-RevId: b55aedd0b8cf6dbd6d3d08e1a9a40fd73eb6b2dc
diff --git a/lib/Analysis/DependenceInfo.cpp b/lib/Analysis/DependenceInfo.cpp
index 5f4c293..fc3c7a4 100644
--- a/lib/Analysis/DependenceInfo.cpp
+++ b/lib/Analysis/DependenceInfo.cpp
@@ -192,7 +192,7 @@
static void fixSetToZero(isl::set Zero, isl::union_set *User) {
for (auto i : seq<isl_size>(0, Zero.tuple_dim()))
Zero = Zero.fix_si(isl::dim::set, i, 0);
- *User = User->add_set(Zero);
+ *User = User->unite(Zero);
}
/// Compute the privatization dependences for a given dependency @p Map
diff --git a/lib/External/isl/include/isl/isl-noexceptions.h b/lib/External/isl/include/isl/isl-noexceptions.h
index facb764..d00bc83 100644
--- a/lib/External/isl/include/isl/isl-noexceptions.h
+++ b/lib/External/isl/include/isl/isl-noexceptions.h
@@ -3699,7 +3699,6 @@
inline ctx get_ctx() const;
inline void dump() const;
- inline union_set add_set(set set) const;
inline union_set affine_hull() const;
inline union_set align_params(space model) const;
inline union_set apply(union_map umap) const;
@@ -19740,12 +19739,6 @@
}
-union_set union_set::add_set(set set) const
-{
- auto res = isl_union_set_add_set(copy(), set.release());
- return manage(res);
-}
-
union_set union_set::affine_hull() const
{
auto res = isl_union_set_affine_hull(copy());
diff --git a/lib/Support/ISLTools.cpp b/lib/Support/ISLTools.cpp
index d772b71..ea66aae 100644
--- a/lib/Support/ISLTools.cpp
+++ b/lib/Support/ISLTools.cpp
@@ -229,7 +229,7 @@
isl::union_set Result = isl::union_set::empty(USet.get_space());
for (isl::set Set : USet.get_set_list()) {
isl::set Shifted = shiftDim(Set, Pos, Amount);
- Result = Result.add_set(Shifted);
+ Result = Result.unite(Shifted);
}
return Result;
}
@@ -827,7 +827,7 @@
isl::union_set Expanded = isl::union_set::empty(USet.get_space());
for (isl::set Set : USet.get_set_list()) {
isl::set SetExpanded = expand(Set);
- Expanded = Expanded.add_set(SetExpanded);
+ Expanded = Expanded.unite(SetExpanded);
}
return Expanded;
}
diff --git a/lib/Transform/DeLICM.cpp b/lib/Transform/DeLICM.cpp
index 13b281a..d96d4b2 100644
--- a/lib/Transform/DeLICM.cpp
+++ b/lib/Transform/DeLICM.cpp
@@ -624,7 +624,7 @@
// Find all uses.
for (auto *MA : S->getValueUses(SAI))
- Reads = Reads.add_set(getDomainFor(MA));
+ Reads = Reads.unite(getDomainFor(MA));
// { DomainRead[] -> Scatter[] }
auto ReadSchedule = getScatterFor(Reads);
@@ -885,7 +885,7 @@
auto UniverseWritesDom = isl::union_set::empty(ParamSpace);
for (auto *MA : S->getPHIIncomings(SAI))
- UniverseWritesDom = UniverseWritesDom.add_set(getDomainFor(MA));
+ UniverseWritesDom = UniverseWritesDom.unite(getDomainFor(MA));
auto RelevantWritesTarget = WritesTarget;
if (DelicmOverapproximateWrites)
diff --git a/lib/Transform/MaximalStaticExpansion.cpp b/lib/Transform/MaximalStaticExpansion.cpp
index da2774b..21f7252 100644
--- a/lib/Transform/MaximalStaticExpansion.cpp
+++ b/lib/Transform/MaximalStaticExpansion.cpp
@@ -189,7 +189,7 @@
for (auto Write : Writes) {
auto MapDeps = filterDependences(S, Dependences, Write);
for (isl::map Map : MapDeps.get_map_list())
- WriteDomain = WriteDomain.add_set(Map.range());
+ WriteDomain = WriteDomain.unite(Map.range());
}
// For now, read from original scalar is not possible.
diff --git a/lib/Transform/ZoneAlgo.cpp b/lib/Transform/ZoneAlgo.cpp
index 2c9499d..71c453a 100644
--- a/lib/Transform/ZoneAlgo.cpp
+++ b/lib/Transform/ZoneAlgo.cpp
@@ -336,7 +336,7 @@
// To avoid solving any ILP problems, always add entire arrays instead of
// just the elements that are accessed.
auto ArrayElts = isl::set::universe(AccRelMap.get_space().range());
- AllElts = AllElts.add_set(ArrayElts);
+ AllElts = AllElts.unite(ArrayElts);
if (MA->isRead()) {
// Reject load after store to same location.
@@ -350,7 +350,7 @@
R << ", loading: " << AccRel << ")";
S->getFunction().getContext().diagnose(R);
- IncompatibleElts = IncompatibleElts.add_set(ArrayElts);
+ IncompatibleElts = IncompatibleElts.unite(ArrayElts);
}
Loads = Loads.unite(AccRel);
@@ -367,7 +367,7 @@
R << "store is in a non-affine subregion";
S->getFunction().getContext().diagnose(R);
- IncompatibleElts = IncompatibleElts.add_set(ArrayElts);
+ IncompatibleElts = IncompatibleElts.unite(ArrayElts);
}
// Do not allow more than one store to the same location.
@@ -380,7 +380,7 @@
R << ", storing: " << AccRel << ")";
S->getFunction().getContext().diagnose(R);
- IncompatibleElts = IncompatibleElts.add_set(ArrayElts);
+ IncompatibleElts = IncompatibleElts.unite(ArrayElts);
}
Stores = Stores.unite(AccRel);
diff --git a/unittests/DeLICM/DeLICMTest.cpp b/unittests/DeLICM/DeLICMTest.cpp
index 64318a4..34a7306 100644
--- a/unittests/DeLICM/DeLICMTest.cpp
+++ b/unittests/DeLICM/DeLICMTest.cpp
@@ -27,7 +27,7 @@
for (isl::set Set : USet.get_set_list()) {
isl::space Space = Set.get_space();
isl::set Universe = isl::set::universe(Space);
- Result = Result.add_set(Universe);
+ Result = Result.unite(Universe);
}
return Result;
}
@@ -120,7 +120,7 @@
auto NewSpace = isl::space(Ctx, 0, 1);
NewSpace = NewSpace.set_tuple_id(isl::dim::set, NewId);
auto NewSet = isl::set::universe(NewSpace);
- Universe = Universe.add_set(NewSet);
+ Universe = Universe.unite(NewSet);
// Using the universe, fill missing data.
isl::union_set ExistingOccupied;
