Merge pull request #532 from facebookresearch/pr/clean_up

assorted clean-ups

Author: skimo-openhub

tc/core/islpp_wrap.h

@@ -23,7 +23,6 @@
 #include "tc/core/check.h"
 #include "tc/core/cuda/cuda_libraries.h"
 #include "tc/core/flags.h"
-#include "tc/core/islpp_wrap.h"
 #include "tc/core/polyhedral/codegen.h"
 #include "tc/core/polyhedral/cuda/codegen.h"
 #include "tc/core/polyhedral/cuda/mapping_types.h"

tc/core/polyhedral/cuda/codegen.cc

@@ -421,15 +421,14 @@ bool isPromotableToRegistersBelow(
     const detail::ScheduleTree* scope,
     isl::multi_union_pw_aff outer,
     isl::multi_union_pw_aff thread) {
-  auto originalAccesses = group.originalAccesses();
-
   if (!accessSubscriptsAreUnrolledLoops(
           group, root, scope, outer.flat_range_product(thread))) {
     return false;
   }
 
+  auto originalAccesses = group.originalAccesses();
   auto map = isl::union_map::from(outer);
-  map = map.range_product(group.originalAccesses());
+  map = map.range_product(originalAccesses);
   map = map.apply_domain(isl::union_map::from(thread));
 
   return map.is_injective();

tc/core/polyhedral/cuda/memory_promotion_heuristic.cc

@@ -73,14 +73,17 @@ isl::union_map partialScheduleImpl(
     const ScheduleTree* root,
     const ScheduleTree* node,
     bool useNode) {
-  auto schedule = isl::null<isl::union_map>();
   auto nodes = node->ancestors(root);
   if (useNode) {
     nodes.push_back(node);
   }
+  TC_CHECK_GT(nodes.size(), 0u) << "root node does not have a prefix schedule";
+  auto domain = root->elemAs<ScheduleTreeElemDomain>();
+  TC_CHECK(domain);
+  auto schedule = isl::union_map::from_domain(domain->domain_);
   for (auto anc : nodes) {
-    if (auto domainElem = anc->elemAs<ScheduleTreeElemDomain>()) {
-      schedule = isl::union_map::from_domain(domainElem->domain_);
+    if (anc->elemAs<ScheduleTreeElemDomain>()) {
+      TC_CHECK(anc == root);
     } else {
       schedule = extendSchedule(anc, schedule);
     }

tc/core/polyhedral/schedule_transforms.cc

@@ -27,7 +27,6 @@
 #include <isl/cpp.h>
 
 #include "tc/core/check.h"
-#include "tc/core/islpp_wrap.h"
 
 namespace isl {