Merge branch 'master' into preplaced-macros

Author: AcKoucher

flow/scripts/final_report.tcl

@@ -15,7 +15,8 @@ source $::env(SCRIPTS_DIR)/deleteRoutingObstructions.tcl
 deleteRoutingObstructions
 
 write_def $::env(RESULTS_DIR)/6_final.def
-write_verilog $::env(RESULTS_DIR)/6_final.v
+write_verilog $::env(RESULTS_DIR)/6_final.v \
+  -remove_cells [find_physical_only_masters]
 
 # Run extraction and STA
 if {

flow/scripts/util.tcl

@@ -201,3 +201,39 @@ proc hier_options { } {
     return ""
   }
 }
+
+proc is_physical_only_master { master } {
+  set physical_only_type_patterns [list \
+    "COVER" \
+    "COVER_BUMP" \
+    "RING" \
+    "PAD_SPACER" \
+    "CORE_FEEDTHROUGH" \
+    "CORE_SPACER" \
+    "CORE_ANTENNACELL" \
+    "CORE_WELLTAP" \
+    "ENDCAP*"]
+  set master_type [$master getType]
+  foreach pattern $physical_only_type_patterns {
+    if { [string match $pattern $master_type] } {
+      return 1
+    }
+  }
+  return 0
+}
+
+# Finds all physical-only masters in the current database and
+# returns their names.
+proc find_physical_only_masters { } {
+  set db [::ord::get_db]
+  set libs [$db getLibs]
+  set physical_only_masters [list]
+  foreach lib $libs {
+    foreach master [$lib getMasters] {
+      if { [is_physical_only_master $master] } {
+        lappend physical_only_masters [$master getName]
+      }
+    }
+  }
+  return $physical_only_masters
+}

flow/util/genMetrics.py

@@ -231,10 +231,11 @@ def extract_metrics(
     # Synthesis
     # =========================================================================
 
+    # The new format (>= 0.57) is: <count> <area> cells
     extractTagFromFile(
         "synth__design__instance__count__stdcell",
         metrics_dict,
-        "Number of cells: +(\\S+)",
+        "^\\s+(\\d+)\\s+[-0-9.]+\\s+cells$",
         rptPath + "/synth_stat.txt",
     )