Merge pull request #315 from facebookresearch/pr/involves_param

use isl::*.involves_param()

Author: skimo-openhub

tc/core/polyhedral/cuda/tighten_launch_bounds.cc

@@ -48,8 +48,7 @@ std::pair<size_t, size_t> rangeOfMappingParameter(
     mapping::MappingId mappingId) {
   auto active =
       activeDomainPoints(root, node).intersect_params(context).params();
-  int pos = active.find_dim_by_id(isl::dim_type::param, mappingId);
-  if (pos < 0) {
+  if (!active.involves_param(mappingId)) {
     return std::make_pair(0, std::numeric_limits<size_t>::max());
   }
   isl::aff a(isl::aff::param_on_domain_space(active.get_space(), mappingId));

tc/core/polyhedral/schedule_transforms-inl.h

@@ -62,15 +62,7 @@ inline detail::ScheduleTree* mapToParameterWithExtent(
 
   // Introduce the "mapping" parameter after checking it is not already present
   // in the schedule space.
-  auto space = band->mupa_.get_space();
-  int idPos = space.find_dim_by_id(isl::dim_type::param, id);
-  if (idPos != -1) {
-    for (auto upa : isl::MUPA(band->mupa_)) {
-      for (auto pa : upa) {
-        CHECK(not pa.pa.involves_dims(isl::dim_type::param, pos, 1));
-      }
-    }
-  }
+  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.

tc/core/polyhedral/schedule_tree_elem.h

@@ -152,27 +152,24 @@ struct ScheduleTreeElemMappingFilter : public ScheduleTreeElemFilter {
           typename mapping::MappingId::Hash>& ids)
       : ScheduleTreeElemFilter(us), mappingIds(ids) {
     USING_MAPPING_SHORT_NAMES(BX, BY, BZ, TX, TY, TZ);
-    for (auto s : us.get_set_list()) {
-      for (auto id : std::vector<mapping::MappingId>{BX, BY, BZ, TX, TY, TZ}) {
-        if (mappingIds.count(id) > 0) {
-          CHECK_EQ(1u, ids.count(id)) << "id: " << id << " mapped >1 times";
-          CHECK_LE(0, s.find_dim_by_id(isl::dim_type::param, id))
+    for (auto id : std::vector<mapping::MappingId>{BX, BY, BZ, TX, TY, TZ}) {
+      if (mappingIds.count(id) > 0) {
+        CHECK_EQ(1u, ids.count(id)) << "id: " << id << " mapped >1 times";
+        for (auto s : us.get_set_list()) {
+          CHECK(s.involves_param(id))
               << "unexpected missing id: " << id << " in filter: " << s;
-        } else {
-          auto pos = s.find_dim_by_id(isl::dim_type::param, id);
-          bool involved =
-              pos > 0 && s.involves_dims(isl::dim_type::param, pos, 1);
-          if (involved) {
-            std::stringstream ss;
-            for (auto id : ids) {
-              ss << id.to_str() << " ";
-            }
-            // TODO: will need to relax this if we map the same loop
-            // iteratively without stripmining it beforehand
-            CHECK(false) << "unexpected involved id: " << id
-                         << " in filter: " << s
-                         << " but not present in filter id list: " << ss.str();
+        }
+      } else {
+        if (us.involves_param(id)) {
+          std::stringstream ss;
+          for (auto id : ids) {
+            ss << id.to_str() << " ";
           }
+          // TODO: will need to relax this if we map the same loop
+          // iteratively without stripmining it beforehand
+          CHECK(false) << "unexpected involved id: " << id
+                       << " in filter: " << us
+                       << " but not present in filter id list: " << ss.str();
         }
       }
     }

tc/external/detail/isl_mu_wrappers.h

@@ -84,51 +84,6 @@ namespace isl {
 // multi_aff is a vector-valued function, but just a plain aff is a
 // scalar-valued multivariate function plus parameters everywhere.
 
-// Use the following API as follows:
-//   isl::MUPA M(mupa);
-//   cout << "MUPA: " << M.mupa << endl;
-//   cout << "UPA: " << M[0].upa << endl;
-//   cout << "PA: " << M[0][0].pa << endl;
-//   cout << "PA[0] set: " << M[0][0][0].first << endl;
-//   cout << "PA[0] aff: " << M[0][0][0].second << endl;
-//
-
-/* WARNING: this does not allow inplace modifications .. ugh */
-struct PA : std::vector<std::pair<isl::set, isl::aff>> {
-  explicit PA(isl::pw_aff pa_) : pa(pa_) {
-    this->reserve(pa.n_piece());
-    auto f = [&](isl::set s, isl::aff a) {
-      this->push_back(std::make_pair(s, a));
-    };
-    pa.foreach_piece(f);
-  }
-  isl::pw_aff pa;
-};
-
-/* WARNING: this does not allow inplace modifications .. ugh */
-struct UPA : std::vector<PA> {
-  explicit UPA(isl::union_pw_aff upa_) : upa(upa_) {
-    std::vector<PA> res;
-    auto f = [&](isl::pw_aff pa) { this->push_back(PA(pa)); };
-    upa.foreach_pw_aff(f);
-  }
-  PA extract(isl::space s) const {
-    return PA(upa.extract_pw_aff(s));
-  }
-  isl::union_pw_aff upa;
-};
-
-/* WARNING: this does not allow inplace modifications .. ugh */
-struct MUPA : std::vector<UPA> {
-  explicit MUPA(isl::multi_union_pw_aff mupa_) : mupa(mupa_) {
-    this->reserve(mupa.dim(isl::dim_type::set));
-    for (size_t i = 0; i < mupa.dim(isl::dim_type::set); ++i) {
-      this->push_back(UPA(mupa.get_union_pw_aff(i)));
-    }
-  }
-  isl::multi_union_pw_aff mupa;
-};
-
 template <typename T, isl::dim_type DT>
 struct DimIds : public std::vector<isl::id> {
   DimIds(T s) {