Streamline metrics emission for synth stage

Signed-off-by: Martin Povišer <povik@cutebit.org>

Author: povik

flow/scripts/synth_odb.tcl

@@ -1,4 +1,4 @@
-utl::set_metrics_stage "floorplan__{}"
+utl::set_metrics_stage "synth__{}"
 source $::env(SCRIPTS_DIR)/load.tcl
 erase_non_stage_variables synth
 load_design 1_2_yosys.v 1_2_yosys.sdc
@@ -24,6 +24,9 @@ source_step_tcl PRE SYNTH
 # asap7/jpeg_lvt, asap7/swerv_wrapper, nangate45/ariane133).
 log_cmd eliminate_dead_logic
 
+report_design_area
+report_design_area_metrics
+
 source_step_tcl POST SYNTH
 orfs_write_db $::env(RESULTS_DIR)/1_synth.odb
 # Canonicalize 1_synth.sdc. The original SDC_FILE provided by

flow/util/genMetrics.py

@@ -209,7 +209,6 @@ def merge_jsons(root_path, output, files):
         with open(path, "r") as file:
             data = json.load(file)
         output.update(data)
-    return len(paths) != 0
 
 
 def extract_metrics(
@@ -246,27 +245,7 @@ def extract_metrics(
 
     # Synthesis
     # =========================================================================
-
-    # Try sourcing metrics from OpenROAD's syn flow first, fall back to parsing
-    # Yosys reports otherwise
-    found_synthesis_json = merge_jsons(logPath, metrics_dict, "1_*.json")
-
-    # The new format (>= 0.57) with -hierarchy is:
-    #    <count> <area> <local_count> <local_area> cells
-    if not found_synthesis_json:
-        extractTagFromFile(
-            "synth__design__instance__count__stdcell",
-            metrics_dict,
-            "^\\s+(\\d+)\\s+[-0-9.]+\\s+\\S+\\s+\\S+\\s+cells$",
-            rptPath + "/synth_stat.txt",
-        )
-
-        extractTagFromFile(
-            "synth__design__instance__area__stdcell",
-            metrics_dict,
-            "Chip area for (?:top )?module.*: +(\\S+)",
-            rptPath + "/synth_stat.txt",
-        )
+    merge_jsons(logPath, metrics_dict, "1_*.json")
 
     # Netlist hashes: fingerprints of the canonical RTLIL (pre-ABC) and
     # the final post-synthesis Verilog so the rules-base.json check
@@ -277,7 +256,6 @@ def extract_metrics(
     )
     metrics_dict["synth__netlist__hash"] = file_sha1(resultPath + "/1_2_yosys.v")
 
-
     # Clocks
     # =========================================================================
     clk_list = read_sdc(resultPath + "/2_floorplan.sdc")