Sta latest 0710

dcalc/GraphDelayCalc.cc

@@ -395,7 +395,7 @@ GraphDelayCalc::seedRootSlew(Vertex *vertex,
     seedDrvrSlew(vertex, arc_delay_calc);
   else
     seedLoadSlew(vertex);
-  iter_->enqueueAdjacentVertices(vertex);
+  iter_->enqueueFanout(vertex);
 }
 
 void
@@ -686,7 +686,11 @@ GraphDelayCalc::findVertexDelay(Vertex *vertex,
   debugPrint(debug_, "delay_calc", 2, "find delays {} ({})",
              vertex->to_string(this),
              network_->cellName(network_->instance(pin)));
-  if (vertex->isRoot())
+  if (vertex->isRoot()
+      // Bidirect port drivers are enqueued by their load vertex in
+      // annotateLoadDelays.
+      || (vertex->isBidirectDriver()
+          && network_->isTopLevelPort(pin)))
     seedRootSlew(vertex, arc_delay_calc);
   else {
     if (network_->isLeaf(pin)) {
@@ -703,22 +707,17 @@ GraphDelayCalc::findVertexDelay(Vertex *vertex,
 	  // change when non-incremental to stride past annotations.
 	  if (!incremental_
               || loadSlewsChanged(load_slews_prev, load_pin_index_map))
-	    iter_->enqueueAdjacentVertices(vertex);
+	    iter_->enqueueFanout(vertex);
 	}
       }
       else {
 	// Load vertex.
 	enqueueTimingChecksEdges(vertex);
 	// Enqueue driver vertices from this input load.
 	if (propagate)
-	  iter_->enqueueAdjacentVertices(vertex);
+	  iter_->enqueueFanout(vertex);
       }
     }
-    // Bidirect port drivers are enqueued by their load vertex in
-    // annotateLoadDelays.
-    else if (vertex->isBidirectDriver()
-	     && network_->isTopLevelPort(pin))
-      seedRootSlew(vertex, arc_delay_calc);
   }
 }
 

graph/Graph.cc

@@ -418,6 +418,8 @@ Graph::makePinVertices(Pin *pin,
                        Vertex *&vertex,
                        Vertex *&bidir_drvr_vertex)
 {
+  vertex = nullptr;
+  bidir_drvr_vertex = nullptr;
   PortDirection *dir = network_->direction(pin);
   if (!dir->isPowerGround()) {
     bool is_reg_clk = network_->isRegClkPin(pin);
@@ -427,8 +429,6 @@ Graph::makePinVertices(Pin *pin,
       bidir_drvr_vertex = makeVertex(pin, true, is_reg_clk);
       pin_bidirect_drvr_vertex_map_[pin] = bidir_drvr_vertex;
     }
-    else
-      bidir_drvr_vertex = nullptr;
   }
 }
 
@@ -581,9 +581,9 @@ Graph::visitFanouts(Vertex *vertex,
                     const VertexFn &fn)
 {
   if (pred->searchFrom(vertex)) {
-    for (Edge *edge = this->edge(vertex->out_edges_);
-         edge;
-         edge = this->edge(edge->vertex_out_next_)) {
+    VertexOutEdgeIterator edge_iter(vertex, graph_);
+    while (edge_iter.hasNext()) {
+      Edge *edge = edge_iter.next();
       Vertex *to_vertex = this->vertex(edge->to_);
       if (pred->searchThru(edge)
           && pred->searchTo(to_vertex))
@@ -598,9 +598,9 @@ Graph::visitFanoutEdges(Vertex *vertex,
                         const EdgeFn &fn)
 {
   if (pred->searchFrom(vertex)) {
-    for (Edge *edge = this->edge(vertex->out_edges_);
-         edge;
-         edge = this->edge(edge->vertex_out_next_)) {
+    VertexOutEdgeIterator edge_iter(vertex, graph_);
+    while (edge_iter.hasNext()) {
+      Edge *edge = edge_iter.next();
       Vertex *to_vertex = this->vertex(edge->to_);
       if (pred->searchThru(edge)
           && pred->searchTo(to_vertex))
@@ -615,9 +615,9 @@ Graph::visitFanins(Vertex *vertex,
                    const VertexFn &fn)
 {
   if (pred->searchFrom(vertex)) {
-    for (Edge *edge = this->edge(vertex->in_edges_);
-         edge;
-         edge = this->edge(edge->vertex_in_next_)) {
+    VertexInEdgeIterator edge_iter(vertex, graph_);
+    while (edge_iter.hasNext()) {
+      Edge *edge = edge_iter.next();
       Vertex *from_vertex = this->vertex(edge->from_);
       if (pred->searchThru(edge)
           && pred->searchFrom(from_vertex))
@@ -632,9 +632,9 @@ Graph::visitFaninEdges(Vertex *vertex,
                        const EdgeFn &fn)
 {
   if (pred->searchFrom(vertex)) {
-    for (Edge *edge = this->edge(vertex->in_edges_);
-         edge;
-         edge = this->edge(edge->vertex_in_next_)) {
+    VertexInEdgeIterator edge_iter(vertex, graph_);
+    while (edge_iter.hasNext()) {
+      Edge *edge = edge_iter.next();
       Vertex *from_vertex = this->vertex(edge->from_);
       if (pred->searchThru(edge)
           && pred->searchFrom(from_vertex))

include/sta/Bfs.hh

@@ -24,6 +24,7 @@
 
 #pragma once
 
+#include <functional>
 #include <mutex>
 #include <vector>
 
@@ -38,6 +39,8 @@ class SearchPred;
 class BfsFwdIterator;
 class BfsBkwdIterator;
 
+using VertexFn = std::function<void(Vertex*)>;
+
 // LevelQueue is a vector of vertex vectors indexed by logic level.
 using LevelQueue = std::vector<VertexSeq>;
 
@@ -50,37 +53,30 @@ using LevelQueue = std::vector<VertexSeq>;
 // Vertices are marked as being in the queue by using a flag on
 // the vertex indexed by bfs_index.  A unique flag is only needed
 // if the BFS in in use when other BFS's are simultaneously in use.
-class BfsIterator : public StaState,
-                    public Iterator<Vertex*>
+class BfsIterator : public StaState
 {
 public:
   // Make sure that the BFS queue is deep enough for the max logic level.
   void ensureSize();
   // Reset to virgin state.
   void clear();
+  // Apply fn to each vertex and clear.
+  void clear(const VertexFn &fn);
   [[nodiscard]] bool empty() const;
   // Enqueue a vertex to search from.
   void enqueue(Vertex *vertex);
   // Enqueue vertices adjacent to a vertex.
-  void enqueueAdjacentVertices(Vertex *vertex);
-  virtual void enqueueAdjacentVertices(Vertex *vertex,
-                                       const Mode *mode);
+  virtual void enqueueAdjacentVertices(Vertex *vertex) = 0;
   virtual void enqueueAdjacentVertices(Vertex *vertex,
-				       SearchPred *search_pred,
                                        const Mode *mode) = 0;
-  virtual void enqueueAdjacentVertices(Vertex *vertex,
-                                       SearchPred *search_pred) = 0;
+
   [[nodiscard]] bool inQueue(Vertex *vertex);
   void checkInQueue(Vertex *vertex);
   // Notify iterator that vertex will be deleted.
   void deleteVertexBefore(Vertex *vertex);
   void remove(Vertex *vertex);
   void reportEntries() const;
 
-  bool hasNext() override;
-  bool hasNext(Level to_level);
-  Vertex *next() override;
-
   // Apply visitor to all vertices in the queue in level order.
   // Returns the number of vertices that are visited.
   virtual int visit(Level to_level,
@@ -91,6 +87,10 @@ public:
   int visitParallel(Level to_level,
 		    VertexVisitor *visitor);
 
+  bool hasNext();
+  bool hasNext(Level to_level);
+  Vertex *next();
+
 protected:
   BfsIterator(BfsIndex bfs_index,
 	      Level level_min,
@@ -104,10 +104,10 @@ protected:
   virtual bool levelLessOrEqual(Level level1,
 				Level level2) const = 0;
   virtual void incrLevel(Level &level) const = 0;
-  void findNext(Level to_level);
   void deleteEntries();
   void checkLevel(Vertex *vertex,
                   Level level);
+  void findNext(Level to_level);
 
   BfsIndex bfs_index_;
   Level level_min_;
@@ -131,12 +131,13 @@ public:
 		 SearchPred *search_pred,
 		 StaState *sta);
   ~BfsFwdIterator() override;
+  void enqueueAdjacentVertices(Vertex *vertex) override;
   void enqueueAdjacentVertices(Vertex *vertex,
-                              SearchPred *search_pred) override;
-  void enqueueAdjacentVertices(Vertex *vertex,
-			       SearchPred *search_pred,
                                const Mode *mode) override;
   using BfsIterator::enqueueAdjacentVertices;
+  void enqueueFanout(Vertex *vertex);
+  void enqueueFanout(Vertex *vertex,
+                     const Mode *mode);
 
 protected:
   bool levelLessOrEqual(Level level1,
@@ -153,14 +154,17 @@ public:
 		  SearchPred *search_pred,
 		  StaState *sta);
   ~BfsBkwdIterator() override;
+  void enqueueAdjacentVertices(Vertex *vertex) override;
   void enqueueAdjacentVertices(Vertex *vertex,
-                              SearchPred *search_pred) override;
-  void enqueueAdjacentVertices(Vertex *vertex,
-			       SearchPred *search_pred,
                                const Mode *mode) override;
   using BfsIterator::enqueueAdjacentVertices;
+  void enqueueFanin(Vertex *vertex);
+  void enqueueFanin(Vertex *vertex,
+                    const Mode *mode);
 
 protected:
+  void enqueueFanin(Vertex *vertex,
+                    SearchPred *search_pred);
   bool levelLessOrEqual(Level level1,
 			Level level2) const override;
   bool levelLess(Level level1,

include/sta/FilterObjects.hh

@@ -30,6 +30,7 @@
 
 #include "GraphClass.hh"
 #include "NetworkClass.hh"
+#include "Scene.hh"
 #include "SdcClass.hh"
 #include "SearchClass.hh"
 #include "StringUtil.hh"
@@ -64,6 +65,16 @@ filterClocks(std::string_view filter_expression,
              ClockSeq *clks,
              Sta *sta);
 
+SceneSeq
+filterScenes(std::string_view filter_expression,
+             SceneSeq *scenes,
+             Sta *sta);
+
+ModeSeq
+filterModes(std::string_view filter_expression,
+            ModeSeq *modes,
+            Sta *sta);
+
 LibertyCellSeq
 filterLibCells(std::string_view filter_expression,
                LibertyCellSeq *cells,