TensorReferenceGroup::originalAccesses use templated isl types

Author: Sven Verdoolaege

tc/core/polyhedral/memory_promotion.cc

@@ -216,31 +216,31 @@ isl::Map<Prefix, Tensor> TensorReferenceGroup::scopedReads() const {
 }
 
 namespace {
-isl::union_map referenceOriginalAccessesImpl(
+isl::UnionMap<Statement, Tensor> referenceOriginalAccessesImpl(
     const TensorReferenceGroup& group,
     AccessType type) {
   if (group.references.size() == 0) {
     throw promotion::GroupingError("no references in the group");
   }
-  auto accesses = isl::union_map::empty(
+  auto accesses = isl::UnionMap<Statement, Tensor>::empty(
       group.references.front()->originalAccess.get_space().params());
 
   for (const auto& ref : group.references) {
     if (ref->type != type) {
       continue;
     }
     auto current = ref->originalAccess;
-    accesses = accesses.unite(isl::union_map(current));
+    accesses = accesses.unite(current.asUnionMap());
   }
   return accesses;
 }
 } // namespace
 
-isl::union_map TensorReferenceGroup::originalWrites() const {
+isl::UnionMap<Statement, Tensor> TensorReferenceGroup::originalWrites() const {
   return referenceOriginalAccessesImpl(*this, AccessType::Write);
 }
 
-isl::union_map TensorReferenceGroup::originalReads() const {
+isl::UnionMap<Statement, Tensor> TensorReferenceGroup::originalReads() const {
   return referenceOriginalAccessesImpl(*this, AccessType::Read);
 }
 

tc/core/polyhedral/memory_promotion.h

@@ -135,9 +135,9 @@ class TensorReferenceGroup {
   // Access relations in terms of Scop domain elements.
   // The resulting union relations have different domain spaces but identical
   // range spaces.
-  isl::union_map originalWrites() const;
-  isl::union_map originalReads() const;
-  isl::union_map originalAccesses() const {
+  isl::UnionMap<Statement, Tensor> originalWrites() const;
+  isl::UnionMap<Statement, Tensor> originalReads() const;
+  isl::UnionMap<Statement, Tensor> originalAccesses() const {
     return originalWrites().unite(originalReads());
   }