luke
/
OpenSTA
mirror of https://github.com/The-OpenROAD-Project/OpenSTA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup 

Signed-off-by: James Cherry <cherry@parallaxsw.com>
This commit is contained in:
James Cherry 2026-03-31 16:45:47 -07:00
parent 8c1ebce695
commit 638ffa57d4
2 changed files with 58 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
dcalc/DmpCeff.cc
View File

@ -44,7 +44,6 @@
#include "TimingArc.hh" #include "TimingArc.hh"
#include "TableModel.hh" #include "TableModel.hh"
#include "Liberty.hh" #include "Liberty.hh"
#include "Network.hh"
#include "Sdc.hh" #include "Sdc.hh"
#include "Parasitics.hh" #include "Parasitics.hh"
#include "ArcDelayCalc.hh" #include "ArcDelayCalc.hh"
@ -78,11 +77,11 @@ exp2(double x);
class DmpError : public Exception class DmpError : public Exception
{ {
public: public:
DmpError(const char *what); DmpError(std::string_view what);
virtual const char *what() const noexcept { return what_; } virtual const char *what() const noexcept { return what_.c_str(); }
private: private:
const char *what_; std::string what_;
}; };
static double static double
@ -139,9 +138,9 @@ public:
double c2, double c2,
double rpi, double rpi,
double c1); double c1);
virtual void gateDelaySlew( // Return values. virtual void gateDelaySlew(// Return values.
double &delay, double &delay,
double &slew) = 0; double &slew) = 0;
virtual void loadDelaySlew(const Pin *load_pin, virtual void loadDelaySlew(const Pin *load_pin,
double elmore, double elmore,
// Return values. // Return values.
@ -685,9 +684,9 @@ public:
double c2, double c2,
double rpi, double rpi,
double c1) override; double c1) override;
void gateDelaySlew( // Return values. void gateDelaySlew(// Return values.
double &delay, double &delay,
double &slew) override; double &slew) override;
void loadDelaySlew(const Pin *, void loadDelaySlew(const Pin *,
double elmore, double elmore,
// Return values. // Return values.
@ -726,15 +725,15 @@ DmpCap::init(const LibertyLibrary *drvr_library,
double c1) double c1)
{ {
debugPrint(debug_, "dmp_ceff", 3, "Using DMP cap"); debugPrint(debug_, "dmp_ceff", 3, "Using DMP cap");
DmpAlg::init(drvr_library, drvr_cell, pvt, gate_model, rf, rd, in_slew, c2, rpi, DmpAlg::init(drvr_library, drvr_cell, pvt, gate_model, rf, rd, in_slew,
c1); c2, rpi, c1);
ceff_ = c1 + c2; ceff_ = c1 + c2;
} }
void void
DmpCap::gateDelaySlew( // Return values. DmpCap::gateDelaySlew(// Return values.
double &delay, double &delay,
double &slew) double &slew)
{ {
debugPrint(debug_, "dmp_ceff", 3, " ceff = {}", debugPrint(debug_, "dmp_ceff", 3, " ceff = {}",
units_->capacitanceUnit()->asString(ceff_)); units_->capacitanceUnit()->asString(ceff_));
@ -801,9 +800,9 @@ public:
double c2, double c2,
double rpi, double rpi,
double c1) override; double c1) override;
void gateDelaySlew( // Return values. void gateDelaySlew(// Return values.
double &delay, double &delay,
double &slew) override; double &slew) override;
void evalDmpEqns() override; void evalDmpEqns() override;
double voCrossingUpperBound() override; double voCrossingUpperBound() override;
@ -868,8 +867,8 @@ DmpPi::init(const LibertyLibrary *drvr_library,
double c1) double c1)
{ {
debugPrint(debug_, "dmp_ceff", 3, "Using DMP Pi"); debugPrint(debug_, "dmp_ceff", 3, "Using DMP Pi");
DmpAlg::init(drvr_library, drvr_cell, pvt, gate_model, rf, rd, in_slew, c2, rpi, DmpAlg::init(drvr_library, drvr_cell, pvt, gate_model, rf, rd, in_slew,
c1); c2, rpi, c1);
// Find poles/zeros. // Find poles/zeros.
z1_ = 1.0 / (rpi_ * c1_); z1_ = 1.0 / (rpi_ * c1_);
@ -893,9 +892,9 @@ DmpPi::init(const LibertyLibrary *drvr_library,
} }
void void
DmpPi::gateDelaySlew( // Return values. DmpPi::gateDelaySlew(// Return values.
double &delay, double &delay,
double &slew) double &slew)
{ {
driver_valid_ = false; driver_valid_ = false;
try { try {
@ -1127,9 +1126,9 @@ public:
double c2, double c2,
double rpi, double rpi,
double c1) override; double c1) override;
void gateDelaySlew( // Return values. void gateDelaySlew(// Return values.
double &delay, double &delay,
double &slew) override; double &slew) override;
private: private:
void V0(double t, void V0(double t,
@ -1176,8 +1175,8 @@ DmpZeroC2::init(const LibertyLibrary *drvr_library,
double c1) double c1)
{ {
debugPrint(debug_, "dmp_ceff", 3, "Using DMP C2=0"); debugPrint(debug_, "dmp_ceff", 3, "Using DMP C2=0");
DmpAlg::init(drvr_library, drvr_cell, pvt, gate_model, rf, rd, in_slew, c2, rpi, DmpAlg::init(drvr_library, drvr_cell, pvt, gate_model, rf, rd, in_slew,
c1); c2, rpi, c1);
ceff_ = c1; ceff_ = c1;
z1_ = 1.0 / (rpi_ * c1_); z1_ = 1.0 / (rpi_ * c1_);
@ -1275,8 +1274,10 @@ newtonRaphson(const int max_iter,
all_under_x_tol = false; all_under_x_tol = false;
x[i] += p[i]; x[i] += p[i];
} }
if (all_under_x_tol) if (all_under_x_tol) {
eval();
return; return;
}
} }
throw DmpError("Newton-Raphson max iterations exceeded"); throw DmpError("Newton-Raphson max iterations exceeded");
} }
@ -1557,8 +1558,8 @@ DmpCeffDelayCalc::setCeffAlgorithm(const LibertyLibrary *drvr_library,
} }
else else
dmp_alg_ = dmp_cap_; dmp_alg_ = dmp_cap_;
dmp_alg_->init(drvr_library, drvr_cell, pvt, gate_model, rf, rd, in_slew, c2, rpi, dmp_alg_->init(drvr_library, drvr_cell, pvt, gate_model, rf, rd, in_slew,
c1); c2, rpi, c1);
debugPrint(debug_, "dmp_ceff", 3, debugPrint(debug_, "dmp_ceff", 3,
" DMP in_slew = {} c2 = {} rpi = {} c1 = {} Rd = {} ({} alg)", " DMP in_slew = {} c2 = {} rpi = {} c1 = {} Rd = {} ({} alg)",
units_->timeUnit()->asString(in_slew), units_->timeUnit()->asString(in_slew),
@ -1667,10 +1668,10 @@ DmpCeffDelayCalc::copyState(const StaState *sta)
dmp_zero_c2_->copyState(sta); dmp_zero_c2_->copyState(sta);
} }
DmpError::DmpError(const char *what) : DmpError::DmpError(std::string_view what) :
what_(what) what_(what)
{ {
// printf("DmpError %s\n", what); //sta::print(stdout, "DmpError {}\n", what);
} }
// This saves about 2.5% in overall run time on designs with SPEF. // This saves about 2.5% in overall run time on designs with SPEF.

48
dcalc/GraphDelayCalc.cc
View File

@ -1601,41 +1601,41 @@ GraphDelayCalc::findCheckEdgeDelays(Edge *edge,
for (Scene *scene : scenes_) { for (Scene *scene : scenes_) {
for (const MinMax *min_max : MinMax::range()) { for (const MinMax *min_max : MinMax::range()) {
DcalcAPIndex ap_index = scene->dcalcAnalysisPtIndex(min_max); DcalcAPIndex ap_index = scene->dcalcAnalysisPtIndex(min_max);
if (!graph_->arcDelayAnnotated(edge, arc, ap_index)) { if (!graph_->arcDelayAnnotated(edge, arc, ap_index)) {
const Slew &from_slew = checkEdgeClkSlew(from_vertex, from_rf, const Slew &from_slew = checkEdgeClkSlew(from_vertex, from_rf,
scene, min_max); scene, min_max);
const Slew to_slew = graph_->slew(to_vertex, to_rf, ap_index); const Slew to_slew = graph_->slew(to_vertex, to_rf, ap_index);
debugPrint(debug_, "delay_calc", 3, debugPrint(debug_, "delay_calc", 3,
" {} {} -> {} {} ({}) scene:{}/{}", " {} {} -> {} {} ({}) scene:{}/{}",
arc_set->from()->name(), arc_set->from()->name(),
arc->fromEdge()->to_string(), arc->fromEdge()->to_string(),
arc_set->to()->name(), arc_set->to()->name(),
arc->toEdge()->to_string(), arc->toEdge()->to_string(),
arc_set->role()->to_string(), arc_set->role()->to_string(),
scene->name(), scene->name(),
min_max->to_string()); min_max->to_string());
debugPrint(debug_, "delay_calc", 3, debugPrint(debug_, "delay_calc", 3,
" from_slew = {} to_slew = {}", " from_slew = {} to_slew = {}",
delayAsString(from_slew, this), delayAsString(from_slew, this),
delayAsString(to_slew, this)); delayAsString(to_slew, this));
float related_out_cap = 0.0; float related_out_cap = 0.0;
if (related_out_pin) if (related_out_pin)
related_out_cap = loadCap(related_out_pin, to_rf,scene,min_max, related_out_cap = loadCap(related_out_pin, to_rf,scene,min_max,
arc_delay_calc); arc_delay_calc);
ArcDelay check_delay = arc_delay_calc->checkDelay(to_pin, arc, from_slew, ArcDelay check_delay = arc_delay_calc->checkDelay(to_pin, arc, from_slew,
to_slew, related_out_cap, to_slew, related_out_cap,
scene, min_max); scene, min_max);
debugPrint(debug_, "delay_calc", 3, debugPrint(debug_, "delay_calc", 3,
" check_delay = {}", " check_delay = {}",
delayAsString(check_delay, this)); delayAsString(check_delay, this));
graph_->setArcDelay(edge, arc, ap_index, check_delay); graph_->setArcDelay(edge, arc, ap_index, check_delay);
delay_changed = true; delay_changed = true;
arc_delay_calc_->finishDrvrPin(); arc_delay_calc_->finishDrvrPin();
} }
}
} }
} }
} }
}
if (delay_changed && observer_) if (delay_changed && observer_)
observer_->checkDelayChangedTo(to_vertex); observer_->checkDelayChangedTo(to_vertex);