Merge remote-tracking branch 'parallax/master'

Author: maliberty

README.md

@@ -247,22 +247,20 @@ should be a short description of the problem. Attach a test case to
 reproduce the issue as described below. Issues without test cases are
 unlikely to get a response.
 
-The files in the test case should be collected into a directory named
-YYYYMMDD where YYYY is the year, MM is the month, and DD is the
-day (this format allows "ls" to report them in chronological order).
-The contents of the directory should be collected into a compressed
-tarfile named YYYYMMDD.tgz.
-
 The test case should have a tcl command file recreates the issue named
-run.tcl. If there are more than one command file using the same data
+run.tcl. If is are more than one command file using the same data
 files, there should be separate command files, run1.tcl, run2.tcl
 etc. The bug report can refer to these command files by name.
 
 Command files should not have absolute filenames like
-"/home/cho/OpenSTA_Request/write_path_spice/dump_spice" in them.
+"/home/john/OpenSTA_bug/write_path_spice/dump_spice" in them.
 These obviously are not portable. Use filenames relative to the test
 case directory.
 
+The files in the test case should be collected into a directory.
+The contents of the directory should be collected into a compressed
+tarfile.
+
 ## Contributions
 
 Contributors must sign the Contributor License Agreement (doc/CLA.txt)

cmake/FindTCL.cmake

@@ -31,7 +31,10 @@ set(TCL_POSSIBLE_NAMES
 # tcl lib path guesses.
 if (NOT TCL_LIB_PATHS)
   if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    set(TCL_LIB_PATHS /opt/homebrew/Cellar/tcl-tk@8/8.6.16/lib /opt/homebrew/opt/tcl-tk/lib /usr/local/lib)
+    set(TCL_LIB_PATHS
+      /opt/homebrew/Cellar/tcl-tk@8/8.6.17/lib
+      /opt/homebrew/Cellar/tcl-tk@8/8.6.16/lib
+      /opt/homebrew/opt/tcl-tk/lib /usr/local/lib)
     set(TCL_NO_DEFAULT_PATH TRUE)
   elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     set(TCL_LIB_PATHS /usr/lib /usr/lib64 /usr/local/lib)

dcalc/GraphDelayCalc.cc

@@ -184,6 +184,19 @@ GraphDelayCalc::delayInvalid(Vertex *vertex)
   }
 }
 
+void
+GraphDelayCalc::levelsChangedBefore()
+{
+  delaysInvalid();
+}
+
+void
+GraphDelayCalc::levelChangedBefore(Vertex *vertex)
+{
+  iter_->remove(vertex);
+  delayInvalid(vertex);
+}
+
 void
 GraphDelayCalc::deleteVertexBefore(Vertex *vertex)
 {

doc/ApiChanges.txt

@@ -53,6 +53,9 @@ The following classes now return const objects.
 Liberty PgPorts are now LibertyPorts with additional member functions for
 liberty pg_pins.
 
+The write_verilog command always sorts the verilog file instances.
+The -sort argument is ignored.
+
 Release 2.6.1 2025/03/??
 -------------------------
 

doc/OpenSTA.fodt

@@ -13772,18 +13772,9 @@
       <text:p text:style-name="P29"><text:alphabetical-index-mark-start text:id="IMark53760024032"/><text:span text:style-name="Command_20_Heading">write_verilog</text:span><text:alphabetical-index-mark-end text:id="IMark53760024032"/></text:p>
      </table:table-cell>
      <table:table-cell table:style-name="Table109.A1" office:value-type="string">
-      <text:p text:style-name="P264">[-sort<text:span text:style-name="T22">]</text:span></text:p>
       <text:p text:style-name="P264"><text:span text:style-name="T22">[-include_pwr_gnd]</text:span><text:line-break/>[-remove_cells <text:span text:style-name="T1">lib_cells</text:span><text:span text:style-name="T22">]</text:span><text:line-break/><text:span text:style-name="T1">filename</text:span></text:p>
      </table:table-cell>
     </table:table-row>
-    <table:table-row table:style-name="Table109.1">
-     <table:table-cell table:style-name="Table109.A2" office:value-type="string">
-      <text:p text:style-name="P265"><text:span text:style-name="Command_20_Argument"><text:span text:style-name="T317">-sort</text:span></text:span></text:p>
-     </table:table-cell>
-     <table:table-cell table:style-name="Table109.A2" office:value-type="string">
-      <text:p text:style-name="P29"><text:span text:style-name="Default_20_Paragraph_20_Font">Sort the instances in the netlist.</text:span></text:p>
-     </table:table-cell>
-    </table:table-row>
     <table:table-row table:style-name="Table109.1">
      <table:table-cell table:style-name="Table109.A2" office:value-type="string">
       <text:p text:style-name="P288">-include_pwr_gnd</text:p>
@@ -13809,7 +13800,7 @@
      </table:table-cell>
     </table:table-row>
    </table:table>
-   <text:p text:style-name="P290">The <text:span text:style-name="T7">write_verilog</text:span> command writes a Verilog netlist to <text:span text:style-name="T3">filename</text:span>. Use <text:span text:style-name="T317">-sort</text:span> to sort the instances so the results are reproducible across operating systems. Use <text:span text:style-name="T7">-remove_cells</text:span> to remove instances of <text:span text:style-name="T3">lib_cells</text:span> from the netlist.</text:p>
+   <text:p text:style-name="P290">The <text:span text:style-name="T7">write_verilog</text:span> command writes a Verilog netlist to <text:span text:style-name="T3">filename</text:span>. Instances are always sorted so the results are reproducible across operating systems. Use <text:span text:style-name="T7">-remove_cells</text:span> to remove instances of <text:span text:style-name="T3">lib_cells</text:span> from the netlist.</text:p>
    <text:h text:style-name="Heading_20_1" text:outline-level="1"><text:bookmark-start text:name="__RefHeading___Toc42589_2528141652"/><text:alphabetical-index-mark-start text:id="IMark53760024032"/>Filter Expressions<text:bookmark-end text:name="__RefHeading___Toc42589_2528141652"/><text:alphabetical-index-mark-end text:id="IMark53760024032"/></text:h>
    <text:p text:style-name="P291">The <text:span text:style-name="Example">get_cells</text:span>, <text:span text:style-name="Example">get_pins</text:span>, <text:span text:style-name="Example">get_ports</text:span> and <text:span text:style-name="Example">get_timing_edges</text:span> functions support filtering the returned objects by property values. Supported filter expressions are shown below.</text:p>
    <table:table table:name="Table66" table:style-name="Table66">

include/sta/Bfs.hh

@@ -106,6 +106,8 @@ protected:
   virtual void incrLevel(Level &level) const = 0;
   void findNext(Level to_level);
   void deleteEntries();
+  void checkLevel(Vertex *vertex,
+                  Level level);
 
   BfsIndex bfs_index_;
   Level level_min_;

include/sta/DispatchQueue.hh

@@ -24,6 +24,7 @@ public:
   DispatchQueue(size_t thread_cnt);
   ~DispatchQueue();
   void setThreadCount(size_t thread_count);
+  size_t getThreadCount() const;
   // Dispatch and copy.
   void dispatch(const fp_t& op);
   // Dispatch and move.

include/sta/GraphDelayCalc.hh

@@ -58,10 +58,12 @@ public:
   virtual void setObserver(DelayCalcObserver *observer);
   // Invalidate all delays/slews.
   virtual void delaysInvalid();
+  virtual void levelsChangedBefore();
   // Invalidate vertex and downstream delays/slews.
   virtual void delayInvalid(Vertex *vertex);
   virtual void delayInvalid(const Pin *pin);
   virtual void deleteVertexBefore(Vertex *vertex);
+  virtual void levelChangedBefore(Vertex *vertex);
   // Reset to virgin state.
   virtual void clear();
   // Find arc delays and vertex slews thru level.

include/sta/Parasitics.hh

@@ -276,6 +276,7 @@ public:
   // Network edit before/after methods.
   virtual void disconnectPinBefore(const Pin *pin,
                                    const Network *network) = 0;
+  virtual void deletePinBefore(const Pin *pin) = 0;
   virtual void loadPinCapacitanceChanged(const Pin *pin) = 0;
 
 protected:

include/sta/PathEnd.hh

@@ -69,7 +69,7 @@ public:
   };
 
   virtual PathEnd *copy() const = 0;
-  virtual ~PathEnd();
+  virtual ~PathEnd() {}
   void deletePath();
   Path *path() { return path_; }
   const Path *path() const { return path_; }