Migrate to Bzlmod, upgrade toolchains, and cleanup #280

willyzha · 2025-12-20T00:58:18Z

Migrate dependencies to MODULE.bazel; bump Bazel to 7.3.1, Go to 1.23.4.
Update C++ to C++17/C11; configure LLVM and aspect_rules_lint.
Fix build/tests in src/ate, proxy_buffer, and config/spm.
Move patches to third_party/ and remove legacy repo config.

timothytrippel

Nice work @willyzha !

Some improvements to make in a follow up / outside this PR:

make sure we document how to update various dependency config files that are atuogenerated:

python deps
go deps

file an issue on this repo to track the remaining work required to complete the bazel upgrade

timothytrippel · 2025-12-26T18:29:41Z

third_party/bazel/rules_rust.bindgen_static_lib.patch

@@ -0,0 +1,48 @@
+diff --git a/extensions/bindgen/private/bindgen.bzl b/extensions/bindgen/private/bindgen.bzl
+--- private/bindgen.bzl


nice job updating !

Should we have a README somewhere that describe how to update this patch?

I broke up the patch into 3 separate patches and added git commit descriptions for each of them. There isn't really anything special other than checking out the rules_rust repo and making the changes and converting them to patches.

timothytrippel · 2025-12-26T18:30:16Z

third_party/go/deps.bzl

 # go_packages_ is an automatically generated macro that lists repositories
 # corresponding to //:go.mod's requirements.
 #
 # Use `bazel run //:update-go-repos` to update it, after changing //:go.mod.


is this still how this file is updated?

I pushed a new commit to migrate the remaining go, docker and lint deps. Now this file gone and I updated comments go.mod to explain how to update the go deps.

timothytrippel · 2025-12-26T18:35:17Z

MODULE.bazel

+    name = "lowrisc_opentitan",
+)
+
+archive_override(


nit: should we group this next to the bazel_dep it is associated with?

or is this the result of buildifier autoformatting?

timothytrippel · 2025-12-26T18:58:18Z

rules/repos.bzl

 # SPDX-License-Identifier: Apache-2.0

-package(default_visibility = ["//visibility:public"])
+"""Custom repository rules for bzlmod migration."""


just curious: is the goal to delete this file entirely when the bazel upgrade is completed?

Deleted. It was already not needed since I imported the rule directly in the top level MODULE.bazel

third_party/google/boringssl-windows-constraints.patch

timothytrippel · 2025-12-26T19:00:27Z

third_party/lowrisc/provisioning_exts/BUILD.bazel

 # SPDX-License-Identifier: Apache-2.0

 # This is just a dummy config file to enable the third party @lowrisc_opentitan
 # Bazel repo dependencies to build cleanly without having to close the repo.


Can this file just be deleted entirely?

same with the corresponding WORKSPACE.bazel file

Done. Deleted

timothytrippel · 2025-12-26T19:12:31Z

rules/windows_binary.bzl

+        ),
+    ]
+
+windows_binary = rule(


just curious: is the windows binary build still tested in CI?

does the CI run against the the pkg_win target at //src/ate:windows? I think that target should still be the same after this change

timothytrippel · 2025-12-26T19:18:49Z

Can this be marked ready for review?

willyzha · 2025-12-29T18:19:03Z

Nice work @willyzha !

Some improvements to make in a follow up / outside this PR:

make sure we document how to update various dependency config files that are atuogenerated:

python deps

go deps

file an issue on this repo to track the remaining work required to complete the bazel upgrade

Thanks, I added a new commit that completes more of the migration, and filed issue #283 to track the remaining work after this pull request and to update and review the documentation.

- Migrate dependencies to MODULE.bazel (LLVM, Python, Rust); bump Bazel to 7.3.1. - Update C++ to C++17/C11; configure LLVM and aspect_rules_lint. - Fix build/tests in src/ate, proxy_buffer, and config/spm. - Move patches to third_party/ and remove legacy repo config. Signed-off-by: Willy Zhang <[email protected]>

This change completes the Bzlmod migration for Google-hosted dependencies. Specific changes: - Move re2 and protobuf-matchers to MODULE.bazel. - Remove legacy third_party/google/repos.bzl. - Drop unused boringssl-windows-constraints.patch. Signed-off-by: Willy Zhang <[email protected]>

Migrate rules_foreign_cc and upb from WORKSPACE to MODULE.bazel. - Add rules_foreign_cc and upb (required by gRPC) to MODULE.bazel. - Remove legacy third_party/bazel macros and files. - Remove protocol_compiler bind from WORKSPACE. Signed-off-by: Willy Zhang <[email protected]>

- Move softhsm2 definition from WORKSPACE to MODULE.bazel. - Update src/pk11/test_support.go to use bazel.Runfile for locating softhsm2-util. - Remove third_party/softhsm2/repos.bzl. Signed-off-by: Willy Zhang <[email protected]>

- Move lowrisc repository definitions from WORKSPACE to MODULE.bazel. - Remove legacy third_party/lowrisc/repos.bzl. - Update documentation to reference MODULE.bazel. Signed-off-by: Willy Zhang <[email protected]>

- Remove unused third_party/protobuf/BUILD.bazel. - Remove third_party/protobuf/grpc-go-toolchain.patch. - Remove third_party/protobuf/grpc-windows-constraints.patch. - Remove third_party/protobuf/repos.bzl. - Remove third_party/google/BUILD.bazel. Signed-off-by: Willy Zhang <[email protected]>

Signed-off-by: Willy Zhang <[email protected]>

This change updates the `rules_rust_bindgen` patching strategy to support building on modern Linux hosts that enforce PIE. Split `bindgen_static_lib.patch` into three focused patches: - `bindgen_remove_static_check.patch`: Supports header-only deps. - `bindgen_prioritize_pic.patch`: Prioritizes PIC libs for host PIE builds. - `bindgen_fix_resource_dir.patch`: Fixes Clang resource dir detection. Signed-off-by: Willy Zhang <[email protected]>

This commit completes the Bzlmod migration for core dependencies, Go toolchains, and Docker rules. It includes the following key changes: - Migrated `rules_docker` and `rules_go` dependencies to MODULE.bazel. - Updated `rules/vendor.bzl` to use `default_vendor_label` instead of `dummy_label` for clarity. - Added `third_party/docker/rules_docker_fix.patch` to fix `image_transition` platform constraints (forcing x86_64/linux). - Added `third_party/lowrisc/opentitan_llvm.patch` to remove conflicting LLVM toolchain configurations. - Updated `third_party/docker` and `third_party/lint` to use module extensions.

willyzha force-pushed the upgrade-bzlmod-final branch from 27a2921 to a4de307 Compare December 20, 2025 04:36

timothytrippel requested review from moidx and timothytrippel December 20, 2025 05:36

willyzha force-pushed the upgrade-bzlmod-final branch 11 times, most recently from 570eb38 to c22f8ce Compare December 26, 2025 18:21

timothytrippel reviewed Dec 26, 2025

View reviewed changes

willyzha marked this pull request as ready for review December 26, 2025 21:55

willyzha force-pushed the upgrade-bzlmod-final branch 2 times, most recently from 2465e27 to 3aefffc Compare December 29, 2025 17:01

willyzha mentioned this pull request Dec 29, 2025

Complete WORKSPACE to bzlmod migration #283

Open

willyzha linked an issue Dec 29, 2025 that may be closed by this pull request

Complete WORKSPACE to bzlmod migration #283

Open

Willy Zhang added 8 commits December 30, 2025 11:53

Migrate softhsm2 dependency to Bzlmod

97a9785

- Move softhsm2 definition from WORKSPACE to MODULE.bazel. - Update src/pk11/test_support.go to use bazel.Runfile for locating softhsm2-util. - Remove third_party/softhsm2/repos.bzl. Signed-off-by: Willy Zhang <[email protected]>

Migrate lowrisc dependencies to Bzlmod

6249f56

- Move lowrisc repository definitions from WORKSPACE to MODULE.bazel. - Remove legacy third_party/lowrisc/repos.bzl. - Update documentation to reference MODULE.bazel. Signed-off-by: Willy Zhang <[email protected]>

Reorder lowrisc dependancies in MODULE.bazel

1bf0327

Signed-off-by: Willy Zhang <[email protected]>

willyzha force-pushed the upgrade-bzlmod-final branch from 11beee8 to 2a2903e Compare December 30, 2025 19:53

willyzha requested a review from timothytrippel December 30, 2025 20:01

		@@ -0,0 +1,48 @@
		diff --git a/extensions/bindgen/private/bindgen.bzl b/extensions/bindgen/private/bindgen.bzl
		--- private/bindgen.bzl

Migrate to Bzlmod, upgrade toolchains, and cleanup #280

Are you sure you want to change the base?

Migrate to Bzlmod, upgrade toolchains, and cleanup #280

Uh oh!

Conversation

willyzha commented Dec 20, 2025

Uh oh!

timothytrippel left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

timothytrippel commented Dec 26, 2025

Uh oh!

willyzha commented Dec 29, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants