Merge remote-tracking branch 'origin/develop' into bazel-missing-configs

Author: will-v-pi

.github/workflows/bazel_build.yml

@@ -73,3 +73,34 @@ jobs:
           path: lib/picotool
       - name: Other Bazel checks
         run: python3 tools/run_all_bazel_checks.py --program=other --picotool-dir=lib/picotool
+
+  bazel-9-build-check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Get Bazel
+        uses: bazel-contrib/setup-bazel@0.9.0
+        with:
+          bazelisk-cache: true
+          disk-cache: ${{ github.workflow }}-bazel9
+          repository-cache: true
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+      - name: Fetch latest Picotool
+        uses: actions/checkout@v4
+        with:
+          repository: raspberrypi/picotool
+          ref: develop
+          fetch-depth: 0
+          path: lib/picotool
+      - name: Full Bazel build with Bazel 9
+        env:
+          # Use the latest released 9.x version
+          # Ref https://github.com/bazelbuild/bazelisk/blob/master/README.md#how-does-bazelisk-know-which-bazel-version-to-run
+          USE_BAZEL_VERSION: '9.x'
+        run: python3 tools/run_all_bazel_checks.py --program=build --picotool-dir=lib/picotool

.github/workflows/check_float_tests.yml

@@ -0,0 +1,31 @@
+name: Check floating-point tests
+
+on:
+  push:
+    paths:
+      - .github/workflows/check_float_tests.yml
+      - tools/check_float_test_names.py
+      - src/rp2_common/pico_float/include/pico/float.h
+      - src/rp2_common/pico_double/include/pico/double.h
+      - test/pico_float_test/custom_float_funcs_test.c
+      - test/pico_float_test/custom_double_funcs_test.c
+  pull_request:
+    paths:
+      - .github/workflows/check_float_tests.yml
+      - tools/check_float_test_names.py
+      - src/rp2_common/pico_float/include/pico/float.h
+      - src/rp2_common/pico_double/include/pico/double.h
+      - test/pico_float_test/custom_float_funcs_test.c
+      - test/pico_float_test/custom_double_funcs_test.c
+
+jobs:
+  check-float-tests:
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Check float tests
+        run: |
+          tools/check_float_test_names.py

.github/workflows/check_memmaps.yml

@@ -0,0 +1,28 @@
+name: Check Memmap Annotations
+
+on:
+  push:
+    paths:
+      - 'src/*/pico_platform/memmap*.ld'
+      - 'src/*/pico_platform/script_include/**'
+      - 'src/rp2_common/pico_standard_link/script_include/**'
+      - 'tools/memmap_annotate.py'
+      - 'tools/memmap_include_tree.py'
+  pull_request:
+    paths:
+      - 'src/*/pico_platform/memmap*.ld'
+      - 'src/*/pico_platform/script_include/**'
+      - 'src/rp2_common/pico_standard_link/script_include/**'
+      - 'tools/memmap_annotate.py'
+      - 'tools/memmap_include_tree.py'
+
+jobs:
+  check-memmap-annotations:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Check Memmap Annotations
+        run: |
+          tools/memmap_annotate.py --ci

MODULE.bazel

@@ -9,6 +9,8 @@ bazel_dep(name = "rules_python", version = "0.36.0")
 bazel_dep(name = "picotool", version = "2.2.0")
 bazel_dep(name = "rules_cc", version = "0.0.10")
 
+bazel_dep(name = "buildifier_prebuilt", version = "8.5.1.2", dev_dependency = True)
+
 http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
@@ -99,41 +101,41 @@ http_archive(
     url = "https://chrome-infra-packages.appspot.com/dl/fuchsia/third_party/clang/mac-arm64/+/git_revision:910be4ff90d7d07bd4518ea03b85c0974672bf9c",
 )
 
-new_git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
+git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 # TODO: Provide tinyusb as a proper Bazel module.
-new_git_repository(
+git_repository(
     name = "tinyusb",
     build_file = "//src/rp2_common/tinyusb:tinyusb.BUILD",
     commit = "86ad6e56c1700e85f1c5678607a762cfe3aa2f47",  # keep-in-sync-with-submodule: lib/tinyusb
     remote = "https://github.com/hathach/tinyusb.git",
 )
 
 # TODO: Provide btstack as a proper Bazel module.
-new_git_repository(
+git_repository(
     name = "btstack",
     build_file = "//src/rp2_common/pico_btstack:btstack.BUILD",
     commit = "420dc137399796c88b0013ee09f157046018923e",  # keep-in-sync-with-submodule: lib/btstack
     remote = "https://github.com/bluekitchen/btstack.git",
 )
 
 # TODO: Provide cyw43-driver as a proper Bazel module.
-new_git_repository(
+git_repository(
     name = "cyw43-driver",
     build_file = "//src/rp2_common/pico_cyw43_driver:cyw43-driver.BUILD",
     commit = "dd7568229f3bf7a37737b9e1ef250c26efe75b23",  # keep-in-sync-with-submodule: lib/cyw43-driver
     remote = "https://github.com/georgerobotics/cyw43-driver.git",
 )
 
 # TODO: Provide lwip as a proper Bazel module.
-new_git_repository(
+git_repository(
     name = "lwip",
     build_file = "//src/rp2_common/pico_lwip:lwip.BUILD",
     commit = "77dcd25a72509eb83f72b033d219b1d40cd8eb95",  # keep-in-sync-with-submodule: lib/lwip
     remote = "https://github.com/lwip-tcpip/lwip.git",
 )
 
-new_git_repository(
+git_repository(
     name = "mbedtls",
     build_file = "//src/rp2_common/pico_mbedtls:mbedtls.BUILD",
     commit = "107ea89daaefb9867ea9121002fbbdf926780e98",  # keep-in-sync-with-submodule: lib/mbedtls
@@ -160,12 +162,13 @@ python.toolchain(
     configure_coverage_tool = True,
     python_version = "3.9",
 )
-
 use_repo(python, "pythons_hub")
+
 register_toolchains(
     "@pythons_hub//:all",
     dev_dependency = True,
 )
+
 register_toolchains(
     "@rules_python//python/runtime_env_toolchains:all",
     dev_dependency = True,

REPO.bazel

@@ -1,3 +1,5 @@
+"""Global settings for the Pico SDK Bazel build."""
+
 ignore_directories(
     [
         # Don't accidentally pick up external CMake deps with Bazel build files.

bazel/config/BUILD.bazel

@@ -140,7 +140,7 @@ string_flag(
     ],
 )
 
-# PICO_BAZEL_CONFIG: PICO_DEFAULT_PRINTF_IMPL, The default implementation for pico_printf to link. compiler lets the compiler control printf behavior while pico provides a pico-specific implementation, type=string, default=double, group=build
+# PICO_BAZEL_CONFIG: PICO_DEFAULT_PRINTF_IMPL, The default implementation for pico_printf to link. compiler lets the compiler control printf behavior while pico provides a pico-specific implementation, type=string, default=pico, group=build
 string_flag(
     name = "PICO_DEFAULT_PRINTF_IMPL",
     build_setting_default = "pico",
@@ -151,6 +151,17 @@ string_flag(
     ],
 )
 
+# PICO_BAZEL_CONFIG: PICO_DEFAULT_THREAD_LOCAL_IMPL, The default implementation for pico_thread_local to link; per_thread provides per thread locals while global provides shared global values, type=string, default=per_thread, group=build
+string_flag(
+    name = "PICO_DEFAULT_THREAD_LOCAL_IMPL",
+    build_setting_default = "per_thread",
+    values = [
+        "per_thread",
+        "global",
+        "none",
+    ],
+)
+
 # PICO_BAZEL_CONFIG: PICO_ASYNC_CONTEXT_IMPL, The default implementation for pico_async_context to link, type=string, default=threadsafe_background, group=build
 string_flag(
     name = "PICO_ASYNC_CONTEXT_IMPL",
@@ -217,10 +228,23 @@ string_flag(
     build_setting_default = "Debug",
 )
 
-# PICO_BAZEL_CONFIG: PICO_DEFAULT_LINKER_SCRIPT, [Bazel only] The library that provides a linker script to link into all binaries, default=//src/rp2_common/pico_crt0:default_linker_script, group=pico_standard_link
+# PICO_BAZEL_CONFIG: PICO_DEFAULT_BINARY_TYPE, The default binary type to use, type=string, default=default, group=build
+string_flag(
+    name = "PICO_DEFAULT_BINARY_TYPE",
+    build_setting_default = "default",
+    values = [
+        "default",
+        "no_flash",
+        "copy_to_ram",
+        "blocked_ram",
+        "xip_ram",
+    ],
+)
+
+# PICO_BAZEL_CONFIG: PICO_DEFAULT_LINKER_SCRIPT, [Bazel only] The library that provides a linker script to link into all binaries, default=//src/rp2_common/pico_standard_link:default_linker_script, group=pico_standard_link
 label_flag(
     name = "PICO_DEFAULT_LINKER_SCRIPT",
-    build_setting_default = "//src/rp2_common/pico_crt0:default_linker_script",
+    build_setting_default = "//src/rp2_common/pico_standard_link:default_linker_script",
 )
 
 # PICO_BAZEL_CONFIG: PICO_NO_TARGET_NAME, Don't define PICO_TARGET_NAME, type=bool, default=0, group=build
@@ -318,3 +342,9 @@ bool_flag(
     name = "PICO_COMPILATION_NO_FASTBUILD_ARGS",
     build_setting_default = False,
 )
+
+# PICO_BAZEL_CONFIG: PICO_HARD_FLOAT_ABI, use hard floating point ABI, type=bool, default=0, group=build, docref=cmake-toolchain-config
+bool_flag(
+    name = "PICO_HARD_FLOAT_ABI",
+    build_setting_default = False,
+)

bazel/constraint/BUILD.bazel

@@ -180,6 +180,16 @@ config_setting(
     flag_values = {"//bazel/config:PICO_DEFAULT_PRINTF_IMPL": "compiler"},
 )
 
+config_setting(
+    name = "pico_thread_local_per_thread_enabled",
+    flag_values = {"//bazel/config:PICO_DEFAULT_THREAD_LOCAL_IMPL": "per_thread"},
+)
+
+config_setting(
+    name = "pico_thread_local_global_enabled",
+    flag_values = {"//bazel/config:PICO_DEFAULT_THREAD_LOCAL_IMPL": "global"},
+)
+
 config_setting(
     name = "pico_async_context_poll_enabled",
     flag_values = {"//bazel/config:PICO_ASYNC_CONTEXT_IMPL": "poll"},
@@ -273,3 +283,28 @@ config_setting(
     name = "pico_compilation_no_fastbuild_args_set",
     flag_values = {"//bazel/config:PICO_COMPILATION_NO_FASTBUILD_ARGS": "True"},
 )
+
+config_setting(
+    name = "pico_hard_float_abi_enabled",
+    flag_values = {"//bazel/config:PICO_HARD_FLOAT_ABI": "True"},
+)
+
+config_setting(
+    name = "pico_binary_type_no_flash",
+    flag_values = {"//bazel/config:PICO_DEFAULT_BINARY_TYPE": "no_flash"},
+)
+
+config_setting(
+    name = "pico_binary_type_copy_to_ram",
+    flag_values = {"//bazel/config:PICO_DEFAULT_BINARY_TYPE": "copy_to_ram"},
+)
+
+config_setting(
+    name = "pico_binary_type_blocked_ram",
+    flag_values = {"//bazel/config:PICO_DEFAULT_BINARY_TYPE": "blocked_ram"},
+)
+
+config_setting(
+    name = "pico_binary_type_xip_ram",
+    flag_values = {"//bazel/config:PICO_DEFAULT_BINARY_TYPE": "xip_ram"},
+)

bazel/defs.bzl

@@ -1,3 +1,5 @@
+"""Defines common rules and macros for the Pico SDK Bazel build."""
+
 load("@bazel_skylib//rules:write_file.bzl", "write_file")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
@@ -101,6 +103,11 @@ def pico_board_config(name, platform_includes, **kwargs):
     includes provided in `platform_includes`, and the final artifact is
     a cc_library that you can configure //bazel/config:PICO_CONFIG_HEADER to
     point to.
+
+    Args:
+        name: The name of the rule.
+        platform_includes: A list of platform include paths.
+        **kwargs: Additional attributes to pass through to cc_library.
     """
     _hdr_dir = "{}_generated_includes".format(name)
     _hdr_path = "{}/pico_config_platform_headers.h".format(_hdr_dir)

bazel/pico_btstack_make_gatt_header.bzl

@@ -1,10 +1,12 @@
+"""Rule to generate Bluetooth GATT header files for BTstack."""
+
 load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cpp_toolchain", "use_cc_toolchain")
 load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 
 def _pico_btstack_make_gatt_header_impl(ctx):
     cc_toolchain = find_cpp_toolchain(ctx)
-    feature_configuration = cc_common.configure_features(
+    cc_common.configure_features(
         ctx = ctx,
         cc_toolchain = cc_toolchain,
         requested_features = ctx.features,

bazel/toolchain/BUILD.bazel

@@ -45,10 +45,12 @@ cc_args(
     args = [
         "-mcpu=cortex-m33",
         "-march=armv8-m.main+fp+dsp",
-        "-mfloat-abi=softfp",
         "-mthumb",
         "-mcmse",
-    ],
+    ] + select({
+        "//bazel/constraint:pico_hard_float_abi_enabled": ["-mfloat-abi=hard"],
+        "//conditions:default": ["-mfloat-abi=softfp"],
+    }),
 )
 
 # :no_canonical_system_headers and :no_canonical_prefixes both prevent built-in