Skip to content

Commit f1ba29a

Browse files
committed
Revert "Merge pull request #10237 from oharboe/ditch-docker"
This reverts commit 45b7772, reversing changes made to 097007a. Signed-off-by: Matt Liberty <mliberty@precisioninno.com>
1 parent dc6dc21 commit f1ba29a

5 files changed

Lines changed: 285 additions & 3479 deletions

File tree

MODULE.bazel

Lines changed: 8 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ bazel_dep(name = "verilator", version = "5.036.bcr.3", dev_dependency = True)
100100
bazel_dep(name = "bazel-orfs", dev_dependency = True)
101101
bazel_dep(name = "bazel-orfs-verilog", dev_dependency = True)
102102

103-
BAZEL_ORFS_COMMIT = "78f19f25cec73bdec3517a76465dec7ce17ce227"
103+
BAZEL_ORFS_COMMIT = "f5e20547f93729a4f67929902aaa3386d933bad0"
104104

105105
BAZEL_ORFS_REMOTE = "https://github.com/The-OpenROAD-Project/bazel-orfs.git"
106106

@@ -118,34 +118,6 @@ git_override(
118118
strip_prefix = "verilog",
119119
)
120120

121-
# bazel-orfs pulls in orfs without a version and patches yosys, relying on
122-
# overrides that only apply when bazel-orfs is the root module. Mirror them
123-
# here so OpenROAD-as-root can resolve the module graph.
124-
bazel_dep(name = "orfs", dev_dependency = True)
125-
git_override(
126-
module_name = "orfs",
127-
commit = "10a2baea2171059ec14cda9a5855aa26dd7572c6",
128-
patch_strip = 1,
129-
patches = [
130-
"//bazel/bazel-orfs-patches:0035-fix-remove-non-root-overrides-from-MODULE.bazel.patch",
131-
],
132-
remote = "https://github.com/The-OpenROAD-Project/OpenROAD-flow-scripts.git",
133-
)
134-
135-
bazel_dep(name = "yosys", version = "0.62.bcr.2", dev_dependency = True)
136-
137-
# yosys-slang is not on BCR. Pin to a commit on povik/yosys-slang master
138-
# that has the upstream Bazel build (povik/yosys-slang#310) and the
139-
# slang.so visibility fix (povik/yosys-slang#311). Submodules pull in
140-
# vendored slang and fmt sources.
141-
bazel_dep(name = "yosys-slang", dev_dependency = True)
142-
git_override(
143-
module_name = "yosys-slang",
144-
commit = "7753ea70431d85929292b90c33b32f6dbdb3b048",
145-
init_submodules = True,
146-
remote = "https://github.com/povik/yosys-slang.git",
147-
)
148-
149121
# --- Extensions ---
150122

151123
llvm = use_extension(
@@ -200,13 +172,16 @@ npm.npm_translate_lock(
200172
use_repo(npm, "npm")
201173

202174
orfs = use_extension("@bazel-orfs//:extension.bzl", "orfs_repositories", dev_dependency = True)
175+
176+
# To bump version, run: bazelisk run @bazel-orfs//:bump
203177
orfs.default(
204-
# Use OpenROAD of this repo instead of the one bundled with @orfs
178+
# Official image https://hub.docker.com/r/openroad/orfs/tags
179+
image = "docker.io/openroad/orfs:26Q1-816-gf40d2f346",
180+
# Use OpenROAD of this repo instead of from the docker image
205181
openroad = "//:openroad",
206-
# Expose the yosys-slang plugin via YOSYS_PLUGIN_PATH so
207-
# SYNTH_HDL_FRONTEND=slang works in mock-array and other tests.
208-
yosys_plugins = ["@yosys-slang//src/yosys_plugin:slang.so"],
182+
sha256 = "2b05a14ae8062b4af82b245d648e95fa0293e09b61b57468518b66578744afb8",
209183
)
184+
use_repo(orfs, "docker_orfs")
210185

211186
# --- Overrides ---
212187

0 commit comments

Comments
 (0)