genMetrics: less conditional code, less repetition

Also, what exactly motivates yosys to output 'top ' here
isn't entirely clear.

This paves the way for a followup pull request

Signed-off-by: Øyvind Harboe <[email protected]>

Author: oharboe

flow/util/genMetrics.py

@@ -251,16 +251,10 @@ def extract_metrics(cwd, platform, design, flow_variant, output, hier_json):
 
     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
     # =========================================================================