Merge pull request #1752 from Pinata-Consulting/genmetrics-simplification

genMetrics: less conditional code, less repetition

Author: vvbandeira

flow/util/genMetrics.py

@@ -249,18 +249,10 @@ def extract_metrics(cwd, platform, design, flow_variant, output, hier_json):
                        'Number of cells: +(\S+)',
                        rptPath + '/synth_stat.txt')
 
-    hierarchicalSynth = os.environ.get('SYNTH_HIERARCHICAL')
-
-    if hierarchicalSynth == '1':
-        extractTagFromFile('synth__design__instance__area__stdcell',
-                            metrics_dict,
-                            'Chip area for top module.*: +(\S+)',
-                            rptPath + '/synth_stat.txt')
-    else:
-        extractTagFromFile('synth__design__instance__area__stdcell',
-                            metrics_dict,
-                            'Chip area for module.*: +(\S+)',
-                            rptPath + '/synth_stat.txt')
+    extractTagFromFile('synth__design__instance__area__stdcell',
+                       metrics_dict,
+                       'Chip area for (?:top )?module.*: +(\S+)',
+                       rptPath + '/synth_stat.txt')
 
     # Clocks
     # =========================================================================