From cab41188a01f74434364e20d972665ac4ef57509 Mon Sep 17 00:00:00 2001 From: James Cherry Date: Sat, 23 Sep 2023 13:58:22 -0700 Subject: [PATCH] parasitics const Signed-off-by: James Cherry --- dcalc/GraphDelayCalc.cc | 4 ++-- dcalc/GraphDelayCalc1.cc | 8 ++++---- dcalc/GraphDelayCalc1.hh | 8 ++++---- include/sta/GraphDelayCalc.hh | 4 ++-- include/sta/NullParasitics.hh | 4 ++-- include/sta/Parasitics.hh | 4 ++-- parasitics/ConcreteParasitics.cc | 8 ++++---- parasitics/ConcreteParasitics.hh | 4 ++-- parasitics/NullParasitics.cc | 4 ++-- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dcalc/GraphDelayCalc.cc b/dcalc/GraphDelayCalc.cc index 748d6cbd..d559e29d 100644 --- a/dcalc/GraphDelayCalc.cc +++ b/dcalc/GraphDelayCalc.cc @@ -54,7 +54,7 @@ GraphDelayCalc::incrementalDelayTolerance() void GraphDelayCalc::loadCap(const Pin *, - Parasitic *, + const Parasitic *, const RiseFall *, const DcalcAnalysisPt *, // Return values. @@ -74,7 +74,7 @@ GraphDelayCalc::loadCap(const Pin *, float GraphDelayCalc::loadCap(const Pin *, - Parasitic *, + const Parasitic *, const RiseFall *, const DcalcAnalysisPt *) const { diff --git a/dcalc/GraphDelayCalc1.cc b/dcalc/GraphDelayCalc1.cc index 300a4450..4ddbe053 100644 --- a/dcalc/GraphDelayCalc1.cc +++ b/dcalc/GraphDelayCalc1.cc @@ -1062,7 +1062,7 @@ GraphDelayCalc1::loadCap(const Pin *drvr_pin, float GraphDelayCalc1::loadCap(const Pin *drvr_pin, - Parasitic *drvr_parasitic, + const Parasitic *drvr_parasitic, const RiseFall *rf, const DcalcAnalysisPt *dcalc_ap) const { @@ -1072,7 +1072,7 @@ GraphDelayCalc1::loadCap(const Pin *drvr_pin, float GraphDelayCalc1::loadCap(const Pin *drvr_pin, MultiDrvrNet *multi_drvr, - Parasitic *drvr_parasitic, + const Parasitic *drvr_parasitic, const RiseFall *rf, const DcalcAnalysisPt *dcalc_ap) const { @@ -1091,7 +1091,7 @@ GraphDelayCalc1::loadCap(const Pin *drvr_pin, void GraphDelayCalc1::loadCap(const Pin *drvr_pin, - Parasitic *drvr_parasitic, + const Parasitic *drvr_parasitic, const RiseFall *rf, const DcalcAnalysisPt *dcalc_ap, // Return values. @@ -1107,7 +1107,7 @@ GraphDelayCalc1::loadCap(const Pin *drvr_pin, } void -GraphDelayCalc1::loadCap(Parasitic *drvr_parasitic, +GraphDelayCalc1::loadCap(const Parasitic *drvr_parasitic, bool has_net_load, // Return values. float &pin_cap, diff --git a/dcalc/GraphDelayCalc1.hh b/dcalc/GraphDelayCalc1.hh index 268da284..84189dcb 100644 --- a/dcalc/GraphDelayCalc1.hh +++ b/dcalc/GraphDelayCalc1.hh @@ -59,14 +59,14 @@ public: virtual float loadCap(const Pin *drvr_pin, const DcalcAnalysisPt *dcalc_ap) const; virtual void loadCap(const Pin *drvr_pin, - Parasitic *drvr_parasitic, + const Parasitic *drvr_parasitic, const RiseFall *rf, const DcalcAnalysisPt *dcalc_ap, // Return values. float &pin_cap, float &wire_cap) const; virtual float loadCap(const Pin *drvr_pin, - Parasitic *drvr_parasitic, + const Parasitic *drvr_parasitic, const RiseFall *rf, const DcalcAnalysisPt *dcalc_ap) const; virtual void netCaps(const Pin *drvr_pin, @@ -195,14 +195,14 @@ protected: const DcalcAnalysisPt *dcalc_ap); bool bidirectDrvrSlewFromLoad(const Vertex *vertex) const; MultiDrvrNet *multiDrvrNet(const Vertex *drvr_vertex) const; - void loadCap(Parasitic *drvr_parasitic, + void loadCap(const Parasitic *drvr_parasitic, bool has_set_load, // Return values. float &pin_cap, float &wire_cap) const; float loadCap(const Pin *drvr_pin, MultiDrvrNet *multi_drvr, - Parasitic *drvr_parasitic, + const Parasitic *drvr_parasitic, const RiseFall *rf, const DcalcAnalysisPt *dcalc_ap) const; diff --git a/include/sta/GraphDelayCalc.hh b/include/sta/GraphDelayCalc.hh index 77f5eae0..5d795979 100644 --- a/include/sta/GraphDelayCalc.hh +++ b/include/sta/GraphDelayCalc.hh @@ -71,7 +71,7 @@ public: // pin_cap = net pin capacitances + port external pin capacitance, // wire_cap = annotated net capacitance + port external wire capacitance. virtual void loadCap(const Pin *drvr_pin, - Parasitic *drvr_parasitic, + const Parasitic *drvr_parasitic, const RiseFall *rf, const DcalcAnalysisPt *dcalc_ap, // Return values. @@ -86,7 +86,7 @@ public: const DcalcAnalysisPt *dcalc_ap) const; // Load pin_cap + wire_cap. virtual float loadCap(const Pin *drvr_pin, - Parasitic *drvr_parasitic, + const Parasitic *drvr_parasitic, const RiseFall *rf, const DcalcAnalysisPt *dcalc_ap) const; virtual void netCaps(const Pin *drvr_pin, diff --git a/include/sta/NullParasitics.hh b/include/sta/NullParasitics.hh index c3aebb8b..6022069b 100644 --- a/include/sta/NullParasitics.hh +++ b/include/sta/NullParasitics.hh @@ -38,7 +38,7 @@ public: const ParasiticAnalysisPt *ap); virtual void deleteDrvrReducedParasitics(const Pin *drvr_pin); - virtual float capacitance(Parasitic *parasitic) const; + virtual float capacitance(const Parasitic *parasitic) const; virtual Parasitic * findPiElmore(const Pin *drvr_pin, @@ -91,7 +91,7 @@ public: virtual void poleResidue(const Parasitic *parasitic, int pole_index, ComplexFloat &pole, ComplexFloat &residue) const; - virtual bool isParasiticNetwork(Parasitic *parasitic) const; + virtual bool isParasiticNetwork(const Parasitic *parasitic) const; virtual Parasitic *findParasiticNetwork(const Net *net, const ParasiticAnalysisPt *ap) const; virtual Parasitic * diff --git a/include/sta/Parasitics.hh b/include/sta/Parasitics.hh index 4b772f11..d85fe31e 100644 --- a/include/sta/Parasitics.hh +++ b/include/sta/Parasitics.hh @@ -71,7 +71,7 @@ public: bool is_reduced) = 0; // Capacitance value of parasitic object. - virtual float capacitance(Parasitic *parasitic) const = 0; + virtual float capacitance(const Parasitic *parasitic) const = 0; //////////////////////////////////////////////////////////////// // Pi model driver load with elmore delays to load pins (RSPF). @@ -145,7 +145,7 @@ public: // Parasitic Network (detailed parasitics). // This api assumes that parasitic networks are not rise/fall // dependent because they do not include pin capacitances. - virtual bool isParasiticNetwork(Parasitic *parasitic) const = 0; + virtual bool isParasiticNetwork(const Parasitic *parasitic) const = 0; virtual Parasitic *findParasiticNetwork(const Net *net, const ParasiticAnalysisPt *ap) const = 0; virtual Parasitic *findParasiticNetwork(const Pin *pin, diff --git a/parasitics/ConcreteParasitics.cc b/parasitics/ConcreteParasitics.cc index 20851c23..e778dc50 100644 --- a/parasitics/ConcreteParasitics.cc +++ b/parasitics/ConcreteParasitics.cc @@ -928,9 +928,9 @@ ConcreteParasitics::save() } float -ConcreteParasitics::capacitance(Parasitic *parasitic) const +ConcreteParasitics::capacitance(const Parasitic *parasitic) const { - ConcreteParasitic *cparasitic = static_cast(parasitic); + const ConcreteParasitic *cparasitic = static_cast(parasitic); return cparasitic->capacitance(); } @@ -1273,9 +1273,9 @@ ConcreteParasitics::poleResidue(const Parasitic *parasitic, //////////////////////////////////////////////////////////////// bool -ConcreteParasitics::isParasiticNetwork(Parasitic *parasitic) const +ConcreteParasitics::isParasiticNetwork(const Parasitic *parasitic) const { - ConcreteParasitic *cparasitic = static_cast(parasitic); + const ConcreteParasitic *cparasitic = static_cast(parasitic); return cparasitic && cparasitic->isParasiticNetwork(); } diff --git a/parasitics/ConcreteParasitics.hh b/parasitics/ConcreteParasitics.hh index b4535bcf..71ec9556 100644 --- a/parasitics/ConcreteParasitics.hh +++ b/parasitics/ConcreteParasitics.hh @@ -59,7 +59,7 @@ public: virtual void setIsReducedParasiticNetwork(Parasitic *parasitic, bool is_reduced); - virtual float capacitance(Parasitic *parasitic) const; + virtual float capacitance(const Parasitic *parasitic) const; virtual bool isPiElmore(const Parasitic *parasitic) const; virtual Parasitic *findPiElmore(const Pin *drvr_pin, @@ -108,7 +108,7 @@ public: virtual void poleResidue(const Parasitic *parasitic, int pole_index, ComplexFloat &pole, ComplexFloat &residue) const; - virtual bool isParasiticNetwork(Parasitic *parasitic) const; + virtual bool isParasiticNetwork(const Parasitic *parasitic) const; virtual Parasitic *findParasiticNetwork(const Net *net, const ParasiticAnalysisPt *ap) const; virtual Parasitic *findParasiticNetwork(const Pin *pin, diff --git a/parasitics/NullParasitics.cc b/parasitics/NullParasitics.cc index 9ec90c39..203eebec 100644 --- a/parasitics/NullParasitics.cc +++ b/parasitics/NullParasitics.cc @@ -72,7 +72,7 @@ NullParasitics::deleteDrvrReducedParasitics(const Pin *) } float -NullParasitics::capacitance(Parasitic *) const +NullParasitics::capacitance(const Parasitic *) const { return 0.0; } @@ -212,7 +212,7 @@ NullParasitics::poleResidue(const Parasitic *, } bool -NullParasitics::isParasiticNetwork(Parasitic *) const +NullParasitics::isParasiticNetwork(const Parasitic *) const { return false; }