Merge remote-tracking branch 'upstream/master'

akashlevy · akashlevy · commit 85bd2affd72c · 2025-09-06T16:50:31.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,6 +39,7 @@ project(STA VERSION 2.7.0
 option(CUDD_DIR "CUDD BDD package directory")
 option(USE_TCL_READLINE "Use TCL readline package" ON)
 option(ENABLE_TSAN "Compile with thread santizer enabled" OFF)
+option(ENABLE_ASAN "Compile with address santizer enabled" OFF)
 
 # Turn on to debug compiler args.
 set(CMAKE_VERBOSE_MAKEFILE OFF)
@@ -544,6 +545,12 @@ if(ENABLE_TSAN)
   set(CMAKE_EXE_LINKER_FLAGS "-fsanitize=thread")
 endif()
 
+if(ENABLE_ASAN)
+  message(STATUS "Address sanitizer: ${ENABLE_ASAN}")
+  set(CXX_FLAGS "${CXX_FLAGS};-fsanitize=address")
+  set(CMAKE_EXE_LINKER_FLAGS "-fsanitize=address")
+endif()
+
 target_compile_options(OpenSTA
   PRIVATE
   $<$<CXX_COMPILER_ID:GNU>:${CXX_FLAGS}>
diff --git a/dcalc/GraphDelayCalc.cc b/dcalc/GraphDelayCalc.cc
@@ -1012,7 +1012,7 @@ GraphDelayCalc::makeArcDcalcArgs(Vertex *drvr_vertex,
       arc1 = arc;
     }
     else
-      findParallelEdge(drvr_vertex1, edge, arc, edge1, arc1);
+      findParallelEdge(drvr_vertex1, arc, edge1, arc1);
     // Shockingly one fpga vendor connects outputs with no timing arcs together.
     if (edge1) {
       Vertex *from_vertex = edge1->from(graph_);
@@ -1036,7 +1036,6 @@ GraphDelayCalc::makeArcDcalcArgs(Vertex *drvr_vertex,
 // primary driver drvr_edge/drvr_arc.
 void
 GraphDelayCalc::findParallelEdge(Vertex *vertex,
-                                 Edge *drvr_edge,
                                  const TimingArc *drvr_arc,
                                  // Return values.
                                  Edge *&edge,
@@ -1047,11 +1046,10 @@ GraphDelayCalc::findParallelEdge(Vertex *vertex,
   if (vertex_cell == drvr_cell) {
     // Homogeneous drivers.
     arc = drvr_arc;
-    LibertyPort *from_port = network_->libertyPort(drvr_edge->from(graph_)->pin());
     VertexInEdgeIterator edge_iter(vertex, graph_);
     while (edge_iter.hasNext()) {
       edge = edge_iter.next();
-      if (network_->libertyPort(edge->from(graph_)->pin()) == from_port)
+      if (edge->timingArcSet() == arc->set())
         return;
     }
   }
diff --git a/doc/OpenSTA.fodt b/doc/OpenSTA.fodt
diff --git a/doc/OpenSTA.pdf b/doc/OpenSTA.pdf
diff --git a/graph/Graph.cc b/graph/Graph.cc
@@ -35,6 +35,7 @@
 #include "PortDirection.hh"
 #include "Network.hh"
 #include "DcalcAnalysisPt.hh"
+#include "FuncExpr.hh"
 
 namespace sta {
 
@@ -1293,6 +1294,11 @@ Edge::to_string(const StaState *sta) const
   string str = from(graph)->to_string(sta);
   str += " -> ";
   str += to(graph)->to_string(sta);
+  FuncExpr *when = arc_set_->cond();
+  if (when) {
+    str += " ";
+    str += when->to_string();
+  }
   return str;
 }
 
diff --git a/include/sta/GraphDelayCalc.hh b/include/sta/GraphDelayCalc.hh
@@ -204,7 +204,6 @@ protected:
                                   const DcalcAnalysisPt *dcalc_ap,
                                   ArcDelayCalc *arc_delay_calc);
   void findParallelEdge(Vertex *vertex,
-                        Edge *drvr_edge,
                         const TimingArc *drvr_arc,
                         // Return values.
                         Edge *&edge,
diff --git a/include/sta/Search.hh b/include/sta/Search.hh
@@ -356,7 +356,8 @@ public:
 
   TagGroup *tagGroup(const Vertex *vertex) const;
   TagGroup *tagGroup(TagGroupIndex index) const;
-  void reportArrivals(Vertex *vertex) const;
+  void reportArrivals(Vertex *vertex,
+		      bool report_tag_index) const;
   Slack wnsSlack(Vertex *vertex,
 		 PathAPIndex path_ap_index);
   void levelsChangedBefore();
@@ -365,9 +366,6 @@ public:
  			Vertex *vertex,
  			TagGroupBldr *tag_bldr);
   void ensureDownstreamClkPins();
-  // Check paths from inputs from the default arrival clock
-  // (missing set_input_delay).
-  virtual bool checkDefaultArrivalPaths() { return true; }
   bool matchesFilter(Path *path,
 		     const ClockEdge *to_clk_edge);
   CheckCrpr *checkCrpr() { return check_crpr_; }
@@ -410,6 +408,7 @@ public:
                         TagGroupIndex tag_index);
   void checkPrevPaths() const;
   void deletePaths(Vertex *vertex);
+  void deleteTagGroup(TagGroup *group);
 
 protected:
   void init(StaState *sta);
diff --git a/sdc/ExceptionPath.cc b/sdc/ExceptionPath.cc
@@ -2159,37 +2159,39 @@ ExpandedExceptionVisitor::expandThru(ExceptionFrom *expanded_from,
 				     ExceptionThruSeq::Iterator &thru_iter,
 				     ExceptionThruSeq *expanded_thrus)
 {
-  if (thru_iter.hasNext()) {
-    ExceptionThru *thru = thru_iter.next();
-    const RiseFallBoth *rf = thru->transition();
-    if (thru->pins()) {
-      for (const Pin *pin : *thru->pins()) {
-        PinSet pins(network_);
-        pins.insert(pin);
-        ExceptionThru expanded_thru(&pins, nullptr, nullptr, rf, false, network_);
-        expanded_thrus->push_back(&expanded_thru);
-        expandThru(expanded_from, thru_iter, expanded_thrus);
-        expanded_thrus->pop_back();
+  if (exception_->thrus()) {
+    if (thru_iter.hasNext()) {
+      ExceptionThru *thru = thru_iter.next();
+      const RiseFallBoth *rf = thru->transition();
+      if (thru->pins()) {
+	for (const Pin *pin : *thru->pins()) {
+	  PinSet pins(network_);
+	  pins.insert(pin);
+	  ExceptionThru expanded_thru(&pins, nullptr, nullptr, rf, false, network_);
+	  expanded_thrus->push_back(&expanded_thru);
+	  expandThru(expanded_from, thru_iter, expanded_thrus);
+	  expanded_thrus->pop_back();
+	}
       }
-    }
-    if (thru->nets()) {
-      for (const Net *net : *thru->nets()) {
-        NetSet nets(network_);
-        nets.insert(net);
-        ExceptionThru expanded_thru(nullptr, &nets, nullptr, rf, false, network_);
-        expanded_thrus->push_back(&expanded_thru);
-        expandThru(expanded_from, thru_iter, expanded_thrus);
-        expanded_thrus->pop_back();
+      if (thru->nets()) {
+	for (const Net *net : *thru->nets()) {
+	  NetSet nets(network_);
+	  nets.insert(net);
+	  ExceptionThru expanded_thru(nullptr, &nets, nullptr, rf, false, network_);
+	  expanded_thrus->push_back(&expanded_thru);
+	  expandThru(expanded_from, thru_iter, expanded_thrus);
+	  expanded_thrus->pop_back();
+	}
       }
-    }
-    if (thru->instances()) {
-      for (const Instance *inst : *thru->instances()) {
-        InstanceSet insts(network_);
-        insts.insert(inst);
-        ExceptionThru expanded_thru(nullptr, nullptr, &insts, rf, false, network_);
-        expanded_thrus->push_back(&expanded_thru);
-        expandThru(expanded_from, thru_iter, expanded_thrus);
-        expanded_thrus->pop_back();
+      if (thru->instances()) {
+	for (const Instance *inst : *thru->instances()) {
+	  InstanceSet insts(network_);
+	  insts.insert(inst);
+	  ExceptionThru expanded_thru(nullptr, nullptr, &insts, rf, false, network_);
+	  expanded_thrus->push_back(&expanded_thru);
+	  expandThru(expanded_from, thru_iter, expanded_thrus);
+	  expanded_thrus->pop_back();
+	}
       }
     }
   }
diff --git a/search/PathGroup.cc b/search/PathGroup.cc
@@ -546,8 +546,6 @@ PathGroups::makePathEnds(ExceptionTo *to,
   pushGroupPathEnds(path_ends);
   if (sort_by_slack) {
     sort(path_ends, PathEndLess(this));
-    if (static_cast<int>(path_ends.size()) > group_path_count_)
-      path_ends.resize(group_path_count_);
   }
 
   if (unconstrained_paths
diff --git a/search/Search.cc b/search/Search.cc
@@ -554,15 +554,20 @@ Search::deleteFilterTagGroups()
   for (TagGroupIndex i = 0; i < tag_group_next_; i++) {
     TagGroup *group = tag_groups_[i];
     if (group
-	&& group->hasFilterTag()) {
-      tag_group_set_->erase(group);
-      tag_groups_[group->index()] = nullptr;
-      tag_group_free_indices_.push_back(i);
-      delete group;
-    }
+	&& group->hasFilterTag())
+      deleteTagGroup(group);
   }
 }
 
+void
+Search::deleteTagGroup(TagGroup *group)
+{
+  tag_group_set_->erase(group);
+  tag_groups_[group->index()] = nullptr;
+  tag_group_free_indices_.push_back(group->index());
+  delete group;
+}
+
 void
 Search::deleteFilterTags()
 {
@@ -2222,7 +2227,8 @@ PathVisitor::visitFromPath(const Pin *from_pin,
     }
   }
   else if (edge->role() == TimingRole::latchDtoQ()) {
-    if (min_max == MinMax::max()) {
+    if (min_max == MinMax::max()
+	&& clk) {
       arc_delay = search_->deratedDelay(from_vertex, arc, edge, false, path_ap);
       latches_->latchOutArrival(from_path, arc, edge, path_ap,
                                 to_tag, arc_delay, to_arrival);
@@ -2777,6 +2783,15 @@ Search::setVertexArrivals(Vertex *vertex,
         filtered_arrivals_->insert(vertex);
       }
     }
+    if (tag_group != prev_tag_group) {
+      LockGuard lock(tag_group_lock_);
+      tag_group->incrRefCount();
+      if (prev_tag_group) {
+	prev_tag_group->decrRefCount();
+	if (prev_tag_group->refCount() == 0)
+	  deleteTagGroup(prev_tag_group);
+      }
+    }
   }
 }
 
@@ -2819,12 +2834,14 @@ ReportPathLess::operator()(const Path *path1,
 }
 
 void
-Search::reportArrivals(Vertex *vertex) const
+Search::reportArrivals(Vertex *vertex,
+		       bool report_tag_index) const
 {
   report_->reportLine("Vertex %s", vertex->to_string(this).c_str());
   TagGroup *tag_group = tagGroup(vertex);
   if (tag_group) {
-    report_->reportLine("Group %u", tag_group->index());
+    if (report_tag_index)
+      report_->reportLine("Group %u", tag_group->index());
     std::vector<const Path*> paths;
     VertexPathIterator path_iter(vertex, this);
     while (path_iter.hasNext()) {
@@ -2859,7 +2876,7 @@ Search::reportArrivals(Vertex *vertex) const
                           path_ap->pathMinMax()->to_string().c_str(),
                           delayAsString(path->arrival(), this),
                           req,
-                          tag->to_string(true, false, this).c_str(),
+                          tag->to_string(report_tag_index, false, this).c_str(),
                           prev_str.c_str());
     }
   }
diff --git a/search/Search.i b/search/Search.i
@@ -265,9 +265,10 @@ report_tag_groups()
 }
 
 void
-report_tag_arrivals_cmd(Vertex *vertex)
+report_tag_arrivals_cmd(Vertex *vertex,
+			bool report_tag_index)
 {
-  Sta::sta()->search()->reportArrivals(vertex);
+  Sta::sta()->search()->reportArrivals(vertex, report_tag_index);
 }
 
 void
diff --git a/search/Search.tcl b/search/Search.tcl
@@ -983,7 +983,7 @@ proc report_slack { pin } {
 proc report_tag_arrivals { pin } {
   set pin [get_port_pin_error "pin" $pin]
   foreach vertex [$pin vertices] {
-    report_tag_arrivals_cmd $vertex
+    report_tag_arrivals_cmd $vertex 1
   }
 }
 
diff --git a/search/Sta.cc b/search/Sta.cc
@@ -3028,6 +3028,7 @@ Sta::netSlack(const Net *net,
 	slack = pin_slack;
     }
   }
+  delete pin_iter;
   return slack;
 }
 
diff --git a/search/Tag.cc b/search/Tag.cc
@@ -355,7 +355,7 @@ tagCmp(const Tag *tag1,
   return tagStateCmp(tag1, tag2);
 }
 
-int
+bool
 tagEqual(const Tag *tag1,
 	 const Tag *tag2)
 {
diff --git a/search/Tag.hh b/search/Tag.hh
@@ -140,6 +140,9 @@ public:
 		  const Tag *tag2) const;
 };
 
+bool
+tagEqual(const Tag *tag1,
+	 const Tag *tag2);
 int
 tagCmp(const Tag *tag1,
        const Tag *tag2,
diff --git a/search/TagGroup.cc b/search/TagGroup.cc
@@ -44,6 +44,7 @@ TagGroup::TagGroup(TagGroupIndex index,
 		   bool has_loop_tag) :
   path_index_map_(path_index_map),
   hash_(pathIndexMapHash(path_index_map)),
+  ref_count_(0),
   index_(index),
   has_clk_tag_(has_clk_tag),
   has_genclk_src_tag_(has_genclk_src_tag),
@@ -56,6 +57,7 @@ TagGroup::TagGroup(TagGroupIndex index,
 TagGroup::TagGroup(TagGroupBldr *tag_bldr) :
   path_index_map_(&tag_bldr->pathIndexMap()),
   hash_(pathIndexMapHash(path_index_map_)),
+  ref_count_(0),
   own_path_map_(false)
 {
 }
@@ -66,6 +68,18 @@ TagGroup::~TagGroup()
     delete path_index_map_;
 }
 
+void
+TagGroup::incrRefCount()
+{
+  ref_count_++;
+}
+
+void
+TagGroup::decrRefCount()
+{
+  ref_count_--;
+}
+
 size_t
 TagGroup::pathIndexMapHash(PathIndexMap *path_index_map)
 {
diff --git a/search/TagGroup.hh b/search/TagGroup.hh
@@ -65,13 +65,17 @@ public:
   size_t pathIndex(Tag *tag) const;
   PathIndexMap *pathIndexMap() const { return path_index_map_; }
   bool hasTag(Tag *tag) const;
+  void incrRefCount();
+  void decrRefCount();
+  int refCount() const { return ref_count_; }
 
 protected:
   static size_t pathIndexMapHash(PathIndexMap *path_index_map);
 
   // tag -> path index
   PathIndexMap *path_index_map_;
   size_t hash_;
+  int ref_count_;
   unsigned int index_:tag_group_index_bits;
   bool has_clk_tag_:1;
   bool has_genclk_src_tag_:1;
diff --git a/search/VisitPathEnds.cc b/search/VisitPathEnds.cc
@@ -178,9 +178,6 @@ VisitPathEnds::visitCheckEnd(const Pin *pin,
                     && tgt_clk != sdc_->defaultArrivalClock()
                     && sdc_->sameClockGroup(src_clk, tgt_clk)
                     && !sdc_->clkStopPropagation(tgt_pin, tgt_clk)
-                    && (search_->checkDefaultArrivalPaths()
-                        || src_clk_edge
-                        != sdc_->defaultArrivalClockEdge())
                     // False paths and path delays override
                     // paths.
                     && (exception == nullptr
@@ -360,9 +357,6 @@ VisitPathEnds::visitOutputDelayEnd1(OutputDelay *output_delay,
     is_constrained = true;
   }
   else if (src_clk_edge
-           && (search_->checkDefaultArrivalPaths()
-               || src_clk_edge
-               != sdc_->defaultArrivalClockEdge())
            && tgt_clk_edge
 	   && sdc_->sameClockGroup(path->clock(this), tgt_clk_edge->clock())
 	   // False paths and path delays override.
diff --git a/test/regression_vars.tcl b/test/regression_vars.tcl
@@ -162,6 +162,7 @@ record_sta_tests {
   pin_props
   prima3
   power_json
+  report_checks_sorted
   report_checks_src_attr
   report_json1
   report_json2
diff --git a/test/report_checks_sorted.ok b/test/report_checks_sorted.ok
diff --git a/test/report_checks_sorted.tcl b/test/report_checks_sorted.tcl
diff --git a/test/report_checks_sorted.v b/test/report_checks_sorted.v
diff --git a/util/gzstream.hh b/util/gzstream.hh

Original file line number	Diff line number	Diff line change
`@@ -546,8 +546,6 @@ PathGroups::makePathEnds(ExceptionTo *to,`
`546`	`546`	`pushGroupPathEnds(path_ends);`
`547`	`547`	`if (sort_by_slack) {`
`548`	`548`	`sort(path_ends, PathEndLess(this));`
`549`		`- if (static_cast<int>(path_ends.size()) > group_path_count_)`
`550`		`- path_ends.resize(group_path_count_);`
`551`	`549`	`}`
`552`	`550`
`553`	`551`	`if (unconstrained_paths`