Merge pull request #2753 from gadfort/metrics-scale

metrics: fix timing metrics

Author: maliberty

src/Metrics.tcl

@@ -55,33 +55,50 @@ define_cmd_args "report_tns_metric" {[-setup]|[-hold]}
 proc report_tns_metric { args } {
   parse_key_args "report_tns_metric" args keys {} flags {-setup -hold}
 
-  set min_max "max"
+  set min_max "-max"
   set metric_name "timing__setup__tns"
   if { ![info exists flags(-setup)] && [info exists flags(-hold)] } {
-    set min_max "min"
+    set min_max "-min"
     set metric_name "timing__hold__tns"
   } elseif { [info exists flags(-setup)] && [info exists flags(-hold)] } {
-    utl::error ORD 18 "both -setup and -hold specified."
+    utl::error ORD 14 "both -setup and -hold specified."
   }
 
-  utl::metric_float $metric_name [total_negative_slack_cmd $min_max]
+  utl::metric_float $metric_name [total_negative_slack $min_max]
 }
 
 define_cmd_args "report_worst_slack_metric" {[-setup]|[-hold]}
 proc report_worst_slack_metric { args } {
   global sta_report_default_digits
   parse_key_args "report_worst_slack_metric" args keys {} flags {-setup -hold}
 
-  set min_max "max"
+  set min_max "-max"
   set metric_name "timing__setup__ws"
   if { ![info exists flags(-setup)] && [info exists flags(-hold)] } {
-    set min_max "min"
+    set min_max "-min"
     set metric_name "timing__hold__ws"
   } elseif { [info exists flags(-setup)] && [info exists flags(-hold)] } {
-    utl::error ORD 17 "both -steup and -hold specified."
+    utl::error ORD 17 "both -setup and -hold specified."
+  }
+
+  utl::metric_float $metric_name [worst_slack $min_max]
+}
+
+define_cmd_args "report_worst_negative_slack_metric" {[-setup]|[-hold]}
+proc report_worst_negative_slack_metric { args } {
+  global sta_report_default_digits
+  parse_key_args "report_worst_negative_slack_metric" args keys {} flags {-setup -hold}
+
+  set min_max "-max"
+  set metric_name "timing__setup__wns"
+  if { ![info exists flags(-setup)] && [info exists flags(-hold)] } {
+    set min_max "-min"
+    set metric_name "timing__hold__wns"
+  } elseif { [info exists flags(-setup)] && [info exists flags(-hold)] } {
+    utl::error ORD 18 "both -setup and -hold specified."
   }
 
-  utl::metric_float $metric_name [worst_slack_cmd $min_max]
+  utl::metric_float $metric_name [worst_negative_slack $min_max]
 }
 
 define_cmd_args "report_erc_metrics" {}
@@ -112,7 +129,7 @@ proc report_power_metric { args } {
   parse_key_args "report_power_metric" args keys {-corner} flags {}
   set corner [sta::parse_corner keys]
   set power_result [design_power $corner]
-  set totals        [lrange $power_result  0  3]
+  set totals       [lrange $power_result  0  3]
   lassign $totals design_internal design_switching design_leakage design_total
 
   utl::metric_float "power__internal__total" $design_internal