TensorReferenceGroup::approximateScopedAccesses: use templated isl types

Author: Sven Verdoolaege

tc/core/polyhedral/memory_promotion.cc

@@ -114,12 +114,15 @@ std::unique_ptr<TensorReferenceGroup> TensorReferenceGroup::makeSingleton(
   return group;
 }
 
-isl::map TensorReferenceGroup::approximateScopedAccesses() const {
+isl::Map<Scope, Tensor> TensorReferenceGroup::approximateScopedAccesses()
+    const {
   auto scopedDomain = scopedAccesses().domain();
   auto space = approximation.box.get_space();
-  auto accessed = isl::map::universe(space).intersect_domain(scopedDomain);
+  auto accessed =
+      isl::Map<Scope, Tensor>::universe(space).intersect_domain(scopedDomain);
 
-  auto identity = isl::multi_aff::identity(space.range().map_from_set());
+  auto identity =
+      isl::MultiAff<Tensor, Tensor>::identity(space.range().map_from_set());
   for (size_t i = 0; i < approximation.dim(); ++i) {
     auto offset = approximation.lowerBound(i);
     auto stride = approximation.stride(i);
@@ -128,8 +131,8 @@ isl::map TensorReferenceGroup::approximateScopedAccesses() const {
     auto rhs = identity.get_aff(i);
     auto lowerBound = offset * stride + strideOffset;
     auto upperBound = (offset + size) * stride + strideOffset;
-    auto partial =
-        (isl::aff_map(lowerBound) <= rhs) & (isl::aff_map(upperBound) > rhs);
+    auto partial = lowerBound.asPwAff().lt_map((rhs + 1).asPwAff()) &
+        upperBound.asPwAff().gt_map(rhs.asPwAff());
 
     accessed = accessed & partial;
   }
@@ -525,9 +528,9 @@ ScheduleTree* insertCopiesUnder(
   auto arrayId = promotionSpace.domain().unwrap().get_map_range_tuple_id();
   auto approximatedRead =
       group.approximateScopedAccesses().intersect_range(tensorElements).wrap();
-  approximatedRead = approximatedRead.product(promotedFootprint);
+  auto product = approximatedRead.product(promotedFootprint);
   auto readExtension =
-      extension.intersect_range(approximatedRead).set_range_tuple_id(readId);
+      extension.intersect_range(product).set_range_tuple_id(readId);
   auto writtenElements = group.scopedWrites()
                              .intersect_range(tensorElements)
                              .wrap()

tc/core/polyhedral/memory_promotion.h

@@ -143,7 +143,7 @@ class TensorReferenceGroup {
 
   // Rectangular overapproximation of the set of tensor elements accessed below
   // and relative to the scoping point.
-  isl::map approximateScopedAccesses() const;
+  isl::Map<Scope, Tensor> approximateScopedAccesses() const;
 
   isl::MultiAff<isl::Pair<Scope, Tensor>, Tensor> promotion() const;
   isl::Set<Tensor> promotedFootprint() const;