Skip to content

Always include "bench" label in benchmark workflow runners and use machine-specific cache keys #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
richkcho merged 4 commits into from
Nov 28, 2025
Merged

Always include "bench" label in benchmark workflow runners and use machine-specific cache keys #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8930ef
Initial plan
Copilot Nov 28, 2025
6c13646
Add "bench" label as default runner label for benchmark workflows
Copilot Nov 28, 2025
e664c3b
Fix actionlint issues: correct inputs.runner_label to inputs.runner_l…
Copilot Nov 28, 2025
bea001c
Always include bench label and use runner.name for cache keys
Copilot Nov 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .github/workflows/bench-mpmc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ on:
required: true
type: number
runner_labels:
description: 'Comma-separated labels for the self-hosted benchmark runner (e.g. "bench,linux")'
required: true
description: 'Comma-separated additional labels for the self-hosted benchmark runner (e.g. "linux")'
required: false
default: ''
type: string

permissions:
Expand All @@ -33,7 +34,7 @@ jobs:
labels="${{ inputs.runner_labels }}"
labels="${labels// /}" # strip spaces
labels="${labels//,/\",\"}" # turn comma list into quoted csv
echo "runner_labels_list=[\"self-hosted\"${labels:+,\"$labels\"}]" >> "$GITHUB_OUTPUT"
echo "runner_labels_list=[\"self-hosted\",\"bench\"${labels:+,\"$labels\"}]" >> "$GITHUB_OUTPUT"

benchmark:
name: Bench PR #${{ inputs.pr_number }}
Expand Down Expand Up @@ -96,7 +97,7 @@ jobs:
- name: Cache Rust build artifacts
uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
with:
shared-key: bench-${{ inputs.runner_label }}
shared-key: bench-${{ runner.name }}
workspaces: |
.
main-baseline
Expand All @@ -107,7 +108,7 @@ jobs:
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
path: ${{ env.CARGO_TARGET_DIR }}/criterion
key: criterion-main-${{ inputs.runner_label }}-${{ steps.main_sha.outputs.sha }}
key: criterion-main-${{ runner.name }}-${{ steps.main_sha.outputs.sha }}

- name: Run baseline on main (only if missing)
if: steps.baseline-cache.outputs.cache-hit != 'true'
Expand All @@ -119,7 +120,7 @@ jobs:
uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
path: ${{ env.CARGO_TARGET_DIR }}/criterion
key: criterion-main-${{ inputs.runner_label }}-${{ steps.main_sha.outputs.sha }}
key: criterion-main-${{ runner.name }}-${{ steps.main_sha.outputs.sha }}

- name: Run benchmarks for PR against main baseline
id: bench-pr
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/bench-spsc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ on:
required: true
type: number
runner_labels:
description: 'Comma-separated labels for the self-hosted benchmark runner (e.g. "bench,linux")'
required: true
description: 'Comma-separated additional labels for the self-hosted benchmark runner (e.g. "linux")'
required: false
default: ''
type: string

permissions:
Expand All @@ -33,7 +34,7 @@ jobs:
labels="${{ inputs.runner_labels }}"
labels="${labels// /}" # strip spaces
labels="${labels//,/\",\"}" # turn comma list into quoted csv
echo "runner_labels_list=[\"self-hosted\"${labels:+,\"$labels\"}]" >> "$GITHUB_OUTPUT"
echo "runner_labels_list=[\"self-hosted\",\"bench\"${labels:+,\"$labels\"}]" >> "$GITHUB_OUTPUT"

benchmark:
name: Bench PR #${{ inputs.pr_number }}
Expand Down Expand Up @@ -96,7 +97,7 @@ jobs:
- name: Cache Rust build artifacts
uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
with:
shared-key: bench-${{ inputs.runner_label }}
shared-key: bench-${{ runner.name }}
workspaces: |
.
main-baseline
Expand All @@ -107,7 +108,7 @@ jobs:
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
path: ${{ env.CARGO_TARGET_DIR }}/criterion
key: criterion-main-${{ inputs.runner_label }}-${{ steps.main_sha.outputs.sha }}
key: criterion-main-${{ runner.name }}-${{ steps.main_sha.outputs.sha }}

- name: Run baseline on main (only if missing)
if: steps.baseline-cache.outputs.cache-hit != 'true'
Expand All @@ -119,7 +120,7 @@ jobs:
uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
path: ${{ env.CARGO_TARGET_DIR }}/criterion
key: criterion-main-${{ inputs.runner_label }}-${{ steps.main_sha.outputs.sha }}
key: criterion-main-${{ runner.name }}-${{ steps.main_sha.outputs.sha }}

- name: Run benchmarks for PR against main baseline
id: bench-pr
Expand Down
Loading