promotedFootprint: use templated isl types

Author: Sven Verdoolaege

tc/core/polyhedral/domain_types.h

@@ -3,6 +3,7 @@ namespace polyhedral {
 
 struct Band;
 struct Prefix;
+struct Promoted;
 struct Reduction;
 struct ReductionSchedule;
 struct Scope;

tc/core/polyhedral/memory_promotion.cc

@@ -147,20 +147,20 @@ bool TensorReferenceGroup::isReadOnly() const {
   return result;
 }
 
-isl::set TensorReferenceGroup::promotedFootprint() const {
+isl::Set<Tensor> TensorReferenceGroup::promotedFootprint() const {
   auto space = scopedAccesses().get_space().range();
   auto sizes = approximation.box.get_size();
   if (!sizes.get_space().has_equal_tuples(space)) {
     throw promotion::GroupingError("unexpected dimensionality mismatch");
   }
 
-  isl::set footprint = isl::set::universe(space);
-  auto identity = isl::multi_aff::identity(space.map_from_set());
+  isl::Set<Tensor> footprint = isl::Set<Tensor>::universe(space);
+  auto identity = isl::MultiAff<Tensor, Tensor>::identity(space.map_from_set());
   for (size_t i = 0, e = sizes.size(); i < e; ++i) {
     auto aff = identity.get_aff(i);
     auto size = sizes.get_val(i);
-    footprint =
-        footprint & (isl::aff_set(aff) >= 0) & (isl::aff_set(aff) < size);
+    footprint = footprint & aff.asPwAff().nonneg_set() &
+        (size - aff).asPwAff().pos_set();
   }
   return footprint;
 }
@@ -175,14 +175,14 @@ std::vector<size_t> TensorReferenceGroup::approximationSizes() const {
 }
 
 namespace {
-isl::map referenceScopedAccessesImpl(
+isl::Map<Scope, Tensor> referenceScopedAccessesImpl(
     const TensorReferenceGroup& group,
     AccessType type) {
   if (group.references.size() == 0) {
     throw promotion::GroupingError("no references in the group");
   }
-  auto accesses =
-      isl::map::empty(group.references.front()->scopedAccess.get_space());
+  auto accesses = isl::Map<Scope, Tensor>::empty(
+      group.references.front()->scopedAccess.get_space());
 
   for (const auto& ref : group.references) {
     if (ref->type != type) {
@@ -203,11 +203,11 @@ isl::set TensorReferenceGroup::readFootprint() const {
   return referenceScopedAccessesImpl(*this, AccessType::Read).range();
 }
 
-isl::map TensorReferenceGroup::scopedWrites() const {
+isl::Map<Scope, Tensor> TensorReferenceGroup::scopedWrites() const {
   return referenceScopedAccessesImpl(*this, AccessType::Write);
 }
 
-isl::map TensorReferenceGroup::scopedReads() const {
+isl::Map<Scope, Tensor> TensorReferenceGroup::scopedReads() const {
   return referenceScopedAccessesImpl(*this, AccessType::Read);
 }
 
@@ -509,7 +509,8 @@ ScheduleTree* insertCopiesUnder(
   // control flow, but we should only write back elements that are actually
   // written to.  In any case, intersect the footprint with the set of existing
   // tensor elements.
-  auto promotedFootprint = group.promotedFootprint().set_tuple_id(groupId);
+  auto promotedFootprint =
+      group.promotedFootprint().set_tuple_id<Promoted>(groupId);
   auto scheduleUniverse =
       isl::set::universe(promotionSpace.domain().unwrap().domain());
   auto arrayId = promotionSpace.domain().unwrap().get_map_range_tuple_id();
@@ -518,9 +519,10 @@ ScheduleTree* insertCopiesUnder(
   approximatedRead = approximatedRead.product(promotedFootprint);
   auto readExtension =
       extension.intersect_range(approximatedRead).set_range_tuple_id(readId);
-  auto writtenElements =
-      group.scopedWrites().intersect_range(tensorElements).wrap();
-  writtenElements = writtenElements.product(promotedFootprint);
+  auto writtenElements = group.scopedWrites()
+                             .intersect_range(tensorElements)
+                             .wrap()
+                             .product(promotedFootprint);
   auto writeExtension =
       extension.intersect_range(writtenElements).set_range_tuple_id(writeId);
 

tc/core/polyhedral/memory_promotion.h

@@ -126,9 +126,9 @@ class TensorReferenceGroup {
   }
 
   // Access relations in terms of partial schedule of the scoping point.
-  isl::map scopedWrites() const;
-  isl::map scopedReads() const;
-  isl::map scopedAccesses() const {
+  isl::Map<Scope, Tensor> scopedWrites() const;
+  isl::Map<Scope, Tensor> scopedReads() const;
+  isl::Map<Scope, Tensor> scopedAccesses() const {
     return scopedWrites().unite(scopedReads());
   }
 
@@ -146,7 +146,7 @@ class TensorReferenceGroup {
   isl::map approximateScopedAccesses() const;
 
   isl::multi_aff promotion() const;
-  isl::set promotedFootprint() const;
+  isl::Set<Tensor> promotedFootprint() const;
 
   std::vector<size_t> approximationSizes() const;
 

tc/external/detail/islpp.h

@@ -45,6 +45,11 @@ inline T operator-(T a, T b) {
   return a.sub(b);
 }
 
+template <typename T>
+inline auto operator-(isl::val a, T b) -> decltype(b.add_constant(a)) {
+  return b.neg().add_constant(a);
+}
+
 template <typename T>
 inline T operator&(T S1, T S2) {
   return S1.intersect(S2);