-
Notifications
You must be signed in to change notification settings - Fork 123
Krzysztofpaliga/integration bench #168
base: main
Are you sure you want to change the base?
Conversation
…ion_bench Adds Graphana dashboard for integration tests
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM,
Is the CPU name reported? I don't think I've seen it.
#!/bin/bash | ||
#set -eo pipefail | ||
|
||
k=$1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it the circuit degree? might need a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree.
|
||
target_dir="$current_dir/zkevm-circuits" | ||
|
||
printf -v _date '%(%Y-%m-%d_%H:%M:%S)T' -1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this format data in UTC or local machine date?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it is set to UTC by
./weeklyBenchScripts/02_setup.sh:42:sudo timedatectl set-timezone UTC
which is called by
./integrationBenchScripts/cloud-tests-local-trigger.sh:23: ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP" "bash -s" -- <../weeklyBenchScripts/02_setup.sh
cd "$target_dir"; | ||
|
||
mkdir ../results | ||
logfile="$_date"--"${PROVER}"_bench-"$k".proverlog |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure about using :
in log filenames
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I did not find any issues with it.
prepare_env | ||
prepare_repo | ||
|
||
kill_ssh() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This probably needs an explanation to why kill_ssh is needed and if it could affect a maintenance/debugging session opened that can be killed by inadvertance.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree.
No, just the number of cores. CPU name was never requested. |
instance_commitments=$(ls -t *proverlog | xargs cat | sed 's/\x1B\[[0-9;]*[JKmsu]//g' | egrep -o "|.*instance.*" | egrep -o [0-9]+[\ ]+[0-9]+ | awk '{print $1}') | ||
instance_evaluations=$(ls -t *proverlog | xargs cat | sed 's/\x1B\[[0-9;]*[JKmsu]//g' | egrep -o "|.*instance.*" | egrep -o [0-9]+[\ ]+[0-9]+ | awk '{print $2}') | ||
advice_commitments=$(ls -t *proverlog | xargs cat | sed 's/\x1B\[[0-9;]*[JKmsu]//g' | egrep -o "|.*advice.*" | egrep -o [0-9]+[\ ]+[0-9]+ | awk '{print $1}') | ||
advice_evaluations=$(ls -t *proverlog | xargs cat | sed 's/\x1B\[[0-9;]*[JKmsu]//g' | egrep -o "|.*advice.*" | egrep -o [0-9]+[\ ]+[0-9]+ | awk '{print $2}') | ||
fixed_commitments=$(ls -t *proverlog | xargs cat | sed 's/\x1B\[[0-9;]*[JKmsu]//g' | egrep -o "|.*fixed.*" | egrep -o [0-9]+[\ ]+[0-9]+ | awk '{print $1}') | ||
fixed_evaluations=$(ls -t *proverlog | xargs cat | sed 's/\x1B\[[0-9;]*[JKmsu]//g' | egrep -o "|.*fixed.*" | egrep -o [0-9]+[\ ]+[0-9]+ | awk '{print $2}') | ||
lookups_commitments=$(ls -t *proverlog | xargs cat | sed 's/\x1B\[[0-9;]*[JKmsu]//g' | egrep -o "|.*lookups.*" | egrep -o [0-9]+[\ ]+[0-9]+ | awk '{print $1}') | ||
lookups_evaluations=$(ls -t *proverlog | xargs cat | sed 's/\x1B\[[0-9;]*[JKmsu]//g' | egrep -o "|.*lookups.*" | egrep -o [0-9]+[\ ]+[0-9]+ | awk '{print $2}') | ||
equality_commitments=$(ls -t *proverlog | xargs cat | sed 's/\x1B\[[0-9;]*[JKmsu]//g' | egrep -o "|.*equality.*" | egrep -o [0-9]+[\ ]+[0-9]+ | awk '{print $1}') | ||
equality_evaluations=$(ls -t *proverlog | xargs cat | sed 's/\x1B\[[0-9;]*[JKmsu]//g' | egrep -o "|.*equality.*" | egrep -o [0-9]+[\ ]+[0-9]+ | awk '{print $2}') | ||
vanishing_commitments=$(ls -t *proverlog | xargs cat | sed 's/\x1B\[[0-9;]*[JKmsu]//g' | egrep -o "|.*vanishing.*" | egrep -o [0-9]+[\ ]+[0-9]+ | awk '{print $1}') | ||
vanishing_evaluations=$(ls -t *proverlog | xargs cat | sed 's/\x1B\[[0-9;]*[JKmsu]//g' | egrep -o "|.*vanishing.*" | egrep -o [0-9]+[\ ]+[0-9]+ | awk '{print $2}') | ||
multiopen_commitments=$(ls -t *proverlog | xargs cat | sed 's/\x1B\[[0-9;]*[JKmsu]//g' | egrep -o "|.*multiopen.*" | egrep -o [0-9]+[\ ]+[0-9]+ | awk '{print $1}') | ||
multiopen_evaluations=$(ls -t *proverlog | xargs cat | sed 's/\x1B\[[0-9;]*[JKmsu]//g' | egrep -o "|.*multiopen.*" | egrep -o [0-9]+[\ ]+[0-9]+ | awk '{print $2}') | ||
polycomm_commitments=$(ls -t *proverlog | xargs cat | sed 's/\x1B\[[0-9;]*[JKmsu]//g' | egrep -o "|.*polycomm.*" | egrep -o [0-9]+[\ ]+[0-9]+ | awk '{print $1}') | ||
polycomm_evaluations=$(ls -t *proverlog | xargs cat | sed 's/\x1B\[[0-9;]*[JKmsu]//g' | egrep -o "|.*polycomm.*" | egrep -o [0-9]+[\ ]+[0-9]+ | awk '{print $2}') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can this moved to a function to reduce the amount of deplication? This was automatically generated, no idea if it works:
extract_data() {
local keyword=$1
local column=$2
ls -t *proverlog | xargs cat | \
sed 's/\x1B\[[0-9;]*[JKmsu]//g' | \
egrep -o "|.*$keyword.*" | \
egrep -o '[0-9]+[\ ]+[0-9]+' | \
awk -v col="$column" '{print $col}'
}
instance_commitments=$(extract_data "instance" 1)
instance_evaluations=$(extract_data "instance" 2)
advice_commitments=$(extract_data "advice" 1)
advice_evaluations=$(extract_data "advice" 2)
fixed_commitments=$(extract_data "fixed" 1)
fixed_evaluations=$(extract_data "fixed" 2)
lookups_commitments=$(extract_data "lookups" 1)
lookups_evaluations=$(extract_data "lookups" 2)
equality_commitments=$(extract_data "equality" 1)
equality_evaluations=$(extract_data "equality" 2)
vanishing_commitments=$(extract_data "vanishing" 1)
vanishing_evaluations=$(extract_data "vanishing" 2)
multiopen_commitments=$(extract_data "multiopen" 1)
multiopen_evaluations=$(extract_data "multiopen" 2)
polycomm_commitments=$(extract_data "polycomm" 1)
polycomm_evaluations=$(extract_data "polycomm" 2)
scp -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP":"$prover_results_dir"/*proverlog "$trigger_results_dir"/ | ||
|
||
# Enable bash Environment Variables for Prover | ||
ssh -i ~/.ssh/bench.pem -o StrictHostKeyChecking=no ubuntu@"$PROVER_IP" "bash -s" <<EOF |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Used a couple of times it seems, can be moved to a function?
Description
Adds support for new Graphana dashboard containing new integration tests output.
Type of change