DelayCalc reorg

commit 410ed56c2c2d0d7afb0e84d0c65d5ff75234e9e3 Author: James Cherry <[email protected]> Date: Sun Nov 19 08:44:13 2023 -0700 ArcDelayCalcBase -> DelayCalcBase Signed-off-by: James Cherry <[email protected]> commit 1fdfebe2838c47f6c1866c8a10b14df6439506e0 Author: James Cherry <[email protected]> Date: Sun Nov 19 08:25:36 2023 -0700 LumpedCapDelayCalc::inputPortDelay Signed-off-by: James Cherry <[email protected]> commit 3a5e1d01aaff240b2f71d006d620ccd6a70bce6d Author: James Cherry <[email protected]> Date: Fri Nov 17 16:32:32 2023 -0700 gateDelayInit cleanup Signed-off-by: James Cherry <[email protected]> commit d0133319126ae4a488a7b31679fbf6507c7f6266 Author: James Cherry <[email protected]> Date: Fri Nov 17 15:36:12 2023 -0700 mv RCDelayCalc to ArcDelayCalcBase Signed-off-by: James Cherry <[email protected]> commit fd028e6ba5e092243a84685eb1756a8e4e4bad76 Author: James Cherry <[email protected]> Date: Fri Nov 17 14:32:53 2023 -0700 ArcDelayCalcBase Signed-off-by: James Cherry <[email protected]> commit 0ce9cf4c766f7419b998b40aed5af14df97249f1 Author: James Cherry <[email protected]> Date: Fri Nov 17 10:57:41 2023 -0700 ParallelArcDelayCalc -> ParallelDelayCalc Signed-off-by: James Cherry <[email protected]> commit 7fa7db6b252f1450fa5b546f5d33d8cb8a94d4bb Author: James Cherry <[email protected]> Date: Fri Nov 17 08:45:01 2023 -0700 parallelGateDelay args Signed-off-by: James Cherry <[email protected]> commit 6b85756774ce049c0f5f123f6d60ebbcd62cdd2b Author: James Cherry <[email protected]> Date: Thu Nov 16 19:55:20 2023 -0700 TimingModel cell_ Signed-off-by: James Cherry <[email protected]> commit e536d6b0ca0d01e2ad8bd609ad20f9a02497d8f5 Author: James Cherry <[email protected]> Date: Thu Nov 16 18:07:11 2023 -0700 TimingModel cell_ Signed-off-by: James Cherry <[email protected]> commit d2d622da4206e06d176e4ae741334fde8df35007 Author: James Cherry <[email protected]> Date: Thu Nov 16 17:21:15 2023 -0700 rm drvr_cell from arc dcalc funcs Signed-off-by: James Cherry <[email protected]> commit 522961e8f58bc1a0f0530a0a5218086280a2bcb0 Author: James Cherry <[email protected]> Date: Thu Nov 16 16:24:34 2023 -0700 tr -> rf Signed-off-by: James Cherry <[email protected]> commit 29aa0ed40345611b9e3a898342ecc17f6355396f Author: James Cherry <[email protected]> Date: Thu Nov 16 13:17:44 2023 -0700 GraphDelayCalc Signed-off-by: James Cherry <[email protected]> commit 934d9f19c52c62925b23ae9b457f14d25e818f1a Author: James Cherry <[email protected]> Date: Thu Nov 16 12:52:55 2023 -0700 ParallelArcDelayCalc Signed-off-by: James Cherry <[email protected]> commit d5687d9482ad0f572b017f0ef806ba8e6ff8b6fa Author: James Cherry <[email protected]> Date: Thu Nov 16 12:16:05 2023 -0700 ParallelArcDelayCalc pvt Signed-off-by: James Cherry <[email protected]> commit 0de501e5bf2329364b572d1360c18d5aedf3b841 Author: James Cherry <[email protected]> Date: Thu Nov 16 10:46:22 2023 -0700 ParallelArcDelayCalc::findMultiDrvrGateDelay Signed-off-by: James Cherry <[email protected]> commit d7457b9e335ed5fa583798e0512914aab6524fcc Author: James Cherry <[email protected]> Date: Thu Nov 16 10:19:01 2023 -0700 mv multi_drvr_slew_factor_ to ParallelArcDelayCalc Signed-off-by: James Cherry <[email protected]> commit afec4daa2ab6dd61a2450f1ac8a8cad1ef015a29 Author: James Cherry <[email protected]> Date: Thu Nov 16 08:02:40 2023 -0700 MultiDrvrNet::net_caps vector Signed-off-by: James Cherry <[email protected]> commit b450b3a35616ffc8d85610158a91c5d9483b6958 Author: James Cherry <[email protected]> Date: Thu Nov 16 07:46:43 2023 -0700 sic Signed-off-by: James Cherry <[email protected]> commit 65767403b3b2ab4e6f7552625accf9aa4766628a Author: James Cherry <[email protected]> Date: Tue Nov 14 17:49:22 2023 -0700 Sta::connectedCap simplify Signed-off-by: James Cherry <[email protected]> commit 85bdb8f3362413e7b05f49447a0383140cbb924f Author: James Cherry <[email protected]> Date: Tue Nov 14 16:43:38 2023 -0700 ParallelArcDelayCalc Signed-off-by: James Cherry <[email protected]> commit 4feea3ba2277d53697b644d79832e309ce98058a Author: James Cherry <[email protected]> Date: Tue Nov 14 15:10:18 2023 -0700 mv parallel dcalc to arc delay calc Signed-off-by: James Cherry <[email protected]> commit 915ed28a2c05acce6569c7933366ef94da8bfaeb Author: James Cherry <[email protected]> Date: Mon Nov 13 17:47:14 2023 -0700 rm MultiDrvrNet::delays_valid_ Signed-off-by: James Cherry <[email protected]> commit 2384eb4e5bdca1410c4bf5e23f35bfb49f013e74 Author: James Cherry <[email protected]> Date: Mon Nov 13 16:02:57 2023 -0700 mkae MultiDrvrNets on the fly Signed-off-by: James Cherry <[email protected]> Signed-off-by: James Cherry <[email protected]>
2026-09-01 18:36:42 +02:00 · 2023-11-19 10:04:45 -07:00
parent 19cf68c72a
commit 31369dd750
37 changed files with 1070 additions and 1170 deletions
@@ -51,15 +51,15 @@ tableVariableUnit(TableAxisVariable variable,
 class GateTableModel : public GateTimingModel
 {
 public:
-  GateTableModel(TableModel *delay_model,
+  GateTableModel(LibertyCell *cell,
+                 TableModel *delay_model,
 		 TableModel *delay_sigma_models[EarlyLate::index_count],
 		 TableModel *slew_model,
 		 TableModel *slew_sigma_models[EarlyLate::index_count],
                 ReceiverModelPtr receiver_model,
                 OutputWaveforms *output_waveforms);
  virtual ~GateTableModel();
-  void gateDelay(const LibertyCell *cell,
-                 const Pvt *pvt,
+  void gateDelay(const Pvt *pvt,
                 float in_slew,
                 float load_cap,
                 float related_out_cap,
@@ -67,15 +67,13 @@ public:
                 // Return values.
                 ArcDelay &gate_delay,
                 Slew &drvr_slew) const override;
-  string reportGateDelay(const LibertyCell *cell,
-                         const Pvt *pvt,
+  string reportGateDelay(const Pvt *pvt,
                         float in_slew,
                         float load_cap,
                         float related_out_cap,
                         bool pocv_enabled,
                         int digits) const override;
-  float driveResistance(const LibertyCell *cell,
-                        const Pvt *pvt) const override;
+  float driveResistance(const Pvt *pvt) const override;

  const TableModel *delayModel() const { return delay_model_; }
  const TableModel *slewModel() const { return slew_model_;  }
@@ -86,8 +84,7 @@ public:
  static bool checkAxes(const TablePtr table);

 protected:
-  void maxCapSlew(const LibertyCell *cell,
-		  float in_slew,
+  void maxCapSlew(float in_slew,
 		  const Pvt *pvt,
 		  float &slew,
 		  float &cap) const;
@@ -96,16 +93,12 @@ protected:
 		  float load_cap,
 		  float in_slew,
 		  float related_out_cap) const;
-  float findValue(const LibertyLibrary *library,
-		  const LibertyCell *cell,
-		  const Pvt *pvt,
+  float findValue(const Pvt *pvt,
 		  const TableModel *model,
 		  float in_slew,
 		  float load_cap,
 		  float related_out_cap) const;
  string reportTableLookup(const char *result_name,
-                           const LibertyLibrary *library,
-                           const LibertyCell *cell,
                           const Pvt *pvt,
                           const TableModel *model,
                           float in_slew,
@@ -133,19 +126,18 @@ protected:
 class CheckTableModel : public CheckTimingModel
 {
 public:
-  explicit CheckTableModel(TableModel *model,
+  explicit CheckTableModel(LibertyCell *cell,
+                           TableModel *model,
 			   TableModel *sigma_models[EarlyLate::index_count]);
  virtual ~CheckTableModel();
-  void checkDelay(const LibertyCell *cell,
-                  const Pvt *pvt,
+  void checkDelay(const Pvt *pvt,
                  float from_slew,
                  float to_slew,
                  float related_out_cap,
                  bool pocv_enabled,
                  // Return values.
                  ArcDelay &margin) const override;
-  string reportCheckDelay(const LibertyCell *cell,
-                          const Pvt *pvt,
+  string reportCheckDelay(const Pvt *pvt,
                          float from_slew,
                          const char *from_slew_annotation,
                          float to_slew,
@@ -160,9 +152,7 @@ public:

 protected:
  void setIsScaled(bool is_scaled) override;
-  float findValue(const LibertyLibrary *library,
-		  const LibertyCell *cell,
-		  const Pvt *pvt,
+  float findValue(const Pvt *pvt,
 		  const TableModel *model,
 		  float from_slew,
 		  float to_slew,
@@ -179,8 +169,6 @@ protected:
 		  float in_slew,
 		  float related_out_cap) const;
  string reportTableDelay(const char *result_name,
-                          const LibertyLibrary *library,
-                          const LibertyCell *cell,
                          const Pvt *pvt,
                          const TableModel *model,
                          float from_slew,
@@ -217,14 +205,12 @@ public:
 		  float value2,
 		  float value3) const;
  // Table interpolated lookup with scale factor.
-  float findValue(const LibertyLibrary *library,
-		  const LibertyCell *cell,
+  float findValue(const LibertyCell *cell,
 		  const Pvt *pvt,
 		  float value1,
 		  float value2,
 		  float value3) const;
  string reportValue(const char *result_name,
-                     const LibertyLibrary *library,
                     const LibertyCell *cell,
                     const Pvt *pvt,
                     float value1,
@@ -237,11 +223,9 @@ public:
                Report *report) const;

 protected:
-  float scaleFactor(const LibertyLibrary *library,
-		    const LibertyCell *cell,
+  float scaleFactor(const LibertyCell *cell,
 		    const Pvt *pvt) const;
-  string reportPvtScaleFactor(const LibertyLibrary *library,
-                              const LibertyCell *cell,
+  string reportPvtScaleFactor(const LibertyCell *cell,
                              const Pvt *pvt,
                              int digits) const;

@@ -280,7 +264,6 @@ public:
 		  float axis_value2,
 		  float axis_value3) const;
  virtual string reportValue(const char *result_name,
-                             const LibertyLibrary *library,
                             const LibertyCell *cell,
                             const Pvt *pvt,
                             float value1,
@@ -306,7 +289,6 @@ public:
                  float axis_value2,
                  float axis_value3) const override;
  string reportValue(const char *result_name,
-                     const LibertyLibrary *library,
                     const LibertyCell *cell,
                     const Pvt *pvt,
                     float value1,
@@ -342,7 +324,6 @@ public:
                  float value2,
                  float value3) const override;
  string reportValue(const char *result_name,
-                     const LibertyLibrary *library,
                     const LibertyCell *cell,
                     const Pvt *pvt,
                     float value1,
@@ -389,7 +370,6 @@ public:
                  float value2,
                  float value3) const override;
  string reportValue(const char *result_name,
-                     const LibertyLibrary *library,
                     const LibertyCell *cell,
                     const Pvt *pvt,
                     float value1,
@@ -436,7 +416,6 @@ public:
                  float value2,
                  float value3) const override;
  string reportValue(const char *result_name,
-                     const LibertyLibrary *library,
                     const LibertyCell *cell,
                     const Pvt *pvt,
                     float value1,