Merge pull request #333 from hzeller/feature-20240611-extract-power-t…

…otal

Extract the correct power totals from the logfile.

place_and_route/private/benchmark.bzl

@@ -67,13 +67,13 @@ def benchmark(ctx, open_road_info):
         ("worst_slack_max:", "'/wns/ {{ print $2 }}')"),
         ("total_negative_slack_max:", "'/tns/ {{ print $2 }}')"),
         ("power_total {", "'')"),
-        ("  internal_package_watts:", "'/Total/ {{ intern_power=$2 }} END {{ print intern_power }}')"),
-        ("  switching_package_watts:", "'/Total/ {{ switch_power=$3 }} END {{ print switch_power }}')"),
-        ("  total_package_watts:", "'/Total/ {{ total_power=$5 }} END {{ print total_power }}')"),
+        ("  internal_package_watts:", "'/^Total / {{ intern_power=$2 }} END {{ print intern_power }}')"),
+        ("  switching_package_watts:", "'/^Total / {{ switch_power=$3 }} END {{ print switch_power }}')"),
+        ("  total_package_watts:", "'/^Total / {{ total_power=$5 }} END {{ print total_power }}')"),
         ("}", "'')"),
         ("area_micro_meters_squared:", "'/Design area/ {{ print $3 }}')"),
         ("area_utilization_percentage:", "-F '[ %]' '/Design area/ {{ print $5 }}')"),
-        ("num_combinational_gates:", "'/Complex combinational cells:/ {{ print $4 }}')"),
+        ("num_combinational_gates:", "'/combinational cells:/ {{ print $4 }}')"),
         ("num_flops:", "'/Sequential cells:/ {{ print $3 }}')"),
         ("num_buffers:", "'/Buffer/ {{ buffers=$2; exit }} END {{ print buffers }}')"),
         ("num_timing_buffers:", "'/Timing Repair/ {{ print $4 }}')"),