Skip to content
This repository has been archived by the owner on Jul 5, 2024. It is now read-only.

[benchmark only] Supercircuit #1800

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 12 additions & 0 deletions .github/proverCiScripts/deployToProver.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash
#set -e
#set -x

prnumber=$1
base_dir="/home/ubuntu/CI_Prover_Benches/"
target_dir="$base_dir"PR"$1"

source_dir=$2

cd $source_dir && scp -r * prover:$target_dir

56 changes: 56 additions & 0 deletions .github/proverCiScripts/execBench.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
#!/bin/bash
set -e
#set -x

prnumber=$1
base_dir="/home/ubuntu/CI_Prover_Benches/"
target_dir="$base_dir"PR"$1"
k=$2
circuit=$(echo $3 | awk '{ print $2 }' | tr '[:upper:]' '[:lower:]')
printf -v _date '%(%Y-%m-%d_%H:%M:%S)T' -1

case $circuit in
"all")
echo "To be implemented"
exit 1
;;
"evm")
run_suffix="evm_circuit_prover"
;;
"keccak")
run_suffix="keccak_round"
;;
"state")
run_suffix="state_circuit_prover"
;;
"tx")
run_suffix="tx_circuit_prover"
;;
"super")
run_suffix="super_circuit_prover"
;;
"bytecode")
run_suffix="bytecode_circuit_prover"
;;
"pi")
run_suffix="pi_circuit_prover"
;;
"exp")
run_suffix="exp_circuit_prover"
;;
"copy")
run_suffix="copy_circuit_prover"
;;
*)
echo "No proper value"
exit 1
;;
esac

cd $target_dir;
logfile=$_date--${circuit}_bench-$k.proverlog

export RUST_BACKTRACE=1
DEGREE=$k ~/.cargo/bin/cargo test --profile bench bench_${run_suffix} -p circuit-benchmarks --features benches -- --nocapture > "$target_dir/$logfile" 2>&1

exit 0
10 changes: 10 additions & 0 deletions .github/proverCiScripts/getSysstat.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash
set -e
#set -x

prnumber=$1
base_dir="/home/ubuntu/CI_Prover_Benches/"
target_dir="$base_dir"PR"$prnumber"

logfile=$(ls $target_dir | grep proverlog | xargs -n 1 basename)
tail -12 $target_dir/$logfile
14 changes: 14 additions & 0 deletions .github/proverCiScripts/prepareProver.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/bash
#set -e
#set -x

prnumber=$1
base_dir="/home/ubuntu/CI_Prover_Benches/"
target_dir="$base_dir"PR"$1"
source_dir=$2

mkdir -p $target_dir

# Install a recent go toolchain
wget https://go.dev/dl/go1.22.2.linux-amd64.tar.gz
sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.22.2.linux-amd64.tar.gz
14 changes: 14 additions & 0 deletions .github/proverCiScripts/rsSysstat.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/bash
set -e
#set -x

sudo systemctl stop sysstat.service
sudo rm -rf /var/log/sysstat/*
sudo rm -f sar.stats
sudo rm -rf cpu.stats
sudo rm -rf mem.stats

sleep 10

sudo systemctl start sysstat.service

4 changes: 2 additions & 2 deletions .github/workflows/geth-utils.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Geth-utils Checks

on:
merge_group:
pull_request:
types: [synchronize, opened, reopened, ready_for_review]
# pull_request:
# types: [synchronize, opened, reopened, ready_for_review]
push:
branches:
- main
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/gh-actions-prover-benches.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: GH Actions Prover Benches on PR
on:
pull_request:
types: [ labeled , ready_for_review]
types: [ labeled ]
jobs:
Prover_benchmarking_Automation:
if: contains(github.event.label.name, 'benchmarks')
Expand All @@ -21,13 +21,13 @@ jobs:
- run: .github/proverCiScripts/deployToProver.sh "${{ env.PR_NUMBER }}" "${{ github.workspace }}"
shell: bash
- run: |
ssh prover "bash -s" -- < .github/proverCiScripts/execBench.sh "${{ env.PR_NUMBER }}" 19 '"${{ github.event.label.name }}"'
ssh prover "bash -s" -- < .github/proverCiScripts/execBench.sh "${{ env.PR_NUMBER }}" 22 '"${{ github.event.label.name }}"'
shell: bash
- run: |
ssh prover "bash -s" -- < .github/proverCiScripts/getSysstat.sh "${{ env.PR_NUMBER }}"
- name: Calculate Benchmark Result
if: success() || failure()
run: .github/proverCiScripts/processResults.sh "${{ env.PR_NUMBER }}" '"${{ github.event.label.name }}"' "19"
run: .github/proverCiScripts/processResults.sh "${{ env.PR_NUMBER }}" '"${{ github.event.label.name }}"' "22"
shell: bash
- name: PowerOff prover
if: always()
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ on:
merge_group:
schedule:
- cron: '50 1 * * SUN'
pull_request:
types: [synchronize, labeled]
# pull_request:
# types: [synchronize, labeled]
push:
branches:
- main
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lints.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Lints

# We only run these lints on trial-merges of PRs to reduce noise.
on:
merge_group:
pull_request:
types: [synchronize, opened, reopened, ready_for_review]
# merge_group:
# pull_request:
# types: [synchronize, opened, reopened, ready_for_review]
push:
branches:
- main
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Main tests

on:
merge_group:
pull_request:
types: [synchronize, opened, reopened, ready_for_review]
# pull_request:
# types: [synchronize, opened, reopened, ready_for_review]
push:
branches:
- main
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Feature flags

on:
merge_group:
pull_request:
types: [synchronize, opened, reopened, ready_for_review]
# pull_request:
# types: [synchronize, opened, reopened, ready_for_review]
push:
branches:
- main
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: WASM

on:
merge_group:
pull_request:
types: [synchronize, opened, reopened, ready_for_review]
# pull_request:
# types: [synchronize, opened, reopened, ready_for_review]
push:
branches:
- main
Expand Down Expand Up @@ -62,4 +62,4 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: build
args: --verbose --release --package zkevm-circuits --no-default-features --target wasm32-unknown-unknown -Z build-std=panic_abort,std
args: --verbose --release --package zkevm-circuits --no-default-features --target wasm32-unknown-unknown -Z build-std=panic_abort,std
Loading