Merge pull request #522 from facebookresearch/pr/clean_up

assorted clean-ups

Author: skimo-openhub

tc/core/polyhedral/cuda/codegen.cc

@@ -528,11 +528,10 @@ isl::multi_aff makeMultiAffAccess(
 
 namespace {
 bool is_identifier_or_nonnegative_integer(isl::ast_expr expr) {
-  if (isl_ast_expr_get_type(expr.get()) == isl_ast_expr_id)
-    return true;
-  if (isl_ast_expr_get_type(expr.get()) != isl_ast_expr_int)
-    return false;
-  return isl::manage(isl_ast_expr_get_val(expr.get())).is_nonneg();
+  if (auto intExpr = expr.as<isl::ast_expr_int>()) {
+    return intExpr.get_val().is_nonneg();
+  }
+  return !expr.as<isl::ast_expr_id>().is_null();
 }
 } // namespace
 

tc/core/polyhedral/memory_promotion.cc

@@ -115,7 +115,7 @@ std::unique_ptr<TensorReferenceGroup> TensorReferenceGroup::makeSingleton(
   return group;
 }
 
-isl::map TensorReferenceGroup::approximateFootprint() const {
+isl::map TensorReferenceGroup::approximateScopedAccesses() const {
   auto scopedDomain = scopedAccesses().domain();
   auto space = approximation.box.get_space();
   auto accessed = isl::map::universe(space).intersect_domain(scopedDomain);
@@ -271,8 +271,8 @@ void joinOverlappingWrites(
       if (g1->isReadOnly() && g2->isReadOnly()) {
         continue;
       }
-      if (g1->approximateFootprint()
-              .intersect(g2->approximateFootprint())
+      if (g1->approximateScopedAccesses()
+              .intersect(g2->approximateScopedAccesses())
               .is_empty()) {
         continue;
       }
@@ -518,7 +518,7 @@ ScheduleTree* insertCopiesUnder(
   auto arrayId =
       promotionSpace.domain().unwrap().get_tuple_id(isl::dim_type::out);
   auto approximatedRead =
-      group.approximateFootprint().intersect_range(tensorElements).wrap();
+      group.approximateScopedAccesses().intersect_range(tensorElements).wrap();
   approximatedRead = approximatedRead.product(promotedFootprint);
   auto readExtension = extension.intersect_range(approximatedRead)
                            .set_tuple_id(isl::dim_type::out, readId);

tc/core/polyhedral/memory_promotion.h

@@ -143,7 +143,7 @@ class TensorReferenceGroup {
 
   // Rectangular overapproximation of the set of tensor elements accessed below
   // and relative to the scoping point.
-  isl::map approximateFootprint() const;
+  isl::map approximateScopedAccesses() const;
 
   isl::multi_aff promotion() const;
   isl::set promotedFootprint() const;

tc/core/polyhedral/schedule_transforms.cc

@@ -363,7 +363,7 @@ ScheduleTree* bandTile(
     return st;
   }
   auto& band = *eb;
-  TC_CHECK(band.permutable_) << "Can't tile an non-permutable band" << band;
+  TC_CHECK(band.permutable_) << "Can't tile a non-permutable band" << band;
 
   auto ts = tileSizes;
   if (band.nMember() > ts.size()) {
@@ -381,9 +381,7 @@ ScheduleTree* bandTile(
   // Create a child, copy of st before outer tiling
   ScheduleTreeUPtr childUPtr = ScheduleTree::makeScheduleTree(*st);
 
-  for (size_t i = 0;
-       i < std::min(static_cast<size_t>(band.nMember()), ts.size());
-       ++i) {
+  for (size_t i = 0; i < band.nMember(); ++i) {
     auto upa = band.mupa_.get_union_pw_aff(i);
     if (ts[i]) {
       upa = upa.scale_down(isl::val(st->ctx_, ts[i])).floor();
@@ -399,7 +397,6 @@ ScheduleTree* bandTile(
   auto ebChild = childUPtr->elemAs<ScheduleTreeElemBand>();
   TC_CHECK(ebChild) << "Not a band: " << *childUPtr;
   auto& childBand = *ebChild;
-  // No need for isl_schedule_band_point, it's almost done
   if (tileOptions & TileOptions::ShiftPointLoops) {
     auto mupa = band.mupa_;
     if (!(tileOptions & TileOptions::ScaleTileLoops)) {

tc/core/polyhedral/schedule_tree.cc

@@ -361,7 +361,7 @@ bool ScheduleTree::operator==(const ScheduleTree& other) const {
     return false;
   }
   TC_CHECK(!other.elemAs<ScheduleTreeElemSet>())
-      << "NYI: isl_node_type::set comparison";
+      << "NYI: ScheduleTreeType::Set comparison";
   for (size_t i = 0; i < children_.size(); ++i) {
     if (*children_[i] != *other.children_[i]) {
       return false;

test/test_cuda_mapper_memory_promotion.cc

@@ -305,7 +305,7 @@ def fun(float(N, M) A, float(N, M) B) -> (C) {
       EXPECT_EQ(
           oneGroup->approximation.size(1),
           isl::val(ctx, std::min(tile2, problemSize2)));
-      auto footprint = tileZero.apply(oneGroup->approximateFootprint());
+      auto footprint = tileZero.apply(oneGroup->approximateScopedAccesses());
       size_t np = npoints(footprint);
       EXPECT_EQ(
           np, std::min(tile1, problemSize1) * std::min(tile2, problemSize2));