Skip to content

Commit af4b4a9

Browse files
authored
Merge pull request #2936 from Pinata-Consulting/orfs-bump-and-example-tweak
Orfs bump and example tweak
2 parents 11b93cf + a8553bd commit af4b4a9

File tree

3 files changed

+22
-7
lines changed

3 files changed

+22
-7
lines changed

flow/MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module(
99
bazel_dep(name = "bazel-orfs")
1010
git_override(
1111
module_name = "bazel-orfs",
12-
commit = "4392a87877b4196502fc89dcdf898fd6efdb3fc0",
12+
commit = "a33cd61ae13d2c4eb8d00e4475bfe214c828bc64",
1313
remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
1414
)
1515

@@ -50,9 +50,9 @@ orfs.default(
5050
# and update "image" to point to the local image.
5151

5252
# Official image https://hub.docker.com/r/openroad/orfs/tags
53-
image = "docker.io/openroad/orfs:v3.0-2528-ga8780221",
53+
image = "docker.io/openroad/orfs:v3.0-2581-g11b93cfa",
5454
# image = "gcr.io/ascenium/orfs-megaboom/flow-ubuntu22.04-builder:3d2c3d-2",
55-
sha256 = "5093434a9d3adaaf8e9a4d62fc0df2537d43ceaf01bf2acf9e94d9d38131b7ca",
55+
sha256 = "6b778fcdc3c7ba5cc5250cde588c43a63c45ffb3126ee072596a4173fe4d7101",
5656
)
5757
use_repo(orfs, "com_github_nixos_patchelf_download")
5858
use_repo(orfs, "docker_orfs")

flow/MODULE.bazel.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flow/designs/asap7/swerv_wrapper/BUILD.bazel

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,21 @@ filegroup(
7373
srcs = [":{}_netlist".format(name) for name in BLACKBOXES],
7474
)
7575

76+
# Canonicalize the netlists to avoid rebuilds unecessarily.
77+
#
78+
# This is more a demonstration than a practical solution.
79+
#
80+
# Other things could be done here, like get a netlist from git lfs,
81+
# process the netlist in some other way, with Naja, etc.
82+
genrule(
83+
name = "netlists_canonicalized",
84+
srcs = [":netlists"],
85+
outs = ["netlists_canonicalized.v"],
86+
cmd = """
87+
cat $(locations :netlists) | grep -v -E '\\(\\* src = "|Generated by Yosys' > $@
88+
""",
89+
)
90+
7691
[orfs_macro(
7792
name = top,
7893
lef = "lef/{}.lef".format(top),
@@ -100,7 +115,7 @@ orfs_flow(
100115
macros = FAKERAMS,
101116
sources = {
102117
"SDC_FILE": [":constraint.sdc"],
103-
"SYNTH_NETLIST_FILES": [":netlists"],
118+
"SYNTH_NETLIST_FILES": [":netlists_canonicalized"],
104119
},
105120
verilog_files = [],
106121
)

0 commit comments

Comments
 (0)