move mapToParameterWithExtent to mapped_scop.cc

Since the previous commit, this function is only called
from within MappedScop::mapThreadsBackward and
MappedScop::mapBlocksForward.  Move it to mapped_scop.cc
such that it can be reworked to only create a single
mapping filter node.

Author: Sven Verdoolaege

tc/core/polyhedral/cuda/mapped_scop.cc

@@ -106,6 +106,45 @@ template <>
 const CudaDim& mappingSize<mapping::ThreadId>(const MappedScop* mscop) {
   return mscop->numThreads;
 }
+
+// Map "pos"-th schedule dimension of the band node identified by "tree" to a
+// _new_ parameter identified by "id" and limited by 0 <= id < extent.  The
+// parameter must not be present in the space of partial schedule of "tree" and
+// extent must be non-zero.  The mapping corresponds to inserting a filter
+// node with condition 'dim % extent = id' where dim is "pos"-th
+// schedule dimension.
+//
+// Returns a pointer to the updated band (below the inserted filter)
+// for call chaining purposes.
+template <typename MappingIdType>
+detail::ScheduleTree* mapToParameterWithExtent(
+    detail::ScheduleTree* root,
+    detail::ScheduleTree* tree,
+    size_t pos,
+    MappingIdType id,
+    size_t extent) {
+  auto band = tree->elemAs<detail::ScheduleTreeElemBand>();
+  CHECK(band) << "expected a band, got " << *tree;
+  CHECK_GE(pos, 0u) << "dimension underflow";
+  CHECK_LT(pos, band->nMember()) << "dimension overflow";
+  CHECK_NE(extent, 0u) << "NYI: mapping to 0";
+
+  auto domain = activeDomainPoints(root, tree).universe();
+
+  // Introduce the "mapping" parameter after checking it is not already present
+  // in the schedule space.
+  CHECK(not band->mupa_.involves_param(id));
+
+  // Create mapping filter by equating the newly introduced
+  // parameter "id" to the "pos"-th schedule dimension modulo its extent.
+  auto upa =
+      band->mupa_.get_union_pw_aff(pos).mod_val(isl::val(tree->ctx_, extent));
+  upa = upa.sub(isl::union_pw_aff::param_on_domain(domain, id));
+  auto filter = upa.zero_union_set();
+  auto mapping =
+      detail::ScheduleTree::makeMappingFilter<MappingIdType>(filter, {id});
+  return insertNodeAbove(root, tree, std::move(mapping))->child({0});
+}
 } // namespace
 
 template <typename MappingTypeId>

tc/core/polyhedral/schedule_transforms-inl.h

@@ -39,35 +39,5 @@ inline detail::ScheduleTree* insertNodeBelow(
   tree->appendChild(std::move(node));
   return tree->child({0});
 }
-
-template <typename MappingIdType>
-inline detail::ScheduleTree* mapToParameterWithExtent(
-    detail::ScheduleTree* root,
-    detail::ScheduleTree* tree,
-    size_t pos,
-    MappingIdType id,
-    size_t extent) {
-  auto band = tree->elemAs<detail::ScheduleTreeElemBand>();
-  CHECK(band) << "expected a band, got " << *tree;
-  CHECK_GE(pos, 0u) << "dimension underflow";
-  CHECK_LT(pos, band->nMember()) << "dimension overflow";
-  CHECK_NE(extent, 0u) << "NYI: mapping to 0";
-
-  auto domain = activeDomainPoints(root, tree).universe();
-
-  // Introduce the "mapping" parameter after checking it is not already present
-  // in the schedule space.
-  CHECK(not band->mupa_.involves_param(id));
-
-  // Create mapping filter by equating the newly introduced
-  // parameter "id" to the "pos"-th schedule dimension modulo its extent.
-  auto upa =
-      band->mupa_.get_union_pw_aff(pos).mod_val(isl::val(tree->ctx_, extent));
-  upa = upa.sub(isl::union_pw_aff::param_on_domain(domain, id));
-  auto filter = upa.zero_union_set();
-  auto mapping =
-      detail::ScheduleTree::makeMappingFilter<MappingIdType>(filter, {id});
-  return insertNodeAbove(root, tree, std::move(mapping))->child({0});
-}
 } // namespace polyhedral
 } // namespace tc

tc/core/polyhedral/schedule_transforms.h

@@ -114,23 +114,6 @@ detail::ScheduleTree* bandScale(
     detail::ScheduleTree* tree,
     const std::vector<size_t>& scales);
 
-// Map "pos"-th schedule dimension of the band node identified by "tree" to a
-// _new_ parameter identified by "id" and limited by 0 <= id < extent.  The
-// parameter must not be present in the space of partial schedule of "tree" and
-// extent must be non-zero.  The mapping corresponds to inserting a filter
-// node with condition 'dim % extent = id' where dim is "pos"-th
-// schedule dimension.
-//
-// Returns a pointer to the updated band (below the inserted filter)
-// for call chaining purposes.
-template <typename MappingIdType>
-detail::ScheduleTree* mapToParameterWithExtent(
-    detail::ScheduleTree* root,
-    detail::ScheduleTree* tree,
-    size_t pos,
-    MappingIdType id,
-    size_t extent);
-
 // Update the top-level conext node by intersecting it with "context".  The
 // top-level context node must be located directly under the root of the tree.
 // If there is no such node, insert one with universe context first.