From c94e87c6805acb0a34fa91a749b8e6fbd1a90493 Mon Sep 17 00:00:00 2001 From: Dave Roth Date: Mon, 30 Mar 2026 20:29:29 +0000 Subject: [PATCH 1/2] manually roll pigweed --- MODULE.bazel | 4 +-- MODULE.bazel.lock | 14 +++++------ target/earlgrey/syscall_latency/BUILD.bazel | 14 +++-------- target/earlgrey/tests/ipc/user/BUILD.bazel | 10 +++++--- target/earlgrey/tests/uart/BUILD.bazel | 28 ++++----------------- 5 files changed, 22 insertions(+), 48 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 92437b5..a830a8b 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -17,9 +17,7 @@ bazel_dep(name = "ureg") git_override( module_name = "pigweed", - # ROLL: Warning: this entry is automatically updated by - # ROLL: https://cr-buildbucket.appspot.com/builder/pigweed-internal/opentitan.roll/pigweed-opentitan-roller - commit = "60041564a00b455fa68b20e89b685f19a210e69e", + commit = "ecef9fcc2d03654806a428fd18cc0e556b3839dc", remote = "https://pigweed.googlesource.com/pigweed/pigweed", ) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index fa65afe..6f4e919 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -735,7 +735,7 @@ "@@pigweed+//pw_toolchain/cc:pw_cxx_toolchain.bzl%pw_cxx_toolchain": { "general": { "bzlTransitiveDigest": "hciO8VUJTXRWfoaBvBdqqwBlHLoS7lHSff+HOQIyMd0=", - "usagesDigest": "+dP3h/qko3gqbQH60WbxIGjcX8x8oF4WbHW/Rt//5qw=", + "usagesDigest": "O2knOOLSyJ37Fy1WVpzIxERmMhIfU0nZBGszwkm4yKE=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -753,7 +753,7 @@ "attributes": { "build_file": "@@pigweed+//pw_toolchain/build_external:llvm_clang.BUILD", "path": "fuchsia/third_party/clang/${os}-${arch}", - "tag": "git_revision:943eb6fd958e8b130ee94f5c65b7d53ec3419acc" + "tag": "git_revision:9de31c4a3e77ceb1e736d4df3ae9e3f5a1dc8748" } }, "zephyr_toolchain": { @@ -777,7 +777,7 @@ "@@pigweed+//pw_toolchain/rust:extensions.bzl%pw_rust": { "general": { "bzlTransitiveDigest": "VbWv5Ea8Ymo5+WBLsxmIiRRjVMUDImyeIdt8xvmCgsU=", - "usagesDigest": "+54qGCjWcCxwmG9CfrMRwkurpWdyqeUoVhE2oyipHO8=", + "usagesDigest": "wpDqcqNUFwXJu90D9XuGDPoMSPIgNMMs5LqjbnCpv7Q=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -803,7 +803,7 @@ "attributes": { "build_file": "@@pigweed+//pw_toolchain/rust:rust_analyzer.BUILD", "path": "fuchsia/third_party/rust-analyzer/linux-arm64", - "tag": "git_revision:a1b86d600f88be98643e5dd61d6ed26eda17c09e" + "tag": "git_revision:768710166f2992fec06a77a10c695864dc47000b" } }, "rust_toolchain_host_linux_x86_64": { @@ -827,7 +827,7 @@ "attributes": { "build_file": "@@pigweed+//pw_toolchain/rust:rust_analyzer.BUILD", "path": "fuchsia/third_party/rust-analyzer/linux-amd64", - "tag": "git_revision:a1b86d600f88be98643e5dd61d6ed26eda17c09e" + "tag": "git_revision:768710166f2992fec06a77a10c695864dc47000b" } }, "rust_toolchain_host_macos_aarch64": { @@ -851,7 +851,7 @@ "attributes": { "build_file": "@@pigweed+//pw_toolchain/rust:rust_analyzer.BUILD", "path": "fuchsia/third_party/rust-analyzer/mac-arm64", - "tag": "git_revision:a1b86d600f88be98643e5dd61d6ed26eda17c09e" + "tag": "git_revision:768710166f2992fec06a77a10c695864dc47000b" } }, "rust_toolchain_host_macos_x86_64": { @@ -875,7 +875,7 @@ "attributes": { "build_file": "@@pigweed+//pw_toolchain/rust:rust_analyzer.BUILD", "path": "fuchsia/third_party/rust-analyzer/mac-amd64", - "tag": "git_revision:a1b86d600f88be98643e5dd61d6ed26eda17c09e" + "tag": "git_revision:768710166f2992fec06a77a10c695864dc47000b" } }, "rust_toolchain_target_thumbv6m-none-eabi_armv6-m": { diff --git a/target/earlgrey/syscall_latency/BUILD.bazel b/target/earlgrey/syscall_latency/BUILD.bazel index 0d45817..2ec07f4 100644 --- a/target/earlgrey/syscall_latency/BUILD.bazel +++ b/target/earlgrey/syscall_latency/BUILD.bazel @@ -1,7 +1,7 @@ # Licensed under the Apache-2.0 license # SPDX-License-Identifier: Apache-2.0 -load("@pigweed//pw_kernel/tooling:app_package.bzl", "app_package") +load("@pigweed//pw_kernel/tooling:rust_app.bzl", "rust_app") load("@pigweed//pw_kernel/tooling:system_image.bzl", "system_image") load("@pigweed//pw_kernel/tooling:target_codegen.bzl", "target_codegen") load("@pigweed//pw_kernel/tooling:target_linker_script.bzl", "target_linker_script") @@ -10,7 +10,7 @@ load("//target/earlgrey:defs.bzl", "TARGET_COMPATIBLE_WITH") load("//target/earlgrey/signing/keys:defs.bzl", "FPGA_ECDSA_KEY", "SILICON_ECDSA_KEY") load("//target/earlgrey/tooling:opentitan_runner.bzl", "opentitan_runner") -rust_binary( +rust_app( name = "syscall_latency", srcs = [ "main.rs", @@ -23,9 +23,9 @@ rust_binary( }), crate_name = "syscall_latency", edition = "2024", + system_config = "@pigweed//pw_kernel/target:system_config_file", target_compatible_with = TARGET_COMPATIBLE_WITH, deps = [ - ":app_syscall_latency", "//target/earlgrey:config", "//target/earlgrey/registers", "@pigweed//pw_base64/rust:pw_base64", @@ -36,14 +36,6 @@ rust_binary( ], ) -app_package( - name = "app_syscall_latency", - app_name = "syscall_latency", - edition = "2024", - system_config = "@pigweed//pw_kernel/target:system_config_file", - tags = ["kernel"], -) - system_image( name = "measure_syscall_latency", apps = [ diff --git a/target/earlgrey/tests/ipc/user/BUILD.bazel b/target/earlgrey/tests/ipc/user/BUILD.bazel index 0f5c595..51d41a5 100644 --- a/target/earlgrey/tests/ipc/user/BUILD.bazel +++ b/target/earlgrey/tests/ipc/user/BUILD.bazel @@ -10,12 +10,13 @@ load("//target/earlgrey:defs.bzl", "TARGET_COMPATIBLE_WITH") load("//target/earlgrey/signing/keys:defs.bzl", "FPGA_ECDSA_KEY", "SILICON_ECDSA_KEY") load("//target/earlgrey/tooling:opentitan_runner.bzl", "opentitan_test") +APPS = [ + "@pigweed//pw_kernel/tests/ipc/user:ipc", +] + system_image( name = "ipc", - apps = [ - "@pigweed//pw_kernel/tests/ipc/user:initiator", - "@pigweed//pw_kernel/tests/ipc/user:handler", - ], + apps = APPS, kernel = ":target", platform = "//target/earlgrey", system_config = ":system_config", @@ -46,6 +47,7 @@ filegroup( target_codegen( name = "codegen", + apps = APPS, arch = "@pigweed//pw_kernel/arch/riscv:arch_riscv", system_config = ":system_config", ) diff --git a/target/earlgrey/tests/uart/BUILD.bazel b/target/earlgrey/tests/uart/BUILD.bazel index a490def..382a056 100644 --- a/target/earlgrey/tests/uart/BUILD.bazel +++ b/target/earlgrey/tests/uart/BUILD.bazel @@ -1,7 +1,7 @@ # Licensed under the Apache-2.0 license # SPDX-License-Identifier: Apache-2.0 -load("@pigweed//pw_kernel/tooling:app_package.bzl", "app_package") +load("@pigweed//pw_kernel/tooling:rust_app.bzl", "rust_app") load("@pigweed//pw_kernel/tooling:system_image.bzl", "system_image") load("@pigweed//pw_kernel/tooling:target_codegen.bzl", "target_codegen") load("@pigweed//pw_kernel/tooling:target_linker_script.bzl", "target_linker_script") @@ -10,16 +10,15 @@ load("//target/earlgrey:defs.bzl", "TARGET_COMPATIBLE_WITH") load("//target/earlgrey/signing/keys:defs.bzl", "FPGA_ECDSA_KEY", "SILICON_ECDSA_KEY") load("//target/earlgrey/tooling:opentitan_runner.bzl", "opentitan_test") -rust_binary( +rust_app( name = "test_uart", srcs = [ "test_uart.rs", ], edition = "2024", + system_config = "@pigweed//pw_kernel/target:system_config_file", tags = ["kernel"], - visibility = ["//visibility:public"], deps = [ - ":app_test_uart", "//target/earlgrey/registers", "@pigweed//pw_kernel/userspace", "@pigweed//pw_log/rust:pw_log", @@ -27,24 +26,15 @@ rust_binary( ], ) -app_package( - name = "app_test_uart", - app_name = "test_uart", - edition = "2024", - system_config = "@pigweed//pw_kernel/target:system_config_file", - tags = ["kernel"], -) - -rust_binary( +rust_app( name = "test_uart_listener", srcs = [ "test_uart_listener.rs", ], edition = "2024", + system_config = "@pigweed//pw_kernel/target:system_config_file", tags = ["kernel"], - visibility = ["//visibility:public"], deps = [ - ":app_test_uart_listener", "//target/earlgrey/registers", "@pigweed//pw_kernel/lib/pw_assert", "@pigweed//pw_kernel/syscall:syscall_user", @@ -54,14 +44,6 @@ rust_binary( ], ) -app_package( - name = "app_test_uart_listener", - app_name = "test_uart_listener", - edition = "2024", - system_config = "@pigweed//pw_kernel/target:system_config_file", - tags = ["kernel"], -) - system_image( name = "uart", apps = [ From a354a2d959b00425aded8862bbc96a1a839071fa Mon Sep 17 00:00:00 2001 From: Dave Roth Date: Tue, 31 Mar 2026 20:38:33 +0000 Subject: [PATCH 2/2] Revert "manually roll pigweed" This reverts commit c94e87c6805acb0a34fa91a749b8e6fbd1a90493. --- MODULE.bazel | 4 ++- MODULE.bazel.lock | 14 +++++------ target/earlgrey/syscall_latency/BUILD.bazel | 14 ++++++++--- target/earlgrey/tests/ipc/user/BUILD.bazel | 10 +++----- target/earlgrey/tests/uart/BUILD.bazel | 28 +++++++++++++++++---- 5 files changed, 48 insertions(+), 22 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index a830a8b..92437b5 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -17,7 +17,9 @@ bazel_dep(name = "ureg") git_override( module_name = "pigweed", - commit = "ecef9fcc2d03654806a428fd18cc0e556b3839dc", + # ROLL: Warning: this entry is automatically updated by + # ROLL: https://cr-buildbucket.appspot.com/builder/pigweed-internal/opentitan.roll/pigweed-opentitan-roller + commit = "60041564a00b455fa68b20e89b685f19a210e69e", remote = "https://pigweed.googlesource.com/pigweed/pigweed", ) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 6f4e919..fa65afe 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -735,7 +735,7 @@ "@@pigweed+//pw_toolchain/cc:pw_cxx_toolchain.bzl%pw_cxx_toolchain": { "general": { "bzlTransitiveDigest": "hciO8VUJTXRWfoaBvBdqqwBlHLoS7lHSff+HOQIyMd0=", - "usagesDigest": "O2knOOLSyJ37Fy1WVpzIxERmMhIfU0nZBGszwkm4yKE=", + "usagesDigest": "+dP3h/qko3gqbQH60WbxIGjcX8x8oF4WbHW/Rt//5qw=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -753,7 +753,7 @@ "attributes": { "build_file": "@@pigweed+//pw_toolchain/build_external:llvm_clang.BUILD", "path": "fuchsia/third_party/clang/${os}-${arch}", - "tag": "git_revision:9de31c4a3e77ceb1e736d4df3ae9e3f5a1dc8748" + "tag": "git_revision:943eb6fd958e8b130ee94f5c65b7d53ec3419acc" } }, "zephyr_toolchain": { @@ -777,7 +777,7 @@ "@@pigweed+//pw_toolchain/rust:extensions.bzl%pw_rust": { "general": { "bzlTransitiveDigest": "VbWv5Ea8Ymo5+WBLsxmIiRRjVMUDImyeIdt8xvmCgsU=", - "usagesDigest": "wpDqcqNUFwXJu90D9XuGDPoMSPIgNMMs5LqjbnCpv7Q=", + "usagesDigest": "+54qGCjWcCxwmG9CfrMRwkurpWdyqeUoVhE2oyipHO8=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -803,7 +803,7 @@ "attributes": { "build_file": "@@pigweed+//pw_toolchain/rust:rust_analyzer.BUILD", "path": "fuchsia/third_party/rust-analyzer/linux-arm64", - "tag": "git_revision:768710166f2992fec06a77a10c695864dc47000b" + "tag": "git_revision:a1b86d600f88be98643e5dd61d6ed26eda17c09e" } }, "rust_toolchain_host_linux_x86_64": { @@ -827,7 +827,7 @@ "attributes": { "build_file": "@@pigweed+//pw_toolchain/rust:rust_analyzer.BUILD", "path": "fuchsia/third_party/rust-analyzer/linux-amd64", - "tag": "git_revision:768710166f2992fec06a77a10c695864dc47000b" + "tag": "git_revision:a1b86d600f88be98643e5dd61d6ed26eda17c09e" } }, "rust_toolchain_host_macos_aarch64": { @@ -851,7 +851,7 @@ "attributes": { "build_file": "@@pigweed+//pw_toolchain/rust:rust_analyzer.BUILD", "path": "fuchsia/third_party/rust-analyzer/mac-arm64", - "tag": "git_revision:768710166f2992fec06a77a10c695864dc47000b" + "tag": "git_revision:a1b86d600f88be98643e5dd61d6ed26eda17c09e" } }, "rust_toolchain_host_macos_x86_64": { @@ -875,7 +875,7 @@ "attributes": { "build_file": "@@pigweed+//pw_toolchain/rust:rust_analyzer.BUILD", "path": "fuchsia/third_party/rust-analyzer/mac-amd64", - "tag": "git_revision:768710166f2992fec06a77a10c695864dc47000b" + "tag": "git_revision:a1b86d600f88be98643e5dd61d6ed26eda17c09e" } }, "rust_toolchain_target_thumbv6m-none-eabi_armv6-m": { diff --git a/target/earlgrey/syscall_latency/BUILD.bazel b/target/earlgrey/syscall_latency/BUILD.bazel index 2ec07f4..0d45817 100644 --- a/target/earlgrey/syscall_latency/BUILD.bazel +++ b/target/earlgrey/syscall_latency/BUILD.bazel @@ -1,7 +1,7 @@ # Licensed under the Apache-2.0 license # SPDX-License-Identifier: Apache-2.0 -load("@pigweed//pw_kernel/tooling:rust_app.bzl", "rust_app") +load("@pigweed//pw_kernel/tooling:app_package.bzl", "app_package") load("@pigweed//pw_kernel/tooling:system_image.bzl", "system_image") load("@pigweed//pw_kernel/tooling:target_codegen.bzl", "target_codegen") load("@pigweed//pw_kernel/tooling:target_linker_script.bzl", "target_linker_script") @@ -10,7 +10,7 @@ load("//target/earlgrey:defs.bzl", "TARGET_COMPATIBLE_WITH") load("//target/earlgrey/signing/keys:defs.bzl", "FPGA_ECDSA_KEY", "SILICON_ECDSA_KEY") load("//target/earlgrey/tooling:opentitan_runner.bzl", "opentitan_runner") -rust_app( +rust_binary( name = "syscall_latency", srcs = [ "main.rs", @@ -23,9 +23,9 @@ rust_app( }), crate_name = "syscall_latency", edition = "2024", - system_config = "@pigweed//pw_kernel/target:system_config_file", target_compatible_with = TARGET_COMPATIBLE_WITH, deps = [ + ":app_syscall_latency", "//target/earlgrey:config", "//target/earlgrey/registers", "@pigweed//pw_base64/rust:pw_base64", @@ -36,6 +36,14 @@ rust_app( ], ) +app_package( + name = "app_syscall_latency", + app_name = "syscall_latency", + edition = "2024", + system_config = "@pigweed//pw_kernel/target:system_config_file", + tags = ["kernel"], +) + system_image( name = "measure_syscall_latency", apps = [ diff --git a/target/earlgrey/tests/ipc/user/BUILD.bazel b/target/earlgrey/tests/ipc/user/BUILD.bazel index 51d41a5..0f5c595 100644 --- a/target/earlgrey/tests/ipc/user/BUILD.bazel +++ b/target/earlgrey/tests/ipc/user/BUILD.bazel @@ -10,13 +10,12 @@ load("//target/earlgrey:defs.bzl", "TARGET_COMPATIBLE_WITH") load("//target/earlgrey/signing/keys:defs.bzl", "FPGA_ECDSA_KEY", "SILICON_ECDSA_KEY") load("//target/earlgrey/tooling:opentitan_runner.bzl", "opentitan_test") -APPS = [ - "@pigweed//pw_kernel/tests/ipc/user:ipc", -] - system_image( name = "ipc", - apps = APPS, + apps = [ + "@pigweed//pw_kernel/tests/ipc/user:initiator", + "@pigweed//pw_kernel/tests/ipc/user:handler", + ], kernel = ":target", platform = "//target/earlgrey", system_config = ":system_config", @@ -47,7 +46,6 @@ filegroup( target_codegen( name = "codegen", - apps = APPS, arch = "@pigweed//pw_kernel/arch/riscv:arch_riscv", system_config = ":system_config", ) diff --git a/target/earlgrey/tests/uart/BUILD.bazel b/target/earlgrey/tests/uart/BUILD.bazel index 382a056..a490def 100644 --- a/target/earlgrey/tests/uart/BUILD.bazel +++ b/target/earlgrey/tests/uart/BUILD.bazel @@ -1,7 +1,7 @@ # Licensed under the Apache-2.0 license # SPDX-License-Identifier: Apache-2.0 -load("@pigweed//pw_kernel/tooling:rust_app.bzl", "rust_app") +load("@pigweed//pw_kernel/tooling:app_package.bzl", "app_package") load("@pigweed//pw_kernel/tooling:system_image.bzl", "system_image") load("@pigweed//pw_kernel/tooling:target_codegen.bzl", "target_codegen") load("@pigweed//pw_kernel/tooling:target_linker_script.bzl", "target_linker_script") @@ -10,15 +10,16 @@ load("//target/earlgrey:defs.bzl", "TARGET_COMPATIBLE_WITH") load("//target/earlgrey/signing/keys:defs.bzl", "FPGA_ECDSA_KEY", "SILICON_ECDSA_KEY") load("//target/earlgrey/tooling:opentitan_runner.bzl", "opentitan_test") -rust_app( +rust_binary( name = "test_uart", srcs = [ "test_uart.rs", ], edition = "2024", - system_config = "@pigweed//pw_kernel/target:system_config_file", tags = ["kernel"], + visibility = ["//visibility:public"], deps = [ + ":app_test_uart", "//target/earlgrey/registers", "@pigweed//pw_kernel/userspace", "@pigweed//pw_log/rust:pw_log", @@ -26,15 +27,24 @@ rust_app( ], ) -rust_app( +app_package( + name = "app_test_uart", + app_name = "test_uart", + edition = "2024", + system_config = "@pigweed//pw_kernel/target:system_config_file", + tags = ["kernel"], +) + +rust_binary( name = "test_uart_listener", srcs = [ "test_uart_listener.rs", ], edition = "2024", - system_config = "@pigweed//pw_kernel/target:system_config_file", tags = ["kernel"], + visibility = ["//visibility:public"], deps = [ + ":app_test_uart_listener", "//target/earlgrey/registers", "@pigweed//pw_kernel/lib/pw_assert", "@pigweed//pw_kernel/syscall:syscall_user", @@ -44,6 +54,14 @@ rust_app( ], ) +app_package( + name = "app_test_uart_listener", + app_name = "test_uart_listener", + edition = "2024", + system_config = "@pigweed//pw_kernel/target:system_config_file", + tags = ["kernel"], +) + system_image( name = "uart", apps = [