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

rm using std::string from headers 

Signed-off-by: James Cherry <cherry@parallaxsw.com>
This commit is contained in:
James Cherry 2025-05-22 09:25:56 -07:00
parent 9c85946be0
commit 71bdfb9904
36 changed files with 224 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/StaMain.cc
View File

@ -97,7 +97,7 @@ sourceTclFile(const char *filename,
bool verbose,
Tcl_Interp *interp)
{
string cmd;
std::string cmd;
stringPrint(cmd, "sta::include_file %s %s %s",
filename,
echo ? "1" : "0",

1
dcalc/ArnoldiDelayCalc.cc
View File

@ -64,6 +64,7 @@ namespace sta {
// ra_get_r
// ra_get_s
using std::string;
using std::abs;
using std::vector;

2
dcalc/CcsCeffDelayCalc.cc
View File

@ -39,6 +39,8 @@
namespace sta {
using std::string;
// Implementaion based on:
// "Gate Delay Estimation with Library Compatible Current Source Models
// and Effective Capacitance", D. Garyfallou et al,

16
dcalc/CcsCeffDelayCalc.hh
View File

@ -50,14 +50,14 @@ public:
const Parasitic *parasitic,
const LoadPinIndexMap &load_pin_index_map,
const DcalcAnalysisPt *dcalc_ap) override;
string reportGateDelay(const Pin *drvr_pin,
const TimingArc *arc,
const Slew &in_slew,
float load_cap,
const Parasitic *parasitic,
const LoadPinIndexMap &load_pin_index_map,
const DcalcAnalysisPt *dcalc_ap,
int digits) override;
std::string reportGateDelay(const Pin *drvr_pin,
const TimingArc *arc,
const Slew &in_slew,
float load_cap,
const Parasitic *parasitic,
const LoadPinIndexMap &load_pin_index_map,
const DcalcAnalysisPt *dcalc_ap,
int digits) override;
// Record waveform for drvr/load pin.
void watchPin(const Pin *pin) override;

2
dcalc/DelayCalc.i
View File

@ -32,6 +32,8 @@
#include "dcalc/PrimaDelayCalc.hh"
#include "Sta.hh"
using std::string;
%}
%inline %{

1
dcalc/DelayCalcBase.cc
View File

@ -39,6 +39,7 @@
namespace sta {
using std::string;
using std::log;
DelayCalcBase::DelayCalcBase(StaState *sta) :

16
dcalc/DelayCalcBase.hh
View File

@ -52,14 +52,14 @@ public:
float related_out_cap,
const DcalcAnalysisPt *dcalc_ap) override;
string reportCheckDelay(const Pin *check_pin,
const TimingArc *arc,
const Slew &from_slew,
const char *from_slew_annotation,
const Slew &to_slew,
float related_out_cap,
const DcalcAnalysisPt *dcalc_ap,
int digits) override;
std::string reportCheckDelay(const Pin *check_pin,
const TimingArc *arc,
const Slew &from_slew,
const char *from_slew_annotation,
const Slew &to_slew,
float related_out_cap,
const DcalcAnalysisPt *dcalc_ap,
int digits) override;
protected:
// Find the liberty library to use for logic/slew thresholds.

1
dcalc/DmpCeff.cc
View File

@ -51,6 +51,7 @@
namespace sta {
using std::string;
using std::abs;
using std::min;
using std::max;

16
dcalc/DmpCeff.hh
View File

@ -50,14 +50,14 @@ public:
const Parasitic *parasitic,
const LoadPinIndexMap &load_pin_index_map,
const DcalcAnalysisPt *dcalc_ap) override;
string reportGateDelay(const Pin *drvr_pin,
const TimingArc *arc,
const Slew &in_slew,
float load_cap,
const Parasitic *parasitic,
const LoadPinIndexMap &load_pin_index_map,
const DcalcAnalysisPt *dcalc_ap,
int digits) override;
std::string reportGateDelay(const Pin *drvr_pin,
const TimingArc *arc,
const Slew &in_slew,
float load_cap,
const Parasitic *parasitic,
const LoadPinIndexMap &load_pin_index_map,
const DcalcAnalysisPt *dcalc_ap,
int digits) override;
void copyState(const StaState *sta) override;
protected:

1
dcalc/GraphDelayCalc.cc
View File

@ -49,6 +49,7 @@
namespace sta {
using std::string;
using std::abs;
using std::array;

1
dcalc/LumpedCapDelayCalc.cc
View File

@ -41,6 +41,7 @@
namespace sta {
using std::string;
using std::isnan;
ArcDelayCalc *

16
dcalc/LumpedCapDelayCalc.hh
View File

@ -57,14 +57,14 @@ public:
const Parasitic *parasitic,
const LoadPinIndexMap &load_pin_index_map,
const DcalcAnalysisPt *dcalc_ap) override;
string reportGateDelay(const Pin *drvr_pin,
const TimingArc *arc,
const Slew &in_slew,
float load_cap,
const Parasitic *parasitic,
const LoadPinIndexMap &load_pin_index_map,
const DcalcAnalysisPt *dcalc_ap,
int digits) override;
std::string reportGateDelay(const Pin *drvr_pin,
const TimingArc *arc,
const Slew &in_slew,
float load_cap,
const Parasitic *parasitic,
const LoadPinIndexMap &load_pin_index_map,
const DcalcAnalysisPt *dcalc_ap,
int digits) override;
protected:
ArcDcalcResult makeResult(const LibertyLibrary *drvr_library,

1
dcalc/PrimaDelayCalc.cc
View File

@ -45,6 +45,7 @@
namespace sta {
using std::string;
using std::abs;
using std::make_shared;
using Eigen::SparseLU;

2
dcalc/UnitDelayCalc.cc
View File

@ -28,6 +28,8 @@
namespace sta {
using std::string;
ArcDelayCalc *
makeUnitDelayCalc(StaState *sta)
{

32
dcalc/UnitDelayCalc.hh
View File

@ -74,22 +74,22 @@ public:
const Slew &to_slew,
float related_out_cap,
const DcalcAnalysisPt *dcalc_ap) override;
string reportGateDelay(const Pin *drvr_pin,
const TimingArc *arc,
const Slew &in_slew,
float load_cap,
const Parasitic *parasitic,
const LoadPinIndexMap &load_pin_index_map,
const DcalcAnalysisPt *dcalc_ap,
int digits) override;
string reportCheckDelay(const Pin *check_pin,
const TimingArc *arc,
const Slew &from_slew,
const char *from_slew_annotation,
const Slew &to_slew,
float related_out_cap,
const DcalcAnalysisPt *dcalc_ap,
int digits) override;
std::string reportGateDelay(const Pin *drvr_pin,
const TimingArc *arc,
const Slew &in_slew,
float load_cap,
const Parasitic *parasitic,
const LoadPinIndexMap &load_pin_index_map,
const DcalcAnalysisPt *dcalc_ap,
int digits) override;
std::string reportCheckDelay(const Pin *check_pin,
const TimingArc *arc,
const Slew &from_slew,
const char *from_slew_annotation,
const Slew &to_slew,
float related_out_cap,
const DcalcAnalysisPt *dcalc_ap,
int digits) override;
void finishDrvrPin() override;
protected:

32
include/sta/ArcDelayCalc.hh
View File

@ -232,23 +232,23 @@ public:
float related_out_cap,
const DcalcAnalysisPt *dcalc_ap) = 0;
// Report delay and slew calculation.
virtual string reportGateDelay(const Pin *drvr_pin,
const TimingArc *arc,
const Slew &in_slew,
float load_cap,
const Parasitic *parasitic,
const LoadPinIndexMap &load_pin_index_map,
const DcalcAnalysisPt *dcalc_ap,
int digits) = 0;
virtual std::string reportGateDelay(const Pin *drvr_pin,
const TimingArc *arc,
const Slew &in_slew,
float load_cap,
const Parasitic *parasitic,
const LoadPinIndexMap &load_pin_index_map,
const DcalcAnalysisPt *dcalc_ap,
int digits) = 0;
// Report timing check delay calculation.
virtual string reportCheckDelay(const Pin *check_pin,
const TimingArc *arc,
const Slew &from_slew,
const char *from_slew_annotation,
const Slew &to_slew,
float related_out_cap,
const DcalcAnalysisPt *dcalc_ap,
int digits) = 0;
virtual std::string reportCheckDelay(const Pin *check_pin,
const TimingArc *arc,
const Slew &from_slew,
const char *from_slew_annotation,
const Slew &to_slew,
float related_out_cap,
const DcalcAnalysisPt *dcalc_ap,
int digits) = 0;
virtual void finishDrvrPin() = 0;
};

10
include/sta/GraphDelayCalc.hh
View File

@ -69,11 +69,11 @@ public:
// Find and annotate drvr_vertex gate and load delays/slews.
virtual void findDelays(Vertex *drvr_vertex);
// Returned string is owned by the caller.
virtual string reportDelayCalc(const Edge *edge,
const TimingArc *arc,
const Corner *corner,
const MinMax *min_max,
int digits);
virtual std::string reportDelayCalc(const Edge *edge,
const TimingArc *arc,
const Corner *corner,
const MinMax *min_max,
int digits);
// Percentage (0.0:1.0) change in delay that causes downstream
// delays to be recomputed during incremental delay calculation.
virtual float incrementalDelayTolerance();

24
include/sta/LinearModel.hh
View File

@ -41,11 +41,11 @@ public:
// Return values.
ArcDelay &gate_delay,
Slew &drvr_slew) const override;
string reportGateDelay(const Pvt *pvt,
float in_slew,
float load_cap,
bool pocv_enabled,
int digits) const override;
std::string reportGateDelay(const Pvt *pvt,
float in_slew,
float load_cap,
bool pocv_enabled,
int digits) const override;
float driveResistance(const Pvt *pvt) const override;
protected:
@ -65,13 +65,13 @@ public:
float to_slew,
float related_out_cap,
bool pocv_enabled) const override;
string reportCheckDelay(const Pvt *pvt,
float from_slew,
const char *from_slew_annotation,
float to_slew,
float related_out_cap,
bool pocv_enabled,
int digits) const override;
std::string reportCheckDelay(const Pvt *pvt,
float from_slew,
const char *from_slew_annotation,
float to_slew,
float related_out_cap,
bool pocv_enabled,
int digits) const override;
protected:
void setIsScaled(bool is_scaled) override;

10
include/sta/Sta.hh
View File

@ -907,11 +907,11 @@ public:
PinSet findGroupPathPins(const char *group_path_name);
// Find all required times after updateTiming().
void findRequireds();
string reportDelayCalc(Edge *edge,
TimingArc *arc,
const Corner *corner,
const MinMax *min_max,
int digits);
std::string reportDelayCalc(Edge *edge,
TimingArc *arc,
const Corner *corner,
const MinMax *min_max,
int digits);
void writeSdc(const char *filename,
// Map hierarchical pins and instances to leaf pins and instances.
bool leaf,

176
include/sta/TableModel.hh
View File

@ -82,11 +82,11 @@ public:
bool pocv_enabled,
ArcDelay &gate_delay,
Slew &drvr_slew) const __attribute__ ((deprecated));
string reportGateDelay(const Pvt *pvt,
float in_slew,
float load_cap,
bool pocv_enabled,
int digits) const override;
std::string reportGateDelay(const Pvt *pvt,
float in_slew,
float load_cap,
bool pocv_enabled,
int digits) const override;
float driveResistance(const Pvt *pvt) const override;
const TableModel *delayModel() const { return delay_model_; }
@ -112,13 +112,13 @@ protected:
float in_slew,
float load_cap,
float related_out_cap) const;
string reportTableLookup(const char *result_name,
const Pvt *pvt,
const TableModel *model,
float in_slew,
float load_cap,
float related_out_cap,
int digits) const;
std::string reportTableLookup(const char *result_name,
const Pvt *pvt,
const TableModel *model,
float in_slew,
float load_cap,
float related_out_cap,
int digits) const;
void findAxisValues(const TableModel *model,
float in_slew,
float load_cap,
@ -149,13 +149,13 @@ public:
float to_slew,
float related_out_cap,
bool pocv_enabled) const override;
string reportCheckDelay(const Pvt *pvt,
float from_slew,
const char *from_slew_annotation,
float to_slew,
float related_out_cap,
bool pocv_enabled,
int digits) const override;
std::string reportCheckDelay(const Pvt *pvt,
float from_slew,
const char *from_slew_annotation,
float to_slew,
float related_out_cap,
bool pocv_enabled,
int digits) const override;
const TableModel *model() const { return model_; }
// Check the axes before making the model.
@ -180,14 +180,14 @@ protected:
float load_cap,
float in_slew,
float related_out_cap) const;
string reportTableDelay(const char *result_name,
const Pvt *pvt,
const TableModel *model,
float from_slew,
const char *from_slew_annotation,
float to_slew,
float related_out_cap,
int digits) const;
std::string reportTableDelay(const char *result_name,
const Pvt *pvt,
const TableModel *model,
float from_slew,
const char *from_slew_annotation,
float to_slew,
float related_out_cap,
int digits) const;
static bool checkAxis(const TableAxis *axis);
TableModel *model_;
@ -222,24 +222,24 @@ public:
float value1,
float value2,
float value3) const;
string reportValue(const char *result_name,
const LibertyCell *cell,
const Pvt *pvt,
float value1,
const char *comment1,
float value2,
float value3,
const Unit *table_unit,
int digits) const;
string report(const Units *units,
Report *report) const;
std::string reportValue(const char *result_name,
const LibertyCell *cell,
const Pvt *pvt,
float value1,
const char *comment1,
float value2,
float value3,
const Unit *table_unit,
int digits) const;
std::string report(const Units *units,
Report *report) const;
protected:
float scaleFactor(const LibertyCell *cell,
const Pvt *pvt) const;
string reportPvtScaleFactor(const LibertyCell *cell,
const Pvt *pvt,
int digits) const;
std::string reportPvtScaleFactor(const LibertyCell *cell,
const Pvt *pvt,
int digits) const;
TablePtr table_;
TableTemplate *tbl_template_;
@ -275,15 +275,15 @@ public:
float axis_value1,
float axis_value2,
float axis_value3) const;
virtual string reportValue(const char *result_name,
const LibertyCell *cell,
const Pvt *pvt,
float value1,
const char *comment1,
float value2,
float value3,
const Unit *table_unit,
int digits) const = 0;
virtual std::string reportValue(const char *result_name,
const LibertyCell *cell,
const Pvt *pvt,
float value1,
const char *comment1,
float value2,
float value3,
const Unit *table_unit,
int digits) const = 0;
virtual void report(const Units *units,
Report *report) const = 0;
};
@ -300,15 +300,15 @@ public:
float findValue(float axis_value1,
float axis_value2,
float axis_value3) const override;
string reportValue(const char *result_name,
const LibertyCell *cell,
const Pvt *pvt,
float value1,
const char *comment1,
float value2,
float value3,
const Unit *table_unit,
int digits) const override;
std::string reportValue(const char *result_name,
const LibertyCell *cell,
const Pvt *pvt,
float value1,
const char *comment1,
float value2,
float value3,
const Unit *table_unit,
int digits) const override;
void report(const Units *units,
Report *report) const override;
using Table::findValue;
@ -337,15 +337,15 @@ public:
float findValue(float value1,
float value2,
float value3) const override;
string reportValue(const char *result_name,
const LibertyCell *cell,
const Pvt *pvt,
float value1,
const char *comment1,
float value2,
float value3,
const Unit *table_unit,
int digits) const override;
std::string reportValue(const char *result_name,
const LibertyCell *cell,
const Pvt *pvt,
float value1,
const char *comment1,
float value2,
float value3,
const Unit *table_unit,
int digits) const override;
void report(const Units *units,
Report *report) const override;
@ -382,15 +382,15 @@ public:
float findValue(float value1,
float value2,
float value3) const override;
string reportValue(const char *result_name,
const LibertyCell *cell,
const Pvt *pvt,
float value1,
const char *comment1,
float value2,
float value3,
const Unit *table_unit,
int digits) const override;
std::string reportValue(const char *result_name,
const LibertyCell *cell,
const Pvt *pvt,
float value1,
const char *comment1,
float value2,
float value3,
const Unit *table_unit,
int digits) const override;
void report(const Units *units,
Report *report) const override;
@ -428,15 +428,15 @@ public:
float findValue(float value1,
float value2,
float value3) const override;
string reportValue(const char *result_name,
const LibertyCell *cell,
const Pvt *pvt,
float value1,
const char *comment1,
float value2,
float value3,
const Unit *table_unit,
int digits) const override;
std::string reportValue(const char *result_name,
const LibertyCell *cell,
const Pvt *pvt,
float value1,
const char *comment1,
float value2,
float value3,
const Unit *table_unit,
int digits) const override;
void report(const Units *units,
Report *report) const override;
using Table::findValue;
@ -574,13 +574,13 @@ private:
class DriverWaveform
{
public:
DriverWaveform(const string &name,
DriverWaveform(const std::string &name,
TablePtr waveforms);
const char *name() const { return name_.c_str(); }
Table1 waveform(float slew);
private:
string name_;
std::string name_;
TablePtr waveforms_;
};

26
include/sta/TimingModel.hh
View File

@ -31,8 +31,6 @@
namespace sta {
using std::string;
// Abstract base class for GateTimingModel and CheckTimingModel.
class TimingModel
{
@ -58,11 +56,11 @@ public:
// Return values.
ArcDelay &gate_delay,
Slew &drvr_slew) const = 0;
virtual string reportGateDelay(const Pvt *pvt,
float in_slew,
float load_cap,
bool pocv_enabled,
int digits) const = 0;
virtual std::string reportGateDelay(const Pvt *pvt,
float in_slew,
float load_cap,
bool pocv_enabled,
int digits) const = 0;
virtual float driveResistance(const Pvt *pvt) const = 0;
};
@ -77,13 +75,13 @@ public:
float to_slew,
float related_out_cap,
bool pocv_enabled) const = 0;
virtual string reportCheckDelay(const Pvt *pvt,
float from_slew,
const char *from_slew_annotation,
float to_slew,
float related_out_cap,
bool pocv_enabled,
int digits) const = 0;
virtual std::string reportCheckDelay(const Pvt *pvt,
float from_slew,
const char *from_slew_annotation,
float to_slew,
float related_out_cap,
bool pocv_enabled,
int digits) const = 0;
};
} // namespace

2
liberty/InternalPower.cc
View File

@ -31,6 +31,8 @@
namespace sta {
using std::string;
InternalPowerAttrs::InternalPowerAttrs() :
when_(nullptr),
models_{nullptr, nullptr},

2
liberty/Liberty.cc
View File

@ -50,6 +50,8 @@
namespace sta {
using std::string;
typedef Set<LatchEnable*> LatchEnableSet;
void

2
liberty/LibertyBuilder.cc
View File

@ -37,6 +37,8 @@
namespace sta {
using std::string;
void
LibertyBuilder::init(Debug *debug,
Report *report)

8
liberty/LibertyReaderPvt.hh
View File

@ -62,8 +62,8 @@ class OutputWaveform;
typedef void (LibertyReader::*LibraryAttrVisitor)(LibertyAttr *attr);
typedef void (LibertyReader::*LibraryGroupVisitor)(LibertyGroup *group);
typedef Map<string, LibraryAttrVisitor> LibraryAttrMap;
typedef Map<string ,LibraryGroupVisitor> LibraryGroupMap;
typedef Map<std::string, LibraryAttrVisitor> LibraryAttrMap;
typedef Map<std::string ,LibraryGroupVisitor> LibraryGroupMap;
typedef Vector<PortGroup*> PortGroupSeq;
typedef Vector<SequentialGroup*> SequentialGroupSeq;
typedef Vector<LibertyFunc*> LibertyFuncSeq;
@ -672,7 +672,7 @@ protected:
OutputWaveforms *output_waveforms_;
float reference_time_;
bool reference_time_exists_;
string driver_waveform_name_;
std::string driver_waveform_name_;
TestCell *test_cell_;
// Saved state while parsing test_cell.
@ -932,7 +932,7 @@ protected:
LibertyPort *port_;
LibertyPortMemberIterator *bit_iterator_;
LibertyPort *range_bus_port_;
string range_bus_name_;
std::string range_bus_name_;
LibertyPort *range_name_next_;
int range_from_;
int range_to_;

2
liberty/LinearModel.cc
View File

@ -29,6 +29,8 @@
namespace sta {
using std::string;
GateLinearModel::GateLinearModel(LibertyCell *cell,
float intrinsic,
float resistance) :

1
liberty/TimingArc.cc
View File

@ -34,6 +34,7 @@
namespace sta {
using std::string;
using std::make_shared;
static bool

2
parasitics/SpefReader.cc
View File

@ -44,6 +44,8 @@
namespace sta {
using std::string;
bool
readSpefFile(const char *filename,
Instance *instance,

1
power/SaifReader.cc
View File

@ -41,6 +41,7 @@
namespace sta {
using std::string;
using std::min;
bool

1
power/VcdReader.cc
View File

@ -39,6 +39,7 @@
namespace sta {
using std::string;
using std::abs;
using std::min;
using std::to_string;

2
sdf/SdfWriter.cc
View File

@ -47,6 +47,8 @@
namespace sta {
using std::string;
class SdfWriter : public StaState
{
public:

1
search/MakeTimingModel.cc
View File

@ -52,6 +52,7 @@
namespace sta {
using std::string;
using std::min;
using std::max;
using std::make_shared;

2
search/ReportPath.cc
View File

@ -63,6 +63,8 @@
namespace sta {
using std::string;
static void
hierPinsAbove(const Net *net,
const Network *network,

1
search/Sta.cc
View File

@ -86,6 +86,7 @@
namespace sta {
using std::string;
using std::min;
using std::max;

1
spice/WritePathSpice.cc
View File

@ -52,6 +52,7 @@
namespace sta {
using std::string;
using std::ofstream;
using std::ifstream;
using std::max;

1
spice/WriteSpice.cc
View File

@ -45,6 +45,7 @@
namespace sta {
using std::string;
using std::ifstream;
using std::ofstream;
using std::swap;