Batch 2: retain hot-path benchmark evidence

.github/workflows/ci-freebsd.yml

@@ -16,9 +16,11 @@ jobs:
         include:
           - name: QRhi (FreeBSD)
             text: OFF
+            benchmark: OFF
             examples: OFF
           - name: QRhi+Text (FreeBSD)
             text: ON
+            benchmark: ON
             examples: ON
     steps:
       - name: Checkout repository
@@ -28,24 +30,68 @@ jobs:
         uses: vmactions/freebsd-vm@v1
         env:
           TEXT: ${{ matrix.text }}
+          BENCHMARK: ${{ matrix.benchmark }}
           EXAMPLES: ${{ matrix.examples }}
         with:
           release: "15.0"
           usesh: true
-          envs: 'TEXT EXAMPLES'
+          # Use the action's isolated rsync workspace. The guest records its
+          # result but exits cleanly so the action can copy evidence back.
+          sync: rsync
+          envs: 'TEXT BENCHMARK EXAMPLES'
           prepare: |
             pkg bootstrap -fy
             mkdir -p /usr/local/etc/pkg/repos
             echo 'FreeBSD-ports: { enabled: no }' > /usr/local/etc/pkg/repos/FreeBSD-ports.conf
             echo 'FreeBSD: { url: https://pkg.FreeBSD.org/${ABI}/latest }' > /usr/local/etc/pkg/repos/FreeBSD.conf
             pkg update -f
-            pkg install -y git cmake pkgconf qt6-base qt6-declarative qt6-shadertools
+            pkg install -y git cmake pkgconf python311 qt6-base qt6-declarative qt6-shadertools xauth xorg-vfbserver
           run: |
+            ci_status=success
+            git config --global --add safe.directory "$(pwd)"
+            mkdir -p build
             cmake -S . -B build \
               -DCMAKE_BUILD_TYPE=Release \
               -DVNM_PLOT_ENABLE_TEXT=${TEXT} \
               -DVNM_PLOT_BUILD_TESTS=ON \
+              -DVNM_PLOT_BUILD_BENCHMARK=${BENCHMARK} \
               -DVNM_PLOT_BUILD_EXAMPLES=${EXAMPLES} \
-              -DVNM_PLOT_BUILD_FUNCTION_PLOTTER=OFF
-            cmake --build build --config Release
-            cd build && env QT_QPA_PLATFORM=offscreen ctest --output-on-failure
+              -DVNM_PLOT_BUILD_FUNCTION_PLOTTER=OFF || ci_status=failure
+            if [ "${ci_status}" = success ]; then
+              cmake --build build --config Release || ci_status=failure
+            fi
+            if [ "${ci_status}" = success ]; then
+              sysctl hw.physmem hw.usermem || true
+              swapinfo -h || true
+              ulimit -a || true
+              Xvfb :99 -screen 0 1280x1024x24 >/tmp/vnm-plot-xvfb.log 2>&1 &
+              export DISPLAY=:99
+              (cd build && ctest --output-on-failure) || ci_status=failure
+            fi
+            gate_status=success
+            if [ "${BENCHMARK}" = "ON" ]; then
+              python3.11 benchmark/tools/run_gate.py \
+                --source-root . \
+                --build-dir build \
+                --mode ci-retain \
+                --upstream-status "${ci_status}" || gate_status=failure
+            fi
+            echo "${ci_status}:${gate_status}" > build/freebsd-ci-status
+            exit 0
+
+      - name: Retain benchmark gate evidence
+        if: always() && matrix.benchmark == 'ON'
+        uses: actions/upload-artifact@v4
+        with:
+          name: benchmark-gate-freebsd-${{ matrix.text }}
+          path: build/gate-artifacts
+          if-no-files-found: error
+          retention-days: 30
+
+      - name: Verify FreeBSD result
+        if: always()
+        run: |
+          test -f build/freebsd-ci-status
+          IFS=: read -r ci_status gate_status < build/freebsd-ci-status
+          test "${ci_status}" = success
+          test "${gate_status}" = success

.github/workflows/ci-linux.yml

@@ -12,9 +12,14 @@ defaults:
 
 env:
   CMAKE_BUILD_TYPE: Release
+  # Hosted Xvfb uses Mesa's CPU renderer. Bound its worker count to the job
+  # memory limit and use its GL 3.3 rasterizer without selecting a QRhi API.
+  GALLIUM_DRIVER: softpipe
+  LP_NUM_THREADS: "1"
   LINUX_SYSTEM_DEPS: >-
     libgl-dev libx11-dev libxrandr-dev libxinerama-dev libxcursor-dev
     libxi-dev libxext-dev libwayland-dev libxkbcommon-dev libvulkan-dev
+    xvfb xauth
 
 jobs:
   build-rhi:
@@ -65,9 +70,22 @@ jobs:
 
       - name: Run tests
         working-directory: build
-        env:
-          QT_QPA_PLATFORM: offscreen
-        run: ctest --output-on-failure
+        run: xvfb-run -a ctest --output-on-failure
+
+      - name: Package checkpoint evidence
+        if: always() && matrix.benchmark == 'ON'
+        run: >-
+          python benchmark/tools/run_gate.py --source-root . --build-dir build
+          --mode ci-retain --upstream-status "${{ job.status }}"
+
+      - name: Retain benchmark gate evidence
+        if: always() && matrix.benchmark == 'ON'
+        uses: actions/upload-artifact@v4
+        with:
+          name: benchmark-gate-linux-${{ matrix.text }}
+          path: build/gate-artifacts
+          if-no-files-found: error
+          retention-days: 30
 
       - name: Build summary
         run: |

.github/workflows/ci-macos.yml

@@ -61,6 +61,21 @@ jobs:
           QT_QPA_PLATFORM: offscreen
         run: ctest --output-on-failure
 
+      - name: Package checkpoint evidence
+        if: always() && matrix.benchmark == 'ON'
+        run: >-
+          python benchmark/tools/run_gate.py --source-root . --build-dir build
+          --mode ci-retain --upstream-status "${{ job.status }}"
+
+      - name: Retain benchmark gate evidence
+        if: always() && matrix.benchmark == 'ON'
+        uses: actions/upload-artifact@v4
+        with:
+          name: benchmark-gate-macos-${{ matrix.text }}
+          path: build/gate-artifacts
+          if-no-files-found: error
+          retention-days: 30
+
       - name: Build summary
         run: |
           echo "=== ${{ matrix.name }} completed ==="

.github/workflows/ci-windows.yml

@@ -57,10 +57,23 @@ jobs:
 
       - name: Run tests
         working-directory: build
-        env:
-          QT_QPA_PLATFORM: offscreen
         run: ctest --output-on-failure -C ${CMAKE_BUILD_TYPE}
 
+      - name: Package checkpoint evidence
+        if: always() && matrix.benchmark == 'ON'
+        run: >-
+          python benchmark/tools/run_gate.py --source-root . --build-dir build
+          --mode ci-retain --upstream-status "${{ job.status }}"
+
+      - name: Retain benchmark gate evidence
+        if: always() && matrix.benchmark == 'ON'
+        uses: actions/upload-artifact@v4
+        with:
+          name: benchmark-gate-windows-${{ matrix.text }}
+          path: build/gate-artifacts
+          if-no-files-found: error
+          retention-days: 30
+
       - name: Build summary
         run: |
           echo "=== ${{ matrix.name }} completed ==="

.gitignore

@@ -11,6 +11,8 @@
 
 # Benchmark output files
 inspector_benchmark_*.txt
+inspector_benchmark_*.json
+benchmark_phase_trace.jsonl
 
 # QtCreator user settings
 /examples/**/.qtcreator/
@@ -20,6 +22,7 @@ inspector_benchmark_*.txt
 # Claude workspace metadata
 .claude/
 /repo/
+__pycache__/
 
 # Windows artifacts
 /nul

CMakeLists.txt

@@ -17,7 +17,6 @@ option(VNM_PLOT_BUILD_FUNCTION_PLOTTER "Build the Qt Multimedia function_plotter
 option(VNM_PLOT_ENABLE_TEXT "Enable MSDF text rendering (requires FreeType + msdfgen)" ON)
 option(VNM_PLOT_BUILD_TESTS "Build test suite" OFF)
 option(VNM_PLOT_USE_SYSTEM_LIBS "Prefer find_package dependencies over FetchContent when available" OFF)
-set(VNM_PLOT_VNM_MSDF_TEXT_VERSION 0.2.0)
 
 include(FetchContent)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/EmbedAssets.cmake)
@@ -169,7 +168,7 @@ if(_vnm_plot_missing_msdf_text_targets)
     _vnm_plot_has_any_msdf_text_target(_vnm_plot_has_partial_msdf_text_targets)
     if(VNM_PLOT_USE_SYSTEM_LIBS AND
        NOT _vnm_plot_has_partial_msdf_text_targets)
-        find_package(vnm_msdf_text ${VNM_PLOT_VNM_MSDF_TEXT_VERSION} CONFIG QUIET
+        find_package(vnm_msdf_text CONFIG QUIET
             COMPONENTS ${_vnm_plot_msdf_text_components})
         _vnm_plot_alias_existing_msdf_text_targets()
         _vnm_plot_missing_targets(
@@ -492,8 +491,8 @@ message(STATUS "vnm_plot: Building RHI library")
 #
 # Bake every shader in shaders/qsb/ into a multi-profile .qsb artifact and
 # embed it under :/vnm_plot/shaders/qsb/<name>.qsb. Profile set covers Vulkan
-# (SPIR-V), Metal 1.2 + 2.1, D3D11 (HLSL 5.0), and desktop GL 4.10 so RHI can
-# pick a working artifact on every supported backend.
+# (SPIR-V), Metal 1.2 + 2.1, D3D11 (HLSL 5.0), and desktop GL 3.30 + 4.10 so
+# RHI can pick a working artifact on every supported backend.
 # -----------------------------------------------------------------------------
 
 set(VNM_PLOT_QSB_SHADERS
@@ -517,10 +516,9 @@ if(VNM_PLOT_ENABLE_TEXT)
 endif()
 
 # Each input shader yields :/vnm_plot/shaders/qsb/<name>.<ext>.qsb.
-# GLSL profile is desktop 410 only; mobile GL ES is out of scope for
-# the RHI shaders. They use storage buffers that are unavailable below
-# ES 3.1, so emitting a 300 ES artifact would compile-fail at runtime
-# on a real ES 3.0 driver.
+# The RHI shaders use vertex attributes and std140 uniform blocks, so retain
+# desktop GLSL 330 for GL 3.3 contexts and GLSL 410 for existing GL 4 paths.
+# Mobile GL ES remains out of scope for this desktop renderer.
 foreach(_vnm_plot_qsb_shader IN LISTS VNM_PLOT_QSB_SHADERS)
     get_filename_component(_vnm_plot_qsb_output_dir
         "${CMAKE_CURRENT_BINARY_DIR}/.qsb/${_vnm_plot_qsb_shader}"
@@ -533,7 +531,7 @@ unset(_vnm_plot_qsb_shader)
 qt_add_shaders(vnm_plot_rhi "vnm_plot_qsb_shaders"
     PREFIX "/vnm_plot"
     BASE   "${CMAKE_CURRENT_SOURCE_DIR}"
-    GLSL   "410"
+    GLSL   "330,410"
     HLSL   "50"
     MSL    "12,21"
     OUTPUT_TARGETS VNM_PLOT_RHI_RESOURCE_TARGETS