Merge branch 'master' of https://github.com/The-OpenROAD-Project/OpenROAD-flow-scripts into secure-yosys0.55

eder-matheus · eder-matheus · commit 60f1d193005d · 2025-07-07T17:17:19.000-03:00
Signed-off-by: Eder Monteiro &lt;emrmonteiro@precisioninno.com&gt;
diff --git a/flow/designs/asap7/aes-block/rules-base.json b/flow/designs/asap7/aes-block/rules-base.json
@@ -24,7 +24,7 @@
         "compare": "<="
     },
     "cts__design__instance__count__hold_buffer": {
-        "value": 1744,
+        "value": 1331,
         "compare": "<="
     },
     "globalroute__antenna_diodes_count": {
@@ -64,7 +64,7 @@
         "compare": "<="
     },
     "finish__timing__wns_percent_delay": {
-        "value": -33.09,
+        "value": -18.47,
         "compare": ">="
     }
 }
diff --git a/flow/designs/asap7/aes_lvt/rules-base.json b/flow/designs/asap7/aes_lvt/rules-base.json
@@ -48,7 +48,7 @@
         "compare": "<="
     },
     "finish__timing__setup__ws": {
-        "value": -16.32,
+        "value": -45.99,
         "compare": ">="
     },
     "finish__design__instance__area": {
diff --git a/flow/designs/asap7/mock-array/rules-base.json b/flow/designs/asap7/mock-array/rules-base.json
@@ -48,7 +48,7 @@
         "compare": "<="
     },
     "finish__timing__setup__ws": {
-        "value": -440.47,
+        "value": -457.76,
         "compare": ">="
     },
     "finish__design__instance__area": {
diff --git a/flow/designs/ihp-sg13g2/aes/rules-base.json b/flow/designs/ihp-sg13g2/aes/rules-base.json
@@ -44,7 +44,7 @@
         "compare": "<="
     },
     "detailedroute__antenna_diodes_count": {
-        "value": 12,
+        "value": 21,
         "compare": "<="
     },
     "finish__timing__setup__ws": {
diff --git a/flow/designs/sky130hd/gcd/rules-base.json b/flow/designs/sky130hd/gcd/rules-base.json
@@ -20,7 +20,7 @@
         "compare": "=="
     },
     "cts__design__instance__count__setup_buffer": {
-        "value": 50,
+        "value": 62,
         "compare": "<="
     },
     "cts__design__instance__count__hold_buffer": {
diff --git a/flow/designs/sky130hd/microwatt/config.mk b/flow/designs/sky130hd/microwatt/config.mk
@@ -11,8 +11,6 @@ export SDC_FILE      = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/constraint.
 export DIE_AREA   = 0 0 3020 3610
 export CORE_AREA  = 10 10 3010 3600
 
-export PLACE_DENSITY ?= 0.2
-
 export microwatt_DIR = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)
 
 export ADDITIONAL_GDS  = $(wildcard $(microwatt_DIR)/gds/*.gds.gz)
@@ -33,7 +31,7 @@ export MACRO_BLOCKAGE_HALO = 151
 
 # There's less space due to the adapted blockage halos, so GPL requires a
 # higher density in order to run.
-export PLACE_DENSITY = 0.19
+export PLACE_DENSITY = 0.2
 
 # CTS tuning
 export CTS_BUF_DISTANCE = 600
diff --git a/flow/designs/sky130hs/jpeg/rules-base.json b/flow/designs/sky130hs/jpeg/rules-base.json
@@ -28,7 +28,7 @@
         "compare": "<="
     },
     "globalroute__antenna_diodes_count": {
-        "value": 60,
+        "value": 122,
         "compare": "<="
     },
     "detailedroute__route__wirelength": {
diff --git a/flow/designs/sky130hs/riscv32i/rules-base.json b/flow/designs/sky130hs/riscv32i/rules-base.json
@@ -8,7 +8,7 @@
         "compare": "=="
     },
     "placeopt__design__instance__area": {
-        "value": 116701,
+        "value": 116710,
         "compare": "<="
     },
     "placeopt__design__instance__count__stdcell": {
@@ -44,7 +44,7 @@
         "compare": "<="
     },
     "detailedroute__antenna_diodes_count": {
-        "value": 16,
+        "value": 9,
         "compare": "<="
     },
     "finish__timing__setup__ws": {
diff --git a/flow/test/test_genElapsedTime.py b/flow/test/test_genElapsedTime.py
@@ -30,7 +30,7 @@ def test_elapsed_time(self, mock_stdout):
         genElapsedTime.scan_logs(["--logDir", str(self.tmp_dir.name), "--noHeader"])
         # check if output is correct
         expected_output = (
-            self.tmp_dir.name + "\n1_test 5400 9440\nTotal 5400 9440\n"
+            self.tmp_dir.name + "\n1_test 5400 9440 N/A\nTotal 5400 9440\n"
         ).split()
         actual_output = mock_stdout.getvalue().split()
         self.assertEqual(actual_output, expected_output)
@@ -44,7 +44,7 @@ def test_zero_time(self, mock_stdout):
         # call the script with the test log file
         genElapsedTime.scan_logs(["--logDir", str(self.tmp_dir.name), "--noHeader"])
         expected_output = (
-            self.tmp_dir.name + "\n1_test 74 9440\nTotal 74 9440\n"
+            self.tmp_dir.name + "\n1_test 74 9440 N/A\nTotal 74 9440\n"
         ).split()
         actual_output = mock_stdout.getvalue().split()
         self.assertEqual(actual_output, expected_output)
@@ -61,7 +61,7 @@ def test_elapsed_time_longer_duration(self, mock_stdout):
         genElapsedTime.scan_logs(["--logDir", str(self.tmp_dir.name), "--noHeader"])
         # check if output is correct
         expected_output = (
-            self.tmp_dir.name + "\n1_test 744 9440 Total 744 9440"
+            self.tmp_dir.name + "\n1_test 744 9440 N/A Total 744 9440"
         ).split()
         actual_output = mock_stdout.getvalue().split()
         self.assertEqual(actual_output, expected_output)
diff --git a/flow/util/genElapsedTime.py b/flow/util/genElapsedTime.py
@@ -4,9 +4,10 @@
 # in the flow and prints it in a table
 # ---------------------------------------------------------------------------
 
+import argparse
+import hashlib
 import pathlib
 import os
-import argparse  # argument parsing
 import sys
 
 # Parse and validate arguments
@@ -61,29 +62,48 @@ def print_log_dir_times(logdir, args):
                         int(line.split("Peak memory: ")[1].split("KB")[0]) / 1024
                     )
 
+            # content hash for .odb file alongside .log file is useful to
+            # debug divergent results under what should be identical
+            # builds(such as local and CI builds)
+            odb_file = pathlib.Path(
+                str(f).replace("logs/", "results/").replace(".log", ".odb")
+            )
+            if odb_file.exists():
+                hasher = hashlib.sha1()
+                with open(odb_file, "rb") as odb_f:
+                    while chunk := odb_f.read(16 * 1024 * 1024):
+                        hasher.update(chunk)
+                odb_hash = hasher.hexdigest()
+            else:
+                odb_hash = "N/A"
+
             if not found:
                 print("No elapsed time found in", str(f), file=sys.stderr)
                 continue
 
         # Print the name of the step and the corresponding elapsed time
-        format_str = "%-25s %20s %14s"
+        format_str = "%-25s %10s %14s %20s"
         if elapsedTime is not None and peak_memory is not None:
             if first and not args.noHeader:
-                print(format_str % ("Log", "Elapsed seconds", "Peak Memory/MB"))
+                print(
+                    format_str
+                    % ("Log", "Elapsed/s", "Peak Memory/MB", "sha1sum .odb [0:20)")
+                )
                 first = False
             print(
                 format_str
                 % (
                     os.path.splitext(os.path.basename(str(f)))[0],
                     elapsedTime,
                     peak_memory,
+                    odb_hash[0:20],
                 )
             )
         totalElapsed += elapsedTime
         total_max_memory = max(total_max_memory, int(peak_memory))
 
     if totalElapsed != 0:
-        print(format_str % ("Total", totalElapsed, total_max_memory))
+        print(format_str % ("Total", totalElapsed, total_max_memory, ""))
 
 
 def scan_logs(args):
