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

Sta::readLiberty rm extra network arg 

Signed-off-by: James Cherry <cherry@parallaxsw.com>
This commit is contained in:
James Cherry 2021-11-13 11:52:00 -07:00
parent ddd7f39736
commit 1c9870c3d2
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/sta/Sta.hh
View File

@ -1285,12 +1285,10 @@ protected:
LibertyLibrary *readLibertyFile(const char *filename, LibertyLibrary *readLibertyFile(const char *filename,
Corner *corner, Corner *corner,
const MinMaxAll *min_max, const MinMaxAll *min_max,
bool infer_latches, bool infer_latches);
Network *network);
// Allow external Liberty reader to parse forms not used by Sta. // Allow external Liberty reader to parse forms not used by Sta.
virtual LibertyLibrary *readLibertyFile(const char *filename, virtual LibertyLibrary *readLibertyFile(const char *filename,
bool infer_latches, bool infer_latches);
Network *network);
void delayCalcPreamble(); void delayCalcPreamble();
void delaysInvalidFrom(Port *port); void delaysInvalidFrom(Port *port);
void delaysInvalidFromFanin(Port *port); void delaysInvalidFromFanin(Port *port);

15
search/Sta.cc
View File

@ -652,7 +652,7 @@ Sta::readLiberty(const char *filename,
{ {
Stats stats(debug_, report_); Stats stats(debug_, report_);
LibertyLibrary *library = readLibertyFile(filename, corner, min_max, LibertyLibrary *library = readLibertyFile(filename, corner, min_max,
infer_latches, network_); infer_latches);
if (library if (library
// The default library is the first library read. // The default library is the first library read.
// This corresponds to a link_path of '*'. // This corresponds to a link_path of '*'.
@ -669,11 +669,10 @@ LibertyLibrary *
Sta::readLibertyFile(const char *filename, Sta::readLibertyFile(const char *filename,
Corner *corner, Corner *corner,
const MinMaxAll *min_max, const MinMaxAll *min_max,
bool infer_latches, bool infer_latches)
Network *network)
{ {
LibertyLibrary *liberty = sta::readLibertyFile(filename, infer_latches, LibertyLibrary *liberty = sta::readLibertyFile(filename, infer_latches,
network); network_);
if (liberty) { if (liberty) {
// Don't map liberty cells if they are redefined by reading another // Don't map liberty cells if they are redefined by reading another
// library with the same cell names. // library with the same cell names.
@ -690,10 +689,9 @@ Sta::readLibertyFile(const char *filename,
LibertyLibrary * LibertyLibrary *
Sta::readLibertyFile(const char *filename, Sta::readLibertyFile(const char *filename,
bool infer_latches, bool infer_latches)
Network *network)
{ {
return sta::readLibertyFile(filename, infer_latches, network); return sta::readLibertyFile(filename, infer_latches, network_);
} }
void void
@ -713,8 +711,7 @@ Sta::setMinLibrary(const char *min_filename,
LibertyLibrary *max_lib = network_->findLibertyFilename(max_filename); LibertyLibrary *max_lib = network_->findLibertyFilename(max_filename);
if (max_lib) { if (max_lib) {
LibertyLibrary *min_lib = readLibertyFile(min_filename, cmd_corner_, LibertyLibrary *min_lib = readLibertyFile(min_filename, cmd_corner_,
MinMaxAll::min(), false, MinMaxAll::min(), false);
network_);
return min_lib != nullptr; return min_lib != nullptr;
} }
else else