TensorReferenceGroup::promotion: use templated isl types

Author: Sven Verdoolaege

tc/core/polyhedral/cuda/codegen.cc

@@ -723,8 +723,9 @@ void emitMappedTensorAccess(
   // MA = multi_aff, PMA = pw_multi_aff
   auto access =
       makeMultiAffAccess(tensorId, subscripts, context); // MA :: D -> O
-  auto promotion = promotionInfo.group->promotion(); // MA :: [S -> O] -> P
-  promotion = promotion.set_range_tuple_id(promotionInfo.groupId);
+  auto prePromotion = promotionInfo.group->promotion(); // MA :: [S -> O] -> P
+  auto promotion =
+      prePromotion.set_range_tuple_id<Promoted>(promotionInfo.groupId);
   auto iteratorMap = context.iteratorMap(); // PMA :: A -> D
   auto schedule = isl::map::from(promotionInfo.outerSchedule.intersect_domain(
       context.domain())); // map :: D -> S

tc/core/polyhedral/memory_promotion.cc

@@ -373,7 +373,8 @@ TensorGroups TensorReferenceGroup::accessedWithin(
 // elements of the promoted array get assigned different values of the original
 // array in different outer loop iterations; it's impossible to project out the
 // outer schedule dimensions.
-isl::multi_aff TensorReferenceGroup::promotion() const {
+isl::MultiAff<isl::Pair<Scope, Tensor>, Tensor>
+TensorReferenceGroup::promotion() const {
   // access space is S -> O
   auto map = scopedAccesses();
   auto accessSpace = map.get_space();
@@ -384,13 +385,13 @@ isl::multi_aff TensorReferenceGroup::promotion() const {
       isl::MultiAff<isl::Pair<Scope, Tensor>, Scope>::domain_map(accessSpace);
 
   // Lower bounds and offsets space is S -> O; transform into [S -> O] -> O.
-  isl::multi_aff lowerBounds =
+  auto lowerBounds =
       approximation.lowerBounds().pullback(originalSpaceInserter);
-  isl::multi_aff offsets =
-      approximation.strideOffsets.pullback(originalSpaceInserter);
+  auto offsets = approximation.strideOffsets.pullback(originalSpaceInserter);
 
   // Create promotion starting by identity in [S -> O] -> O.
-  auto original = isl::multi_aff::range_map(accessSpace);
+  auto original =
+      isl::MultiAff<isl::Pair<Scope, Tensor>, Tensor>::range_map(accessSpace);
   auto promotion =
       (original - offsets) / approximation.strideValues - lowerBounds;
 

tc/core/polyhedral/memory_promotion.h

@@ -145,7 +145,7 @@ class TensorReferenceGroup {
   // and relative to the scoping point.
   isl::map approximateScopedAccesses() const;
 
-  isl::multi_aff promotion() const;
+  isl::MultiAff<isl::Pair<Scope, Tensor>, Tensor> promotion() const;
   isl::Set<Tensor> promotedFootprint() const;
 
   std::vector<size_t> approximationSizes() const;