Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 3 additions & 16 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,11 @@ local_path_override(
)

bazel_dep(name = "abc", version = "0.64-yosyshq.bcr.1")
bazel_dep(name = "yosys", version = "0.62")

# yosys_share (techlib data files) has package-private visibility in BCR yosys;
# the ORFS flow needs it public so @yosys//:yosys_share is reachable across modules.
single_version_override(
module_name = "yosys",
patch_strip = 1,
patches = [
"//patches:yosys-visibility.patch",
"//patches:yosys-hdrs.patch",
"//patches:yosys-tcl9-mp-to-ubin.patch",
],
)

bazel_dep(name = "yosys", version = "0.62.bcr.2")
bazel_dep(name = "orfs")
git_override(
module_name = "orfs",
commit = "172bd233dabd45d04cd80062cd1894e5ac8e5d52",
commit = "10a2baea2171059ec14cda9a5855aa26dd7572c6",
patch_strip = 1,
# Minimal patches: only what's needed when ORFS is a non-root module.
# Design-specific patches are only applied in the orfs/ integration workspace.
Expand All @@ -54,7 +41,7 @@ git_override(
bazel_dep(name = "openroad")
git_override(
module_name = "openroad",
commit = "578be38ad2297637e938cbc9cb35e5a05d8936ff",
commit = "559a32007597782afb3c4d537d257fd89667ef3b",
init_submodules = True,
remote = "https://github.com/The-OpenROAD-Project/OpenROAD.git",
)
Expand Down
9 changes: 1 addition & 8 deletions chisel/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,7 @@ local_path_override(
path = "../verilog",
)

bazel_dep(name = "yosys", version = "0.62")

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

bazel_dep(name = "orfs")
git_override(
Expand Down
16 changes: 3 additions & 13 deletions gallery/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,14 @@ local_path_override(
path = "..",
)

bazel_dep(name = "yosys", version = "0.62")

# Make yosys_share publicly visible for the ORFS flow (see bazel-orfs MODULE.bazel).
single_version_override(
module_name = "yosys",
patch_strip = 1,
patches = [
"//patches:yosys-visibility.patch",
"//patches:yosys-tcl9-mp-to-ubin.patch",
],
)
bazel_dep(name = "yosys", version = "0.62.bcr.2")

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

bazel_dep(name = "orfs")
git_override(
module_name = "orfs",
commit = "172bd233dabd45d04cd80062cd1894e5ac8e5d52",
commit = "10a2baea2171059ec14cda9a5855aa26dd7572c6",
patch_strip = 1,
patches = [
"//patches:0035-fix-remove-non-root-overrides-from-MODULE.bazel.patch",
Expand All @@ -49,7 +39,7 @@ use_repo(orfs, "gnumake")
bazel_dep(name = "openroad")
git_override(
module_name = "openroad",
commit = "578be38ad2297637e938cbc9cb35e5a05d8936ff",
commit = "559a32007597782afb3c4d537d257fd89667ef3b",
init_submodules = True,
remote = "https://github.com/The-OpenROAD-Project/OpenROAD.git",
)
Expand Down
8 changes: 1 addition & 7 deletions mock/chisel/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,7 @@ local_path_override(
path = "../../verilog",
)

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

bazel_dep(name = "orfs")
git_override(
Expand Down
8 changes: 1 addition & 7 deletions orfs/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,7 @@ git_override(
remote = "https://github.com/The-OpenROAD-Project/OpenROAD-flow-scripts.git",
)

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

# --- OpenROAD built from source ---

Expand Down
15 changes: 0 additions & 15 deletions patches/yosys-hdrs.patch

This file was deleted.

21 changes: 0 additions & 21 deletions patches/yosys-tcl9-mp-to-ubin.patch

This file was deleted.

11 changes: 0 additions & 11 deletions patches/yosys-visibility.patch

This file was deleted.

11 changes: 1 addition & 10 deletions test/downstream/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,7 @@ git_override(
remote = "https://github.com/The-OpenROAD-Project/qt_bazel_prebuilts",
)

# --- yosys visibility patch (single_version_override is root-only) ---
bazel_dep(name = "yosys", version = "0.62")
single_version_override(
module_name = "yosys",
patch_strip = 1,
patches = [
"//patches:yosys-visibility.patch",
"//patches:yosys-hdrs.patch",
],
)
bazel_dep(name = "yosys", version = "0.62.bcr.2")

# --- Verilator simulation + Google Test ---
bazel_dep(name = "rules_verilog", version = "1.1.1")
Expand Down
7 changes: 0 additions & 7 deletions test/downstream/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,6 @@ would deliver these through its extension.
bazel-orfs pip deps are locked to Python 3.13. The root module must
register it as the default toolchain via `python.toolchain(is_default = True)`.

### yosys visibility and headers patches

BCR yosys has `package(default_visibility = ["//visibility:private"])`.
Downstream consumers must duplicate the `yosys-visibility.patch` and add
a `yosys-hdrs.patch` for plugin compilation (`single_version_override` is
root-only).

### yosys-slang not on BCR

The slang yosys plugin must be built from source. This test includes a
Expand Down
15 changes: 0 additions & 15 deletions test/downstream/patches/yosys-hdrs.patch

This file was deleted.

11 changes: 0 additions & 11 deletions test/downstream/patches/yosys-visibility.patch

This file was deleted.

Loading