diff --git a/configure.ac b/configure.ac index 08625c15..daba9986 100644 --- a/configure.ac +++ b/configure.ac @@ -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" diff --git a/dcalc/GraphDelayCalc.cc b/dcalc/GraphDelayCalc.cc index b07e87db..3c55453e 100644 --- a/dcalc/GraphDelayCalc.cc +++ b/dcalc/GraphDelayCalc.cc @@ -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, diff --git a/dcalc/GraphDelayCalc.hh b/dcalc/GraphDelayCalc.hh index b1e438f7..020c4827 100644 --- a/dcalc/GraphDelayCalc.hh +++ b/dcalc/GraphDelayCalc.hh @@ -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 diff --git a/tcl/Power.tcl b/tcl/Power.tcl index 0f354093..8c00696b 100644 --- a/tcl/Power.tcl +++ b/tcl/Power.tcl @@ -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 diff --git a/tcl/StaTcl.i b/tcl/StaTcl.i index fac4355f..bda897a7 100644 --- a/tcl/StaTcl.i +++ b/tcl/StaTcl.i @@ -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;