From 10162a0cd67290d872107b01b9fb37baf7eb0e26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Harboe?= Date: Mon, 20 Apr 2026 14:52:44 +0200 Subject: [PATCH] chore: bump rules_chisel 0.3.0 -> 0.3.1, drop verilator cruft MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rules_chisel 0.3.1 contains the VERILATOR_ROOT runfiles fix (hw-bzl/rules_chisel#1) and bumps verilator to 5.046.bcr.3 (hw-bzl/rules_chisel#2), so the local single_version_override patch that carried those same changes is no longer needed. While here, drop unused bazel_dep entries that are now covered transitively by rules_chisel / rules_verilator: - verilog/MODULE.bazel: rules_verilator, verilator (only rules_verilog is loaded here) - chisel/MODULE.bazel: rules_verilog (unused) Co-Authored-By: Claude Opus 4.7 (1M context) Signed-off-by: Øyvind Harboe --- chisel/MODULE.bazel | 8 +--- gallery/MODULE.bazel | 2 +- mock/chisel/MODULE.bazel | 2 +- patches/rules-chisel-verilator-root.patch | 48 ----------------------- sby/MODULE.bazel | 2 +- verilog/MODULE.bazel | 2 - 6 files changed, 4 insertions(+), 60 deletions(-) delete mode 100644 patches/rules-chisel-verilator-root.patch diff --git a/chisel/MODULE.bazel b/chisel/MODULE.bazel index 1517f13e..ba866970 100644 --- a/chisel/MODULE.bazel +++ b/chisel/MODULE.bazel @@ -82,7 +82,6 @@ register_toolchains( bazel_dep(name = "rules_cc", version = "0.2.17") bazel_dep(name = "rules_shell", version = "0.7.1") bazel_dep(name = "rules_verilator", version = "0.3.2") -bazel_dep(name = "rules_verilog", version = "1.1.1") bazel_dep(name = "verilator", version = "5.046.bcr.3") bazel_dep(name = "googletest", version = "1.17.0.bcr.1") @@ -91,12 +90,7 @@ bazel_dep(name = "googletest", version = "1.17.0.bcr.1") bazel_dep(name = "rules_jvm_external", version = "6.7") bazel_dep(name = "rules_java", version = "8.14.0") bazel_dep(name = "rules_scala", version = "7.1.5") -bazel_dep(name = "rules_chisel", version = "0.3.0") -single_version_override( - module_name = "rules_chisel", - patch_strip = 1, - patches = ["//patches:rules-chisel-verilator-root.patch"], -) +bazel_dep(name = "rules_chisel", version = "0.3.1") SCALA_VERSION = "2.13.17" diff --git a/gallery/MODULE.bazel b/gallery/MODULE.bazel index b4d3ab6f..85202ee2 100644 --- a/gallery/MODULE.bazel +++ b/gallery/MODULE.bazel @@ -76,7 +76,7 @@ register_toolchains( # --- rules_scala + Chisel: for building Chisel projects (Gemmini, etc.) --- -bazel_dep(name = "rules_chisel", version = "0.3.0") +bazel_dep(name = "rules_chisel", version = "0.3.1") bazel_dep(name = "rules_verilator", version = "0.3.2") bazel_dep(name = "rules_verilog", version = "1.1.1") bazel_dep(name = "bazel-orfs-verilog") diff --git a/mock/chisel/MODULE.bazel b/mock/chisel/MODULE.bazel index f52ccc01..07a5448c 100644 --- a/mock/chisel/MODULE.bazel +++ b/mock/chisel/MODULE.bazel @@ -97,7 +97,7 @@ register_toolchains( bazel_dep(name = "rules_jvm_external", version = "6.7") bazel_dep(name = "rules_java", version = "8.14.0") bazel_dep(name = "rules_scala", version = "7.1.5") -bazel_dep(name = "rules_chisel", version = "0.3.0") +bazel_dep(name = "rules_chisel", version = "0.3.1") SCALA_VERSION = "2.13.17" diff --git a/patches/rules-chisel-verilator-root.patch b/patches/rules-chisel-verilator-root.patch deleted file mode 100644 index c38f0bea..00000000 --- a/patches/rules-chisel-verilator-root.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/chisel/defs.bzl -+++ b/chisel/defs.bzl -@@ -11,8 +11,9 @@ CHISEL_SCALACOPTS = [ - ] - - _DEFAULT_VERILATOR_DATA = [ -+ "@verilator//:verilator", - "@verilator//:bin/verilator", -- "@verilator//:verilator_includes", -+ "@verilator//:verilator_includes" - ] - - _VERILATOR_LAUNCHER_TEMPLATE = """#!/bin/bash -@@ -18,11 +19,21 @@ _VERILATOR_LAUNCHER_TEMPLATE = """#!/bin/bash - set -euo pipefail - cd "$RUNFILES_DIR/_main" || exit 1 - --export VERILATOR_BIN="{verilator_bin}" --[[ "$VERILATOR_BIN" != /* ]] && export VERILATOR_BIN="$PWD/$VERILATOR_BIN" --export VERILATOR_ROOT="$(dirname "$(dirname "$VERILATOR_BIN")")" --export PATH="$(dirname "$VERILATOR_BIN"):$PATH" -+_VERILATOR_BIN="{verilator_bin}" -+[[ "$_VERILATOR_BIN" != /* ]] && _VERILATOR_BIN="$PWD/$_VERILATOR_BIN" -+export VERILATOR_ROOT="$(dirname "$(dirname "$_VERILATOR_BIN")")" -+export PATH="$(dirname "$_VERILATOR_BIN"):$PATH" -+ -+# Replace symlinks in the verilator bin directory with real copies so that -+# Perl's $RealBin resolves to the runfiles directory (which has the correct -+# Bazel-generated headers) instead of the external repository source tree. -+for _f in "$VERILATOR_ROOT"/bin/*; do -+ [[ -L "$_f" ]] || continue -+ cp -L "$_f" "$_f.tmp" && mv "$_f.tmp" "$_f" && chmod +x "$_f" -+done -+ -+# Link Bazel-built verilator binary so the perl wrapper can find it. -+ln -sf "$VERILATOR_ROOT/verilator" "$VERILATOR_ROOT/bin/verilator_bin" 2>/dev/null || true - - # BCR Verilator workarounds. - if [[ ! -f "$VERILATOR_ROOT/include/verilated.mk" && -f "$VERILATOR_ROOT/include/verilated.mk.in" ]]; then -@@ -31,7 +42,7 @@ if [[ ! -f "$VERILATOR_ROOT/include/verilated.mk" && -f "$VERILATOR_ROOT/includ - fi - - if [[ ! -f "$VERILATOR_ROOT/include/verilated_config.h" && -f "$VERILATOR_ROOT/include/verilated_config.h.in" ]]; then -- sed 's/@PACKAGE_STRING@/Verilator 5.036/g; s/@CFG_WITH_CCWARN@/1/g; s/@CFG_WITH_LONGTESTS@/0/g; s/@[A-Z_]*@//g' \ -+ sed 's/@PACKAGE_STRING@/Verilator/g; s/@CFG_WITH_CCWARN@/1/g; s/@CFG_WITH_LONGTESTS@/0/g; s/@[A-Z_]*@//g' \ - "$VERILATOR_ROOT/include/verilated_config.h.in" > "$VERILATOR_ROOT/include/verilated_config.h" - fi - diff --git a/sby/MODULE.bazel b/sby/MODULE.bazel index a3d83d56..8b7b756c 100644 --- a/sby/MODULE.bazel +++ b/sby/MODULE.bazel @@ -95,7 +95,7 @@ http_archive( bazel_dep(name = "rules_jvm_external", version = "6.7") bazel_dep(name = "rules_java", version = "8.14.0") bazel_dep(name = "rules_scala", version = "7.1.5") -bazel_dep(name = "rules_chisel", version = "0.3.0") +bazel_dep(name = "rules_chisel", version = "0.3.1") SCALA_VERSION = "2.13.17" diff --git a/verilog/MODULE.bazel b/verilog/MODULE.bazel index a0c01aab..b02af8dc 100644 --- a/verilog/MODULE.bazel +++ b/verilog/MODULE.bazel @@ -3,9 +3,7 @@ module( version = "0.0.1", ) -bazel_dep(name = "rules_verilator", version = "0.3.2") bazel_dep(name = "rules_verilog", version = "1.1.1") -bazel_dep(name = "verilator", version = "5.046.bcr.3") http_archive = use_repo_rule( "@bazel_tools//tools/build_defs/repo:http.bzl",