From 239e6f0319f1c3f60aa4ac9655ccae3acd39aace Mon Sep 17 00:00:00 2001 From: James Cherry Date: Wed, 11 Oct 2023 13:28:53 -0700 Subject: [PATCH] NetCaps has_set_load -> has_net_load Signed-off-by: James Cherry --- dcalc/GraphDelayCalc1.cc | 2 +- dcalc/NetCaps.cc | 8 ++++---- dcalc/NetCaps.hh | 8 ++++---- sdc/Sdc.cc | 8 +++++--- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dcalc/GraphDelayCalc1.cc b/dcalc/GraphDelayCalc1.cc index 4ddbe053..a238242a 100644 --- a/dcalc/GraphDelayCalc1.cc +++ b/dcalc/GraphDelayCalc1.cc @@ -170,7 +170,7 @@ MultiDrvrNet::netCaps(const RiseFall *drvr_rf, pin_cap = net_caps.pinCap(); wire_cap = net_caps.wireCap(); fanout = net_caps.fanout(); - has_net_load = net_caps.hasSetLoad(); + has_net_load = net_caps.hasNetLoad(); } void diff --git a/dcalc/NetCaps.cc b/dcalc/NetCaps.cc index d0fb1eb8..4521eb99 100644 --- a/dcalc/NetCaps.cc +++ b/dcalc/NetCaps.cc @@ -25,11 +25,11 @@ NetCaps::NetCaps() NetCaps::NetCaps(float pin_cap, float wire_cap, float fanout, - bool has_set_load) : + bool has_net_load) : pin_cap_(pin_cap), wire_cap_(wire_cap), fanout_(fanout), - has_set_load_(has_set_load) + has_net_load_(has_net_load) { } @@ -37,12 +37,12 @@ void NetCaps::init(float pin_cap, float wire_cap, float fanout, - bool has_set_load) + bool has_net_load) { pin_cap_ = pin_cap; wire_cap_ = wire_cap; fanout_ = fanout; - has_set_load_ = has_set_load; + has_net_load_ = has_net_load; } } // namespace diff --git a/dcalc/NetCaps.hh b/dcalc/NetCaps.hh index 76498492..ca1ad970 100644 --- a/dcalc/NetCaps.hh +++ b/dcalc/NetCaps.hh @@ -26,21 +26,21 @@ public: NetCaps(float pin_cap, float wire_cap, float fanout, - bool has_set_load); + bool has_net_load); void init(float pin_cap, float wire_cap, float fanout, - bool has_set_load); + bool has_net_load); float pinCap() const { return pin_cap_; } float wireCap() const{ return wire_cap_; } float fanout() const{ return fanout_; } - bool hasSetLoad() const { return has_set_load_; } + bool hasNetLoad() const { return has_net_load_; } private: float pin_cap_; float wire_cap_; float fanout_; - bool has_set_load_; + bool has_net_load_; }; } // namespace diff --git a/sdc/Sdc.cc b/sdc/Sdc.cc index c16d4519..62df813c 100644 --- a/sdc/Sdc.cc +++ b/sdc/Sdc.cc @@ -3050,9 +3050,11 @@ Sdc::drvrPinWireCap(const Pin *pin, { MinMaxFloatValues *values = drvr_pin_wire_cap_maps_[corner->index()].findKey(pin); if (values) - return values->value(min_max, cap, exists); - cap = 0.0; - exists = false; + values->value(min_max, cap, exists); + else { + cap = 0.0; + exists = false; + } } void