Merge pull request #10841 from oharboe/bump-bazel-orfs

bazel: bump bazel-orfs to 60d62021, upgrade yosys to 0.64

Author: maliberty

MODULE.bazel

@@ -192,7 +192,7 @@ bazel_dep(name = "rules_nodejs", version = "6.7.3", dev_dependency = True)
 bazel_dep(name = "bazel-orfs", dev_dependency = True)
 bazel_dep(name = "bazel-orfs-verilog", dev_dependency = True)
 
-BAZEL_ORFS_COMMIT = "78f19f25cec73bdec3517a76465dec7ce17ce227"
+BAZEL_ORFS_COMMIT = "60d62021c779e64ef7360a1b08a8faee00183c8d"
 
 BAZEL_ORFS_REMOTE = "https://github.com/The-OpenROAD-Project/bazel-orfs.git"
 
@@ -210,27 +210,30 @@ git_override(
     strip_prefix = "verilog",
 )
 
-# bazel-orfs pulls in orfs without a version and patches yosys, relying on
-# overrides that only apply when bazel-orfs is the root module. Mirror them
-# here so OpenROAD-as-root can resolve the module graph.
+# @orfs marks most non-root-only directives (qt-bazel/yosys-slang git_overrides,
+# orfs.default(), toolchain registration) as dev_dependency, so they are no-ops
+# here. But @orfs//flow loads @bazel-orfs//:openroad.bzl, and @orfs marks its
+# bazel-orfs bazel_dep dev_dependency too, which drops @bazel-orfs from @orfs's
+# repo mapping when consumed non-root — so loading @orfs//flow fails. The patch
+# makes that one bazel_dep non-dev.
 #
 # Use archive_override (HTTPS tarball) rather than git_override so the
 # build resolves on networks that block direct git access to github.com.
-ORFS_COMMIT = "10a2baea2171059ec14cda9a5855aa26dd7572c6"
+ORFS_COMMIT = "4b3f2663609fd3f6fd8d862729de1ec5967eb4e6"
 
 bazel_dep(name = "orfs", dev_dependency = True)
 archive_override(
     module_name = "orfs",
     patch_strip = 1,
     patches = [
-        "//bazel/bazel-orfs-patches:0035-fix-remove-non-root-overrides-from-MODULE.bazel.patch",
+        "//bazel/bazel-orfs-patches:0035-orfs-bazel-orfs-visible-non-root.patch",
     ],
-    sha256 = "8325c6755215857a87a84db078d47dfbb2dfcbef70eaf0dd376fe5a7a363cd58",
+    sha256 = "b6e496221b5be5a5ecd54e978a7a8157a212b67374e2ecd6c27f90d35e02b473",
     strip_prefix = "OpenROAD-flow-scripts-" + ORFS_COMMIT,
     urls = ["https://github.com/The-OpenROAD-Project/OpenROAD-flow-scripts/archive/" + ORFS_COMMIT + ".tar.gz"],
 )
 
-bazel_dep(name = "yosys", version = "0.62.bcr.2", dev_dependency = True)
+bazel_dep(name = "yosys", version = "0.64", dev_dependency = True)
 bazel_dep(name = "yosys-slang", version = "0.0.0", dev_dependency = True)
 archive_override(
     module_name = "yosys-slang",

MODULE.bazel.lock

@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Oyvind Harboe <oyvind.harboe@zylin.com>
+Date: Wed, 8 Jul 2026 00:00:00 +0000
+Subject: [PATCH] orfs: keep bazel-orfs visible when orfs is a non-root dep
+
+@orfs//flow loads @bazel-orfs//:openroad.bzl, so @bazel-orfs must be in
+@orfs's repo mapping. Upstream marks the bazel-orfs bazel_dep as
+dev_dependency, which drops it from the mapping when @orfs is consumed
+as a non-root dependency, so loading @orfs//flow fails with "No
+repository visible as '@bazel-orfs' from repository '@@orfs+'". Make the
+bazel_dep non-dev; the bazel-orfs version is unified by the root
+module's pin either way.
+
+Signed-off-by: Oyvind Harboe <oyvind.harboe@zylin.com>
+---
+--- a/MODULE.bazel
++++ b/MODULE.bazel
+@@ -33,7 +33,7 @@
+     remote = "https://github.com/The-OpenROAD-Project/qt_bazel_prebuilts",
+ )
+ 
+-bazel_dep(name = "bazel-orfs", dev_dependency = True)
++bazel_dep(name = "bazel-orfs")
+ bazel_dep(name = "bazel-orfs-verilog", dev_dependency = True)
+ 
+ BAZEL_ORFS_COMMIT = "6ebadeb4be5c9ada103081c9a5e668c014126616"

bazel/bazel-orfs-patches/0035-fix-remove-non-root-overrides-from-MODULE.bazel.patch

@@ -1,38 +1,44 @@
 {
-    "synth__design__instance__area__stdcell": {
-        "value": 44.3,
-        "compare": "<="
+    "synth__canonical_netlist__hash": {
+        "value": "6b5b245a1b16c0ed5e17c85030fd38266f2c0a2c",
+        "compare": "==",
+        "level": "warning"
+    },
+    "synth__netlist__hash": {
+        "value": "407871ad5bca7d0c3fcfc33d4017971cd7b67dfa",
+        "compare": "==",
+        "level": "warning"
     },
     "constraints__clocks__count": {
         "value": 1,
         "compare": "=="
     },
     "placeopt__design__instance__area": {
-        "value": 59,
+        "value": 63,
         "compare": "<="
     },
     "placeopt__design__instance__count__stdcell": {
-        "value": 613,
+        "value": 668,
         "compare": "<="
     },
     "detailedplace__design__violations": {
         "value": 0,
         "compare": "=="
     },
     "cts__design__instance__count__setup_buffer": {
-        "value": 53,
+        "value": 58,
         "compare": "<="
     },
     "cts__design__instance__count__hold_buffer": {
-        "value": 53,
+        "value": 58,
         "compare": "<="
     },
     "cts__timing__setup__ws": {
-        "value": -79.8,
+        "value": -81.9,
         "compare": ">="
     },
     "cts__timing__setup__tns": {
-        "value": -1710.0,
+        "value": -1320.0,
         "compare": ">="
     },
     "cts__timing__hold__ws": {
@@ -48,11 +54,11 @@
         "compare": "<="
     },
     "globalroute__timing__setup__ws": {
-        "value": -85.4,
+        "value": -93.8,
         "compare": ">="
     },
     "globalroute__timing__setup__tns": {
-        "value": -1910.0,
+        "value": -1560.0,
         "compare": ">="
     },
     "globalroute__timing__hold__ws": {
@@ -64,7 +70,7 @@
         "compare": ">="
     },
     "detailedroute__route__wirelength": {
-        "value": 1403,
+        "value": 1603,
         "compare": "<="
     },
     "detailedroute__route__drc_errors": {
@@ -80,11 +86,11 @@
         "compare": "<="
     },
     "finish__timing__setup__ws": {
-        "value": -71.0,
+        "value": -79.7,
         "compare": ">="
     },
     "finish__timing__setup__tns": {
-        "value": -1290.0,
+        "value": -1230.0,
         "compare": ">="
     },
     "finish__timing__hold__ws": {
@@ -96,7 +102,7 @@
         "compare": ">="
     },
     "finish__design__instance__area": {
-        "value": 66,
+        "value": 69,
         "compare": "<="
     }
 }