psm: node hold visited

Signed-off-by: Peter Gadfort <peter.gadfort@gmail.com>

Author: gadfort

src/psm/src/ir_network.cpp

@@ -1298,4 +1298,19 @@ Node::NodeSet IRNetwork::getBPinShapeNodes() const
   return pin_nodes;
 }
 
+void IRNetwork::clearVisitedNodes()
+{
+  for (const auto& [layer, nodes] : nodes_) {
+    for (const auto& node : nodes) {
+      node->setVisited(false);
+    }
+  }
+  for (const auto& node : iterm_nodes_) {
+    node->setVisited(false);
+  }
+  for (const auto& node : bpin_nodes_) {
+    node->setVisited(false);
+  }
+}
+
 }  // namespace psm

src/psm/src/ir_network.h

@@ -106,6 +106,8 @@ class IRNetwork
 
   std::size_t getNodeCount(bool include_iterms = false) const;
 
+  void clearVisitedNodes();
+
   const Connections& getConnections() const { return connections_; }
   NodePtrMap<Connection> getConnectionMap() const;
 

src/psm/src/ir_solver.cpp

@@ -141,27 +141,12 @@ bool IRSolver::check(bool check_bterms)
   return connected_.value();
 }
 
-bool IRSolver::wasNodeVisited(const std::unique_ptr<ITermNode>& node) const
-{
-  return wasNodeVisited(node.get());
-}
-
-bool IRSolver::wasNodeVisited(const std::unique_ptr<Node>& node) const
-{
-  return wasNodeVisited(node.get());
-}
-
-bool IRSolver::wasNodeVisited(const Node* node) const
-{
-  return visited_.find(node) != visited_.end();
-}
-
 bool IRSolver::checkOpen()
 {
   const utl::DebugScopedTimer timer(
       logger_, utl::PSM, "timer", 1, "Check open: {}");
 
-  visited_.clear();
+  network_->clearVisitedNodes();
   const std::size_t total_nodes = network_->getNodeCount(true);
   const auto connections_map = network_->getConnectionMap();
 
@@ -179,7 +164,7 @@ bool IRSolver::checkOpen()
   while (!queue.empty()) {
     Node* node = queue.front();
     queue.pop();
-    if (wasNodeVisited(node)) {
+    if (node->isVisited()) {
       // already been here, so we can continue to next node
       continue;
     }
@@ -196,11 +181,11 @@ bool IRSolver::checkOpen()
                  total_nodes);
     }
 
-    visited_.insert(node);
+    node->setVisited(true);
 
     for (const auto* conn : connections_map.at(node)) {
       Node* next = conn->getOtherNode(node);
-      if (wasNodeVisited(next)) {
+      if (next->isVisited()) {
         // already been here, so we do not need to add it to the queue
         continue;
       }
@@ -210,7 +195,7 @@ bool IRSolver::checkOpen()
 
   for (const auto& [layer, layer_nodes] : network_->getNodes()) {
     for (const auto& node : layer_nodes) {
-      if (wasNodeVisited(node)) {
+      if (node->isVisited()) {
         continue;
       }
 
@@ -249,7 +234,7 @@ IRSolver::ConnectivityResults IRSolver::getConnectivityResults() const
 
   for (const auto& [layer, nodes] : network_->getNodes()) {
     for (const auto& node : nodes) {
-      if (wasNodeVisited(node)) {
+      if (node->isVisited()) {
         continue;
       }
 
@@ -258,7 +243,7 @@ IRSolver::ConnectivityResults IRSolver::getConnectivityResults() const
   }
 
   for (const auto& node : network_->getITermNodes()) {
-    if (wasNodeVisited(node)) {
+    if (node->isVisited()) {
       continue;
     }
 

src/psm/src/ir_solver.h

@@ -162,9 +162,6 @@ class IRSolver
 
   void reportUnconnectedNodes() const;
   void reportMissingBTerm() const;
-  bool wasNodeVisited(const std::unique_ptr<ITermNode>& node) const;
-  bool wasNodeVisited(const std::unique_ptr<Node>& node) const;
-  bool wasNodeVisited(const Node* node) const;
 
   std::map<Node*, Connection::ConnectionSet> getNodeConnectionMap(
       const Connection::ConnectionMap<Connection::Conductance>& conductance)
@@ -216,8 +213,6 @@ class IRSolver
 
   const PDNSim::GeneratedSourceSettings& generated_source_settings_;
 
-  // Holds nodes that were visited during the open net check
-  std::set<const Node*> visited_;
   std::optional<bool> connected_;
 
   std::map<sta::Scene*, ValueNodeMap<Voltage>> voltages_;

src/psm/src/node.cpp

@@ -14,7 +14,7 @@
 namespace psm {
 
 Node::Node(const odb::Point& pt, odb::dbTechLayer* layer)
-    : pt_(pt), layer_(layer)
+    : pt_(pt), layer_(layer), visited_(false)
 {
 }
 

src/psm/src/node.h

@@ -59,6 +59,9 @@ class Node
   const odb::Point& getPoint() const { return pt_; };
   odb::dbTechLayer* getLayer() const { return layer_; };
 
+  bool isVisited() const { return visited_; }
+  void setVisited(bool visited) { visited_ = visited; }
+
   void print(utl::Logger* logger, const std::string& prefix = "") const;
   virtual std::string describe(const std::string& prefix) const;
 
@@ -75,6 +78,7 @@ class Node
 
   odb::Point pt_;
   odb::dbTechLayer* layer_;
+  bool visited_ = false;
 };
 
 class SourceNode : public Node