Update .github/workflows/benchmark_cpp_microbenchmarks.yml

Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com>

Author: 2 people

.github/workflows/analysis_workflow.yml

@@ -77,32 +77,10 @@ jobs:
       storage: ${{  github.ref_name == 'master' && 'ALL' || inputs.storage || 'LMDB'}}
       suite_overwrite: ${{ inputs.suite_overwrite || ''}}
 
-  benchmark_cpp_microbenchmarks:
-    needs: [get_commits_to_benchmark]
-    strategy:
-      fail-fast: false
-      matrix:
-        commits: ${{ fromJson(needs.get_commits_to_benchmark.outputs.matrix) }}
-    name: C++ Microbenchmarks ${{ matrix.commits }}
-    continue-on-error: true
-    uses: ./.github/workflows/benchmark_cpp_microbenchmarks.yml
-    secrets: inherit
-    with:
-      commit: ${{ matrix.commits }}
-      benchmark_all_tags: ${{ inputs.benchmark_all_tags || false }}
-      dev_image_tag: ${{ inputs.dev_image_tag || 'latest' }}
-
   publish_benchmark_results_to_gh_pages:
     name: Publish benchmark results to gh-pages
-    # Run on schedule when Python benchmarks succeeded.
-    # always() bypasses the default "skip if any need failed" behaviour so that a
-    # C++ microbenchmark regression does not prevent publishing Python results.
-    if: |
-      always() &&
-      github.event_name == 'schedule' &&
-      !cancelled() &&
-      needs.benchmark_commits.result == 'success'
-    needs: [benchmark_commits, benchmark_cpp_microbenchmarks]
+    if: github.event_name == 'schedule' && needs.benchmark_commits.result == 'success'
+    needs: [benchmark_commits]
     runs-on: ubuntu-22.04
     container:
       image: ubuntu:22.04 # Native runner doesn't allow setting up the ca softlinks required below

.github/workflows/benchmark_commits.yml

@@ -71,6 +71,23 @@ jobs:
         env:
           CMAKE_BUILD_PARALLEL_LEVEL: ${{vars.CMAKE_BUILD_PARALLEL_LEVEL}}
 
+      - name: Build and run C++ benchmarks
+        shell: bash -l {0}
+        run: |
+          cmake --preset linux-release -DTEST=ON cpp
+          cmake --build cpp/out/linux-release-build --target benchmarks
+          BINARY=$(pwd)/cpp/out/linux-release-build/arcticdb/benchmarks
+          RESULTS=$(pwd)/cpp/out/linux-release-build/arcticdb/benchmarks_results.json
+          "$BINARY" \
+            --benchmark_out="$RESULTS" \
+            --benchmark_out_format=json \
+            --benchmark_min_time=20x \
+            --benchmark_time_unit=ms
+          echo "ARCTICDB_CPP_BENCHMARKS_BINARY=$BINARY" >> $GITHUB_ENV
+          echo "ARCTICDB_CPP_BENCHMARKS_RESULTS=$RESULTS" >> $GITHUB_ENV
+        env:
+          CMAKE_BUILD_PARALLEL_LEVEL: ${{vars.CMAKE_BUILD_PARALLEL_LEVEL}}
+
       - name: Create test bucket
         shell: bash -el {0}
         run: |
@@ -108,14 +125,14 @@ jobs:
 
       - name: Configure what suite or tests to execute
         shell: bash -el {0}
-        run: | 
+        run: |
             if [ "${{ inputs.storage }}" == "REAL" ]; then
               echo "ARCTICDB_STORAGE_AWS_S3=1" >> $GITHUB_ENV
               echo "ARCTICDB_STORAGE_LMDB=0" >> $GITHUB_ENV
             elif [ "${{ inputs.storage }}" == "ALL" ]; then
               echo "ARCTICDB_STORAGE_AWS_S3=1" >> $GITHUB_ENV
             fi
-            
+
             SUITE_OVERWRITE=${{ github.event.inputs.suite_overwrite }}
             echo "selection of SUITE_OVERWRITE=$SUITE_OVERWRITE"
             # Remove leading and trailing whitespaces using parameter expansion
@@ -133,7 +150,7 @@ jobs:
       - name: Benchmark given commit
         if: github.event_name != 'pull_request' || inputs.benchmark_all_tags == true
         shell: bash -l {0}
-        run: | 
+        run: |
           echo "Using S3 bucket: ${ARCTICDB_REAL_S3_BUCKET}"
           git config --global --add safe.directory .
           python -m asv run --show-stderr --durations all --bench $SUITE ${{ inputs.commit }}^!