Skip to content

Commit 78f19f2

Browse files
committed
chore: bump yosys to 0.62.bcr.2 and drop carried patches
The three yosys patches we carried (visibility, hdrs, tcl9-mp-to-ubin) all landed upstream in BCR yosys 0.62.bcr.2 via bazelbuild/bazel-central-registry#8636. Bump to that version and drop the single_version_override blocks across all six root modules (root, gallery, test/downstream, mock/chisel, orfs, chisel) plus delete the patch files. Mirrors the cleanup OpenROAD did in The-OpenROAD-Project/OpenROAD#10237. Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
1 parent 3c15765 commit 78f19f2

12 files changed

Lines changed: 6 additions & 137 deletions

File tree

MODULE.bazel

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,7 @@ local_path_override(
2424
)
2525

2626
bazel_dep(name = "abc", version = "0.64-yosyshq.bcr.1")
27-
bazel_dep(name = "yosys", version = "0.62")
28-
29-
# yosys_share (techlib data files) has package-private visibility in BCR yosys;
30-
# the ORFS flow needs it public so @yosys//:yosys_share is reachable across modules.
31-
single_version_override(
32-
module_name = "yosys",
33-
patch_strip = 1,
34-
patches = [
35-
"//patches:yosys-visibility.patch",
36-
"//patches:yosys-hdrs.patch",
37-
"//patches:yosys-tcl9-mp-to-ubin.patch",
38-
],
39-
)
40-
27+
bazel_dep(name = "yosys", version = "0.62.bcr.2")
4128
bazel_dep(name = "orfs")
4229
git_override(
4330
module_name = "orfs",

chisel/MODULE.bazel

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,7 @@ local_path_override(
1919
path = "../verilog",
2020
)
2121

22-
bazel_dep(name = "yosys", version = "0.62")
23-
24-
# Make yosys_share publicly visible for the ORFS flow (see bazel-orfs MODULE.bazel).
25-
single_version_override(
26-
module_name = "yosys",
27-
patch_strip = 1,
28-
patches = ["//patches:yosys-visibility.patch"],
29-
)
22+
bazel_dep(name = "yosys", version = "0.62.bcr.2")
3023

3124
bazel_dep(name = "orfs")
3225
git_override(

gallery/MODULE.bazel

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,7 @@ local_path_override(
1313
path = "..",
1414
)
1515

16-
bazel_dep(name = "yosys", version = "0.62")
17-
18-
# Make yosys_share publicly visible for the ORFS flow (see bazel-orfs MODULE.bazel).
19-
single_version_override(
20-
module_name = "yosys",
21-
patch_strip = 1,
22-
patches = [
23-
"//patches:yosys-visibility.patch",
24-
"//patches:yosys-tcl9-mp-to-ubin.patch",
25-
],
26-
)
16+
bazel_dep(name = "yosys", version = "0.62.bcr.2")
2717

2818
# --- ORFS flow scripts (Makefile, TCL, PDKs) ---
2919

mock/chisel/MODULE.bazel

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,7 @@ local_path_override(
1717
path = "../../verilog",
1818
)
1919

20-
bazel_dep(name = "yosys", version = "0.62")
21-
# Make yosys_share publicly visible for the ORFS flow (see bazel-orfs MODULE.bazel).
22-
single_version_override(
23-
module_name = "yosys",
24-
patches = ["//patches:yosys-visibility.patch"],
25-
patch_strip = 1,
26-
)
20+
bazel_dep(name = "yosys", version = "0.62.bcr.2")
2721

2822
bazel_dep(name = "orfs")
2923
git_override(

orfs/MODULE.bazel

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,7 @@ git_override(
6161
remote = "https://github.com/The-OpenROAD-Project/OpenROAD-flow-scripts.git",
6262
)
6363

64-
bazel_dep(name = "yosys", version = "0.62")
65-
# Make yosys_share publicly visible for the ORFS flow (see bazel-orfs MODULE.bazel).
66-
single_version_override(
67-
module_name = "yosys",
68-
patches = ["//patches:yosys-visibility.patch"],
69-
patch_strip = 1,
70-
)
64+
bazel_dep(name = "yosys", version = "0.62.bcr.2")
7165

7266
# --- OpenROAD built from source ---
7367

patches/yosys-hdrs.patch

Lines changed: 0 additions & 15 deletions
This file was deleted.

patches/yosys-tcl9-mp-to-ubin.patch

Lines changed: 0 additions & 21 deletions
This file was deleted.

patches/yosys-visibility.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

test/downstream/MODULE.bazel

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,7 @@ git_override(
5050
remote = "https://github.com/The-OpenROAD-Project/qt_bazel_prebuilts",
5151
)
5252

53-
# --- yosys visibility patch (single_version_override is root-only) ---
54-
bazel_dep(name = "yosys", version = "0.62")
55-
single_version_override(
56-
module_name = "yosys",
57-
patch_strip = 1,
58-
patches = [
59-
"//patches:yosys-visibility.patch",
60-
"//patches:yosys-hdrs.patch",
61-
],
62-
)
53+
bazel_dep(name = "yosys", version = "0.62.bcr.2")
6354

6455
# --- Verilator simulation + Google Test ---
6556
bazel_dep(name = "rules_verilog", version = "1.1.1")

test/downstream/README.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,6 @@ would deliver these through its extension.
4545
bazel-orfs pip deps are locked to Python 3.13. The root module must
4646
register it as the default toolchain via `python.toolchain(is_default = True)`.
4747

48-
### yosys visibility and headers patches
49-
50-
BCR yosys has `package(default_visibility = ["//visibility:private"])`.
51-
Downstream consumers must duplicate the `yosys-visibility.patch` and add
52-
a `yosys-hdrs.patch` for plugin compilation (`single_version_override` is
53-
root-only).
54-
5548
### yosys-slang not on BCR
5649

5750
The slang yosys plugin must be built from source. This test includes a

0 commit comments

Comments
 (0)