From 9b08d98a12b1a3ff6597d915e85a2eb889ff0e84 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Tue, 11 Jun 2024 15:58:15 -0700 Subject: [PATCH] Extract the correct power totals from the logfile. There is another 'Total' in the logfile that would override the values just found (and does not have multiple columns). Make the regex a bit more specific to only latch on the line that actually contains all the power values. Also: 'Complex' combinational cells is now as 'Multi-input' combinational cells in the log file. Match that as well. --- place_and_route/private/benchmark.bzl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/place_and_route/private/benchmark.bzl b/place_and_route/private/benchmark.bzl index cfc988c3..fadd9428 100644 --- a/place_and_route/private/benchmark.bzl +++ b/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 }}')"),