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

liberty rm pulling resistance unit 

Signed-off-by: James Cherry <cherry@parallaxsw.com>
This commit is contained in:
James Cherry 2023-05-10 10:02:48 -07:00
parent 21de3cf383
commit 9cedf395ad
5 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/sta/Units.hh
View File

@ -72,8 +72,6 @@ public:
const Unit *voltageUnit() const { return &voltage_unit_; }
Unit *resistanceUnit() { return &resistance_unit_; }
const Unit *resistanceUnit() const { return &resistance_unit_; }
Unit *pullingResistanceUnit() { return &pulling_resistance_unit_; }
const Unit *pullingResistanceUnit() const {return &pulling_resistance_unit_;}
Unit *currentUnit() { return &current_unit_; }
const Unit *currentUnit() const { return &current_unit_; }
Unit *powerUnit() { return &power_unit_; }
@ -88,7 +86,6 @@ private:
Unit capacitance_unit_;
Unit voltage_unit_;
Unit resistance_unit_;
Unit pulling_resistance_unit_;
Unit current_unit_;
Unit power_unit_;
Unit distance_unit_;

13
liberty/LibertyReader.cc
View File

@ -134,7 +134,6 @@ LibertyReader::readLibertyFile(const char *filename,
mode_value_ = nullptr;
ocv_derate_ = nullptr;
pg_port_ = nullptr;
have_resistance_unit_ = false;
default_operating_condition_ = nullptr;
receiver_model_ = nullptr;
@ -648,12 +647,6 @@ LibertyReader::endLibrary(LibertyGroup *group)
void
LibertyReader::endLibraryAttrs(LibertyGroup *group)
{
// Default resistance_unit to pulling_resistance_unit.
if (!have_resistance_unit_) {
Units *units = library_->units();
*units->resistanceUnit() = *units->pullingResistanceUnit();
}
// These attributes reference named groups in the library so
// wait until the end of the library to resolve them.
if (default_wireload_) {
@ -727,16 +720,14 @@ LibertyReader::visitPullingResistanceUnit(LibertyAttr *attr)
{
if (library_)
parseUnits(attr, "ohm", res_scale_,
library_->units()->pullingResistanceUnit());
library_->units()->resistanceUnit());
}
void
LibertyReader::visitResistanceUnit(LibertyAttr *attr)
{
if (library_) {
if (library_)
parseUnits(attr, "ohm", res_scale_, library_->units()->resistanceUnit());
have_resistance_unit_ = true;
}
}
void

1
liberty/LibertyReaderPvt.hh
View File

@ -624,7 +624,6 @@ protected:
float power_scale_;
float energy_scale_;
float distance_scale_;
bool have_resistance_unit_;
const char *default_operating_condition_;
ReceiverModelPtr receiver_model_;
OutputWaveformSeq output_currents_;

1
liberty/Units.cc
View File

@ -168,7 +168,6 @@ Units::Units() :
capacitance_unit_("F"),
voltage_unit_("v"),
resistance_unit_("ohm"),
pulling_resistance_unit_("ohm"),
current_unit_("A"),
power_unit_("W"),
distance_unit_("m"),

1
search/MakeTimingModel.cc
View File

@ -133,7 +133,6 @@ MakeTimingModel::makeLibrary()
*library_->units()->capacitanceUnit() = *default_lib->units()->capacitanceUnit();
*library_->units()->voltageUnit() = *default_lib->units()->voltageUnit();
*library_->units()->resistanceUnit() = *default_lib->units()->resistanceUnit();
*library_->units()->pullingResistanceUnit() = *default_lib->units()->pullingResistanceUnit();
*library_->units()->powerUnit() = *default_lib->units()->powerUnit();
*library_->units()->distanceUnit() = *default_lib->units()->distanceUnit();