Skip to content

fix(ci): avoid redundant heavy queue benches #24468

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

Closed
AztecBot wants to merge 1 commit into from
Closed

fix(ci): avoid redundant heavy queue benches #24468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 10 additions & 2 deletions bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,14 @@ function bench {

}

function bench_if_enabled {
if [ "${BENCH_UPLOAD:-1}" == 0 ]; then
echo "Skipping benchmarks because BENCH_UPLOAD=0."
return
fi
bench
}

### RELEASING ##########################################################################################################
function versions {
local noir_version anvil_version node_version cmake_version clang_version zig_version rustc_version wasi_sdk_version
Expand Down Expand Up @@ -750,14 +758,14 @@ case "$cmd" in
export USE_TEST_CACHE=1
export CI_FULL=1
build_and_test full
bench
bench_if_enabled
;;
"ci-full-no-test-cache")
export CI=1
export USE_TEST_CACHE=0
export CI_FULL=1
build_and_test full
bench
bench_if_enabled
;;
"ci-chonk-input-update")
export CI=1
Expand Down
10 changes: 9 additions & 1 deletion ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,17 @@ function multi_job_run {
export AWS_SHUTDOWN_TIME_ARM=${AWS_SHUTDOWN_TIME_ARM:-90}
export DENOISE=1
export DENOISE_WIDTH=32
# Only the first full shard should run and upload the bench artifact. Heavy
# merge-queue modes already grind tests across many shards; repeating the
# post-test bench sweep on every shard is redundant and can overrun the queue.
local bench_primary=${1%% *}
export bench_primary
run() {
[ -n "${4:-}" ] && export REF_NAME=$4
PARENT_LOG_ID=$RUN_ID JOB_ID=$1 INSTANCE_POSTFIX=$1 ARCH=$2 exec denoise "bootstrap_ec2 './bootstrap.sh $3'"
local bench_upload=${BENCH_UPLOAD:-1}
[ "$1" != "$bench_primary" ] && bench_upload=0
PARENT_LOG_ID=$RUN_ID JOB_ID=$1 INSTANCE_POSTFIX=$1 ARCH=$2 BENCH_UPLOAD=$bench_upload \
exec denoise "bootstrap_ec2 './bootstrap.sh $3'"
}
export -f run

Expand Down
Loading