Merge remote-tracking branch 'origin/main' into cod-2033-codspeed-cpp-includes-setupteardown-in-instrumentation-mode

# Conflicts:
#	core/CMakeLists.txt

Author: not-matthias

.github/workflows/ci.yml

@@ -19,9 +19,16 @@ jobs:
         with:
           extra_args: --all-files
 
+  toolchain-detection-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run toolchain detection tests
+        run: bash core/scripts/test_detect_toolchain.sh
+
   tests:
     runs-on: ubuntu-latest
-    steps: 
+    steps:
       - name: Checkout code
         uses: actions/checkout@v3
         with:
@@ -43,7 +50,7 @@ jobs:
           make -j
 
       - name: Run tests
-        run: | 
+        run: |
           cd core/build-tests
           GTEST_OUTPUT=json:test-results/ ctest
 
@@ -126,7 +133,7 @@ jobs:
       - name: Build benchmark example
         run: |
           bazel build //examples/google_benchmark_bazel:my_benchmark --@codspeed_core//:codspeed_mode=${{ matrix.codspeed-mode }} --@codspeed_core//:strict_warnings=on
-  
+
       - name: Run the benchmarks
         uses: CodSpeedHQ/action@main
         if: matrix.codspeed-mode != 'off'
@@ -200,3 +207,56 @@ jobs:
       - name: Build benchmark example
         run: |
           bazel build //examples/google_benchmark_bazel:my_benchmark --@codspeed_core//:codspeed_mode=${{ matrix.codspeed-mode }} --@codspeed_core//:strict_warnings=on
+
+  macos-walltime-cmake-test:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
+
+      - name: Build benchmark example
+        run: |
+          mkdir -p examples/google_benchmark_cmake/build
+          cd examples/google_benchmark_cmake/build
+          cmake -DCODSPEED_MODE=walltime ..
+          make -j
+
+      - name: Run the benchmarks
+        uses: CodSpeedHQ/action@main
+        with:
+          run: examples/google_benchmark_cmake/build/benchmark_example --benchmark_filter=BM_FibonacciRecursive_Darwin
+          mode: walltime
+          # TODO: Remove this once the runner has been released with macos support
+          runner-version: branch:main
+
+  macos-walltime-bazel-test:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
+
+      - name: Set up Bazel
+        uses: bazel-contrib/setup-bazel@0.14.0
+        with:
+          bazelisk-cache: true
+          disk-cache: ${{ github.workflow }}
+          repository-cache: true
+
+      - name: Build benchmark example
+        run: |
+          bazel build //examples/google_benchmark_bazel:my_benchmark --@codspeed_core//:codspeed_mode=walltime --@codspeed_core//:strict_warnings=on
+
+      - name: Run the benchmarks
+        uses: CodSpeedHQ/action@main
+        with:
+          # Note: using bazel run directly fails with a permission error on `/var/tmp/_bazel_codspeed/`
+          # This is because bazel does not like the user switch between running `bazel build` as a user then running `bazel run` as sudo and refuses to run.
+          # For now, `$USER` remains the original user, but the program is ran with uid 0 with `sudo --preserve-env`
+          # This problem is temporary because the runner does not YET do the same uid/gid spoofing on macos as it does on linux.
+          #
+          # BUILD_WORKSPACE_DIRECTORY is normally set by `bazel run`; we set it manually so workspace-relative __FILE__ resolution works when invoking the binary directly.
+          run: BUILD_WORKSPACE_DIRECTORY=$PWD ./bazel-bin/examples/google_benchmark_bazel/my_benchmark --benchmark_filter=BM_FibonacciRecursive_Darwin
+          mode: walltime
+          runner-version: branch:main

.pre-commit-config.yaml

@@ -15,3 +15,7 @@ repos:
     hooks:
       - id: clang-format
         files: \.(cpp|cc|cxx|h|hpp)$
+  - repo: https://github.com/BlankSpruce/gersemi-pre-commit
+    rev: 0.27.2
+    hooks:
+      - id: gersemi

CHANGELOG.md

@@ -5,6 +5,47 @@
 
 
 
+## [2.4.0] - 2026-06-04
+
+### <!-- 0 -->🚀 Features
+- Add Darwin-specific fib variant for macOS flamegraph coverage
+
+### <!-- 4 -->⚡ Performance
+- Prevent constant-folding of fib input across iterations
+
+### <!-- 7 -->⚙️ Internals
+- Bump instrument-hooks
+
+
+## [2.3.0] - 2026-04-28
+
+### <!-- 0 -->🚀 Features
+- Add cmake formatter to precommit hooks
+- Bump instrument-hooks to use int32_t for pid
+- Fix bazel build by forcing C++17
+
+### <!-- 7 -->⚙️ Internals
+- Add macos integration test
+- Explicitly convert pid to unsigned
+- Bump instrument-hooks to suppress stub warnings
+
+
+## [2.2.0] - 2026-04-17
+
+### <!-- 0 -->🚀 Features
+- Add toolchain environment collection to bazel
+- Add toolchain environment collection to CMake build
+
+### <!-- 1 -->🐛 Bug Fixes
+- Use slugged name for environment section
+- Fix clang 19 compilation error
+
+### <!-- 7 -->⚙️ Internals
+- Bump instrument-hooks to collect runtime libraries
+- Use the same logic for toolchain detection
+- Stop targeting our fork for BCR PR (#43)
+
+
 ## [2.1.0] - 2026-01-21
 
 ### <!-- 0 -->🚀 Features
@@ -202,6 +243,9 @@
 - Import google benchmark "fork"
 
 
+[2.4.0]: https://github.com/CodSpeedHQ/runner/compare/v2.3.0..v2.4.0
+[2.3.0]: https://github.com/CodSpeedHQ/runner/compare/v2.2.0..v2.3.0
+[2.2.0]: https://github.com/CodSpeedHQ/runner/compare/v2.1.0..v2.2.0
 [2.1.0]: https://github.com/CodSpeedHQ/runner/compare/v2.0.0..v2.1.0
 [2.0.0]: https://github.com/CodSpeedHQ/runner/compare/v1.4.1..v2.0.0
 [1.4.1]: https://github.com/CodSpeedHQ/runner/compare/v1.4.0..v1.4.1

core/BUILD

@@ -8,6 +8,11 @@ config_setting(
     constraint_values = ["@platforms//os:windows"],
 )
 
+config_setting(
+    name = "macos",
+    constraint_values = ["@platforms//os:macos"],
+)
+
 # Strict warnings mode
 string_flag(
     name = "strict_warnings",
@@ -68,6 +73,29 @@ cc_library(
 )
 
 
+# Generate a header with C++ toolchain information
+genrule(
+    name = "toolchain_info_gen",
+    srcs = ["scripts/detect_toolchain.sh"],
+    outs = ["toolchain_info.h"],
+    cmd = """
+case "$(COMPILATION_MODE)" in
+    opt)       BUILD_TYPE="Release" ;;
+    dbg)       BUILD_TYPE="Debug" ;;
+    fastbuild) BUILD_TYPE="FastBuild" ;;
+    *)         BUILD_TYPE="$(COMPILATION_MODE)" ;;
+esac
+bash $(location scripts/detect_toolchain.sh) "$(CC)" "$$BUILD_TYPE" > $@
+""",
+    toolchains = ["@bazel_tools//tools/cpp:current_cc_toolchain"],
+)
+
+cc_library(
+    name = "toolchain_info",
+    hdrs = [":toolchain_info_gen"],
+    includes = ["."],
+)
+
 # Define the codspeed library
 cc_library(
     name = "codspeed",
@@ -77,6 +105,9 @@ cc_library(
     copts = select({
         ":windows": ["/std:c++17"],
         "//conditions:default": ["-std=c++17"],
+    }) + select({
+        ":macos": ["-mmacosx-version-min=10.15"],
+        "//conditions:default": [],
     }),
     defines = [
         "CODSPEED_VERSION=\\\"{}\\\"".format(CODSPEED_VERSION),
@@ -87,7 +118,7 @@ cc_library(
         ":walltime_mode": ["CODSPEED_ENABLED", "CODSPEED_WALLTIME", "CODSPEED_MODE_DISPLAY=\\\"walltime\\\""],
         "//conditions:default": [],
     }),
-    deps = [":instrument_hooks"],
+    deps = [":instrument_hooks", ":toolchain_info"],
     visibility = ["//visibility:public"],
 )
 

core/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 
-set(CODSPEED_VERSION 2.1.0)
+set(CODSPEED_VERSION 2.4.0)
 
 project(codspeed VERSION ${CODSPEED_VERSION} LANGUAGES CXX C)
 
@@ -25,17 +25,13 @@ endif()
 set(instrument_hooks_SOURCE_DIR ${instrument_hooks_repo_SOURCE_DIR})
 
 # Add the instrument_hooks library
-add_library(
-    instrument_hooks
-    STATIC
-    ${instrument_hooks_SOURCE_DIR}/dist/core.c
-)
+add_library(instrument_hooks STATIC ${instrument_hooks_SOURCE_DIR}/dist/core.c)
 
 target_include_directories(
     instrument_hooks
     PUBLIC
-    $<BUILD_INTERFACE:${instrument_hooks_SOURCE_DIR}/includes>
-    $<INSTALL_INTERFACE:includes>
+        $<BUILD_INTERFACE:${instrument_hooks_SOURCE_DIR}/includes>
+        $<INSTALL_INTERFACE:includes>
 )
 
 # Option to enable strict warnings (for CI builds)
@@ -61,25 +57,20 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
         list(PREPEND INSTRUMENT_HOOKS_CFLAGS -Wall -Werror)
     endif()
 
-    target_compile_options(
-        instrument_hooks
-        PRIVATE
-        ${INSTRUMENT_HOOKS_CFLAGS}
-    )
+    target_compile_options(instrument_hooks PRIVATE ${INSTRUMENT_HOOKS_CFLAGS})
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     target_compile_options(
         instrument_hooks
         PRIVATE
-        /wd4101  # unreferenced local variable (equivalent to -Wno-unused-variable)
-        /wd4189  # local variable is initialized but not referenced (equivalent to -Wno-unused-but-set-variable)
-        /wd4100  # unreferenced formal parameter (equivalent to -Wno-unused-parameter)
-        /wd4245  # signed/unsigned mismatch
-        /wd4132  # const object should be initialized
-        /wd4146  # unary minus operator applied to unsigned type
+            /wd4101 # unreferenced local variable (equivalent to -Wno-unused-variable)
+            /wd4189 # local variable is initialized but not referenced (equivalent to -Wno-unused-but-set-variable)
+            /wd4100 # unreferenced formal parameter (equivalent to -Wno-unused-parameter)
+            /wd4245 # signed/unsigned mismatch
+            /wd4132 # const object should be initialized
+            /wd4146 # unary minus operator applied to unsigned type
     )
 endif()
 
-
 # Add the main library
 add_library(
     codspeed
@@ -96,11 +87,35 @@ target_link_libraries(codspeed PRIVATE instrument_hooks)
 # Version
 add_compile_definitions(CODSPEED_VERSION="${CODSPEED_VERSION}")
 
+# Collect compiler toolchain information for environment reporting
+# Use the shared detect_toolchain.sh script (same as Bazel) for consistent output
+execute_process(
+    COMMAND
+        bash "${CMAKE_CURRENT_SOURCE_DIR}/scripts/detect_toolchain.sh"
+        "${CMAKE_CXX_COMPILER}" "${CMAKE_BUILD_TYPE}"
+    OUTPUT_VARIABLE CODSPEED_TOOLCHAIN_HEADER
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    RESULT_VARIABLE DETECT_TOOLCHAIN_RESULT
+)
+if(DETECT_TOOLCHAIN_RESULT EQUAL 0)
+    file(
+        WRITE "${CMAKE_CURRENT_BINARY_DIR}/toolchain_info.h"
+        "${CODSPEED_TOOLCHAIN_HEADER}\n"
+    )
+else()
+    message(
+        WARNING
+        "detect_toolchain.sh failed, toolchain info will not be available"
+    )
+endif()
+target_include_directories(codspeed PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
+
 # Specify the include directories for users of the library
 target_include_directories(
     codspeed
-    PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
-           $<BUILD_INTERFACE:${instrument_hooks_SOURCE_DIR}/includes>
+    PUBLIC
+        $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+        $<BUILD_INTERFACE:${instrument_hooks_SOURCE_DIR}/includes>
 )
 
 # Disable valgrind compilation errors
@@ -143,7 +158,13 @@ target_compile_definitions(
 
 message(STATUS "Using codspeed root directory: ${CODSPEED_ROOT_DIR}")
 
-set(CODSPEED_MODE_ALLOWED_VALUES "off" "instrumentation" "simulation" "memory" "walltime")
+set(CODSPEED_MODE_ALLOWED_VALUES
+    "off"
+    "instrumentation"
+    "simulation"
+    "memory"
+    "walltime"
+)
 set(CODSPEED_MODE "off" CACHE STRING "Build mode for Codspeed")
 set_property(
     CACHE CODSPEED_MODE
@@ -152,7 +173,10 @@ set_property(
 
 if(NOT CODSPEED_MODE STREQUAL "off")
     target_compile_definitions(codspeed PUBLIC -DCODSPEED_ENABLED)
-    target_compile_definitions(codspeed PUBLIC -DCODSPEED_MODE_DISPLAY="${CODSPEED_MODE}")
+    target_compile_definitions(
+        codspeed
+        PUBLIC -DCODSPEED_MODE_DISPLAY="${CODSPEED_MODE}"
+    )
 
     if(NOT CMAKE_BUILD_TYPE)
         message(
@@ -167,11 +191,12 @@ if(NOT CODSPEED_MODE STREQUAL "off")
     endif()
 
     # Define a preprocessor macro based on the build mode
-    if(CODSPEED_MODE STREQUAL "instrumentation" OR CODSPEED_MODE STREQUAL "simulation" OR CODSPEED_MODE STREQUAL "memory")
-        target_compile_definitions(
-            codspeed
-            PUBLIC -DCODSPEED_ANALYSIS
-        )
+    if(
+        CODSPEED_MODE STREQUAL "instrumentation"
+        OR CODSPEED_MODE STREQUAL "simulation"
+        OR CODSPEED_MODE STREQUAL "memory"
+    )
+        target_compile_definitions(codspeed PUBLIC -DCODSPEED_ANALYSIS)
     elseif(CODSPEED_MODE STREQUAL "walltime")
         target_compile_definitions(codspeed PUBLIC -DCODSPEED_WALLTIME)
     else()

core/MODULE.bazel

@@ -1,6 +1,6 @@
 module(
     name = "codspeed_core",
-    version = "2.1.0",
+    version = "2.4.0",
 )
 
 bazel_dep(name = "rules_cc", version = "0.0.17")