private memory: don't use statement ids

Author: ftynse

src/core/polyhedral/memory_promotion_heuristic.cc

@@ -617,7 +617,6 @@ void promoteToRegistersBelowThreads(
       // per-thread-group access relations.
       auto points = activeDomainPoints(root, band);
       auto partialSched = partialSchedule(root, band);
-      auto activeStmts = activeStatements(root, band);
 
       size_t nMappedThreads = 0;
       for (int j = 0; j < points.dim(isl::dim_type::param); ++j) {
@@ -666,7 +665,6 @@ void promoteToRegistersBelowThreads(
               tensorId,
               std::move(group),
               band,
-              activeStmts,
               partialSched);
         }
       }

src/core/polyhedral/scop.cc

@@ -188,19 +188,19 @@ void Scop::promoteGroup(
     bool forceLastExtentOdd) {
   auto activePoints = activeDomainPoints(scheduleRoot(), tree);
 
-  for (const auto& id : activeStmts) {
-    for (const auto& prom : activePromotions_[id]) {
-      if (promotedDecls_.count(prom.groupId) != 0 &&
-          promotedDecls_[prom.groupId].tensorId == tensorId) {
-        // FIXME: allow double promotion if copies are inserted properly,
-        // in particular if the new promotion is strictly smaller in scope
-        // and size than the existing ones (otherwise we would need to find
-        // the all the existing ones and change their copy relations).
-        std::cerr << "FIXME: not promoting because another promotion of tensor "
-                  << promotedDecls_[prom.groupId].tensorId << " is active in "
-                  << id << std::endl;
-        return;
-      }
+  for (const auto& kvp : activePromotions_) {
+    if (kvp.first.intersect(activePoints).is_empty()) {
+      continue;
+    }
+
+    auto groupId = kvp.second.groupId;
+    if (promotedDecls_.count(groupId) != 0 &&
+        promotedDecls_[groupId].tensorId == tensorId) {
+      // FIXME: allow double promotion if copies are inserted properly,
+      // in particular if the new promotion is strictly smaller in scope
+      // and size than the existing ones (otherwise we would need to find
+      // the all the existing ones and change their copy relations).
+      return;
     }
   }