lint: black + tclfmt fixes from CI

Two formatter-only fixes the GitHub Actions Lint workflows flagged on
PR #4231 ("lint" Python/black and "Tclint" Tcl/tclfmt jobs):

  flow/util/genMetrics.py
    Two `for metric in (...)` tuples were wrapped across two lines;
    black 26.5 folds them onto a single line.  No semantic change.

  flow/scripts/synth_preamble.tcl
    tclfmt 0.7.0 re-indents the `if { [catch { ... } _err] } { ... }`
    block onto a multi-line `if {` form with 4-space body indentation;
    the original used a 2-space body inside `[catch { ... }]`.  No
    semantic change.

Both files come from earlier commits on this branch:

  3e57288 flow: drill down — non-determinism enters in
            read_design_sources    (introduced the genMetrics.py loops
                                    and the synth_preamble.tcl catch
                                    block)

Re-running the formatters locally produces no further diffs:

  black --check flow/util/genMetrics.py            -> 1 unchanged
  tclfmt --check flow/scripts/synth_preamble.tcl   -> clean
  tclint flow/scripts/synth_preamble.tcl           -> clean

Signed-off-by: Øyvind Harboe <oyvind@ascenium.com>
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>

Author: oharboe

flow/scripts/synth_preamble.tcl

@@ -36,20 +36,22 @@ proc write_state_hash { metric } {
 # the earlier "front-end non-determinism" misdiagnosis.  See
 # flow/README.md "Triaging a failing `_test`" → "Yosys-environment
 # false positive".
-if { [catch {
-  # `flow/scripts/variables.mk` exports YOSYS_EXE — yosys-abc is its
-  # sibling.  `info nameofexecutable` returns "./yosys-abc" under
-  # yosys' embedded tcl, which doesn't resolve at runtime; the
-  # exported absolute path is the reliable handle.
-  set _abc_path [file join [file dirname $::env(YOSYS_EXE)] yosys-abc]
-  set _abc_raw [exec $_abc_path -c "version; quit" 2>@1]
-  foreach _line [split $_abc_raw "\n"] {
-    if { [regexp {^UC Berkeley,\s+ABC\s+(\S+)} $_line -> _abc_ver] } {
-      puts "synth__abc__version: $_abc_ver"
-      break
+if {
+  [catch {
+    # `flow/scripts/variables.mk` exports YOSYS_EXE — yosys-abc is its
+    # sibling.  `info nameofexecutable` returns "./yosys-abc" under
+    # yosys' embedded tcl, which doesn't resolve at runtime; the
+    # exported absolute path is the reliable handle.
+    set _abc_path [file join [file dirname $::env(YOSYS_EXE)] yosys-abc]
+    set _abc_raw [exec $_abc_path -c "version; quit" 2>@1]
+    foreach _line [split $_abc_raw "\n"] {
+      if { [regexp {^UC Berkeley,\s+ABC\s+(\S+)} $_line -> _abc_ver] } {
+        puts "synth__abc__version: $_abc_ver"
+        break
+      }
     }
-  }
-} _err] } {
+  } _err]
+} {
   puts "\[WARN\] synth__abc__version extraction failed: $_err"
 }
 

flow/util/genMetrics.py

@@ -285,8 +285,7 @@ def extract_metrics(
     # (1_1_yosys_canonicalize.log or 1_2_yosys.log).  `canonical`
     # and post-ABC come straight from `file_sha1` of the
     # already-emitted RTLIL / Verilog.
-    for metric in ("synth__post_read_sources__hash",
-                   "synth__post_hierarchy__hash"):
+    for metric in ("synth__post_read_sources__hash", "synth__post_hierarchy__hash"):
         extractTagFromFile(
             metric,
             metrics_dict,
@@ -298,8 +297,7 @@ def extract_metrics(
     metrics_dict["synth__canonical_netlist__hash"] = file_sha1(
         resultPath + "/1_1_yosys_canonicalize.rtlil"
     )
-    for metric in ("synth__post_synth_main__hash",
-                   "synth__preabc_netlist__hash"):
+    for metric in ("synth__post_synth_main__hash", "synth__preabc_netlist__hash"):
         extractTagFromFile(
             metric,
             metrics_dict,