This commit is contained in:
James Cherry 2018-12-13 23:53:17 -08:00
parent 9e67bfe2c3
commit b8c43f0e93
5 changed files with 12 additions and 5 deletions

View File

@ -549,7 +549,7 @@ STA_INCLUDE="-I.. -I../util -I../liberty -I../network -I../graph -I../sdc -I../s
STA_LIBS="../search/libsearch.la ../sdf/libsdf.la ../graph/libgraph.la ../dcalc/libdcalc.la ../parasitics/libparasitics.la ../sdc/libsdc.la ../liberty/libliberty.la ../network/libnetwork.la ../util/libutil.la"
SWIG_DEPEND="../tcl/StaException.i ../tcl/StaTcl.i ../tcl/NetworkEdit.i ../sdf/Sdf.i ../dcalc/DelayCalc.i ../parasitics/Parasitics.i ../tcl/StaTcl.i"
SWIG_DEPEND="../tcl/StaException.i ../tcl/StaTcl.i ../tcl/NetworkEdit.i ../sdf/Sdf.i ../dcalc/DelayCalc.i ../parasitics/Parasitics.i"
TCL_INIT_FILES="../tcl/Util.tcl ../dcalc/DelayCalc.tcl ../tcl/Graph.tcl ../tcl/Liberty.tcl ../tcl/Link.tcl ../tcl/Network.tcl ../tcl/NetworkEdit.tcl ../parasitics/Parasitics.tcl ../tcl/Sdc.tcl ../sdf/Sdf.tcl ../tcl/Search.tcl ../tcl/Cmds.tcl ../tcl/Variables.tcl ../tcl/Sta.tcl ../tcl/Power.tcl ../tcl/Splash.tcl"

View File

@ -101,6 +101,14 @@ GraphDelayCalc::netCaps(const Pin *,
has_set_load = false;
}
float
GraphDelayCalc::ceff(Edge *,
TimingArc *,
const DcalcAnalysisPt *)
{
return 0.0;
}
void
GraphDelayCalc::minPulseWidth(const Pin *pin,
const TransRiseFall *hi_low,

View File

@ -98,7 +98,7 @@ public:
bool &has_set_load) const;
virtual float ceff(Edge *edge,
TimingArc *arc,
const DcalcAnalysisPt *dcalc_ap) = 0;
const DcalcAnalysisPt *dcalc_ap);
// Precedence:
// SDF annotation
// Liberty library

View File

@ -62,8 +62,7 @@ proc report_power_design { corner digits } {
set combinational [lrange $power_result 8 11]
set macro [lrange $power_result 12 15]
set pad [lrange $power_result 16 end]
lassign $totals design_internal design_switching \
design_leakage design_total
lassign $totals design_internal design_switching design_leakage design_total
report_power_row "Sequential" $sequential $design_total $digits
report_power_row "Combinational" $combinational $design_total $digits
report_power_row "Macro" $macro $design_total $digits

View File

@ -4818,8 +4818,8 @@ instance_power(Instance *inst,
PowerResult power;
Sta::sta()->power(inst, corner, power);
FloatSeq *floats = new FloatSeq;
floats->push_back(power.switching());
floats->push_back(power.internal());
floats->push_back(power.switching());
floats->push_back(power.leakage());
floats->push_back(power.total());
return floats;