Merge pull request #9131 from gadfort/psm-report-shapes

psm: report disconnected shapes instead of nodes

Author: maliberty

src/psm/src/ir_network.h

@@ -113,6 +113,7 @@ class IRNetwork
   NodePtrMap<Connection> getConnectionMap() const;
 
   std::map<odb::dbInst*, Node::NodeSet> getInstanceNodeMapping() const;
+  ShapeTree getShapeTree(odb::dbTechLayer* layer) const;
 
   // For debug only
   void dumpNodes(const std::map<Node*, std::size_t>& node_map,
@@ -178,7 +179,6 @@ class IRNetwork
 
   TerminalTree getTerminalTree(
       const std::vector<TerminalNode*>& terminals) const;
-  ShapeTree getShapeTree(odb::dbTechLayer* layer) const;
   NodeTree getNodeTree(odb::dbTechLayer* layer) const;
 
   void initMinimumNodePitch();

src/psm/src/ir_solver.cpp

@@ -285,25 +285,70 @@ void IRSolver::reportUnconnectedNodes() const
       tool_category, net_->getName().c_str());
 
   if (!results.unconnected_nodes.empty()) {
+    if (logger_->debugCheck(utl::PSM, "reportnodes", 1)) {
+      odb::dbMarkerCategory* category
+          = odb::dbMarkerCategory::create(net_category, "Unconnected node");
+      for (auto* node : results.unconnected_nodes) {
+        logger_->warn(utl::PSM,
+                      42,
+                      "Unconnected node on net {} at location ({:4.3f}um, "
+                      "{:4.3f}um), layer: {}.",
+                      net_->getName(),
+                      node->getPoint().getX() / dbu,
+                      node->getPoint().getY() / dbu,
+                      node->getLayer()->getName());
+
+        odb::dbMarker* marker = odb::dbMarker::create(category);
+        if (marker == nullptr) {
+          continue;
+        }
+        marker->addSource(net_);
+        marker->setTechLayer(node->getLayer());
+        marker->addShape(node->getPoint());
+      }
+    }
+    std::map<odb::dbTechLayer*, IRNetwork::ShapeTree> shapes;
     odb::dbMarkerCategory* category
-        = odb::dbMarkerCategory::create(net_category, "Unconnected node");
-    for (auto* node : results.unconnected_nodes) {
-      logger_->warn(utl::PSM,
-                    38,
-                    "Unconnected node on net {} at location ({:4.3f}um, "
-                    "{:4.3f}um), layer: {}.",
-                    net_->getName(),
-                    node->getPoint().getX() / dbu,
-                    node->getPoint().getY() / dbu,
-                    node->getLayer()->getName());
+        = odb::dbMarkerCategory::create(net_category, "Unconnected shape");
 
-      odb::dbMarker* marker = odb::dbMarker::create(category);
-      if (marker == nullptr) {
-        continue;
+    std::set<const Shape*> reported_shapes;
+    for (auto* node : results.unconnected_nodes) {
+      if (shapes.find(node->getLayer()) == shapes.end()) {
+        // get tree is not found
+        shapes[node->getLayer()] = network_->getShapeTree(node->getLayer());
+      }
+      const auto& layer_shapes = shapes[node->getLayer()];
+      for (auto itr = layer_shapes.qbegin(
+               boost::geometry::index::intersects(node->getPoint()));
+           itr != layer_shapes.qend();
+           itr++) {
+        const Shape* shape = *itr;
+
+        if (reported_shapes.find(shape) != reported_shapes.end()) {
+          continue;
+        }
+        reported_shapes.insert(shape);
+
+        const odb::Rect rect = shape->getShape();
+        logger_->warn(utl::PSM,
+                      38,
+                      "Unconnected shape on net {} at ({:4.3f}um, "
+                      "{:4.3f}um) - ({:4.3f}um, {:4.3f}um), layer: {}.",
+                      net_->getName(),
+                      rect.xMin() / dbu,
+                      rect.yMin() / dbu,
+                      rect.xMax() / dbu,
+                      rect.yMax() / dbu,
+                      shape->getLayer()->getName());
+
+        odb::dbMarker* marker = odb::dbMarker::create(category);
+        if (marker == nullptr) {
+          break;
+        }
+        marker->addSource(net_);
+        marker->setTechLayer(shape->getLayer());
+        marker->addShape(rect);
       }
-      marker->addSource(net_);
-      marker->setTechLayer(node->getLayer());
-      marker->addShape(node->getPoint());
     }
   }