Skip to content

Fix argument handling in benchmark.sh #40

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

Open
Dyslex7c wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix argument handling in benchmark.sh #40

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
67 changes: 61 additions & 6 deletions bench/benchmark.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ usage() {
echo "Common Custom Options:"
echo " --fri-options \"(B,F,R),(B,F,R),...\" One or more FRI option tuples (blowup, folding, remainder)."
echo " Example: --fri-options \"(2,2,0),(4,2,3)\""
echo " --blowup-factor B Blowup factor (shorthand, combined with folding/remainder)."
echo " --folding-factor F Folding factor (shorthand, combined with blowup/remainder)."
echo " --max-remainder-degree R Max remainder degree (shorthand, combined with blowup/folding)."
echo " --data-size N,N,... Comma-separated list of data sizes in bytes."
echo " --batch-size N,N,... Comma-separated list of batch sizes."
echo " --field [f64|f128|both] Field type to run benchmarks on (default: both)."
Expand All @@ -46,6 +49,7 @@ usage() {
echo ""
echo "Examples:"
echo " $0 frida full"
echo " $0 frida custom --blowup-factor 8 --folding-factor 4 --max-remainder-degree 31 --data-size 65536"
echo " $0 frida custom --fri-options \"(8,4,31),(4,2,15)\" --data-size 65536,131072 --field f128"
echo " $0 single-frida custom --fri-options \"(4,2,15)\" --batch-size 8,16"
echo " $0 defrida custom --fri-options \"(8,4,31)\" --num-validators 16,32 --num-queries 64"
Expand Down Expand Up @@ -103,6 +107,54 @@ fi
# Remaining arguments are options
ARGS=("$@")

# Translate --blowup-factor, --folding-factor, --max-remainder-degree into --fri-options "(B,F,R)".
# If any of the three shorthand flags are present, they are removed from ARGS and replaced
# with a single --fri-options "(B,F,R)" entry (using defaults 2,2,0 for any omitted value).
translate_fri_args() {
local blowup=""
local folding=""
local remainder=""
local out=()
local i=0

while [[ $i -lt ${#ARGS[@]} ]]; do
case "${ARGS[$i]}" in
--blowup-factor)
i=$((i+1)); blowup="${ARGS[$i]}"
;;
--folding-factor)
i=$((i+1)); folding="${ARGS[$i]}"
;;
--max-remainder-degree)
i=$((i+1)); remainder="${ARGS[$i]}"
;;
*)
out+=("${ARGS[$i]}")
;;
esac
i=$((i+1))
done

# If any shorthand flag was provided, build the --fri-options tuple
if [[ -n "$blowup" || -n "$folding" || -n "$remainder" ]]; then
blowup="${blowup:-2}"
folding="${folding:-2}"
remainder="${remainder:-0}"
out+=("--fri-options" "(${blowup},${folding},${remainder})")
fi

ARGS=("${out[@]}")
}

# Map full/custom to the correct binary flag or subcommand
get_bench_cmd() {
if [ "$COMMAND" = "full" ]; then
echo "--full"
else
echo "custom"
fi
}

# Handle commands
case $BENCHMARK_TYPE in
"help")
Expand All @@ -111,16 +163,17 @@ case $BENCHMARK_TYPE in
;;
"frida")
build_benchmark
translate_fri_args
case $COMMAND in
"full")
echo -e "${BLUE}Running full Frida benchmark suite...${NC}"
echo "This benchmarks traditional FRI proof generation and verification across multiple configurations."
echo "Estimated time: 15-45 minutes depending on your hardware."
./target/release/frida-bench frida $COMMAND "${ARGS[@]}"
./target/release/frida-bench frida $(get_bench_cmd) "${ARGS[@]}"
;;
"custom")
echo -e "${BLUE}Running custom Frida benchmark...${NC}"
./target/release/frida-bench frida $COMMAND "${ARGS[@]}"
./target/release/frida-bench frida $(get_bench_cmd) "${ARGS[@]}"
;;
*)
echo -e "${RED}Error: Missing or invalid command for frida benchmark${NC}"
Expand All @@ -131,16 +184,17 @@ case $BENCHMARK_TYPE in
;;
"single-frida")
build_benchmark
translate_fri_args
case $COMMAND in
"full")
echo -e "${BLUE}Running full Single Frida benchmark suite...${NC}"
echo "This benchmarks single proof generation time and size with total size estimates."
echo "Estimated time: 10-30 minutes depending on your hardware."
./target/release/frida-bench single-frida $COMMAND "${ARGS[@]}"
./target/release/frida-bench single-frida $(get_bench_cmd) "${ARGS[@]}"
;;
"custom")
echo -e "${BLUE}Running custom Single Frida benchmark...${NC}"
./target/release/frida-bench single-frida $COMMAND "${ARGS[@]}"
./target/release/frida-bench single-frida $(get_bench_cmd) "${ARGS[@]}"
;;
*)
echo -e "${RED}Error: Missing or invalid command for single-frida benchmark${NC}"
Expand All @@ -151,16 +205,17 @@ case $BENCHMARK_TYPE in
;;
"defrida")
build_benchmark
translate_fri_args
case $COMMAND in
"full")
echo -e "${BLUE}Running full deFRIDA benchmark suite...${NC}"
echo "This benchmarks the distributed deFRIDA workflow with validator assignments."
echo "Estimated time: 20-60 minutes depending on your hardware."
./target/release/frida-bench defrida $COMMAND "${ARGS[@]}"
./target/release/frida-bench defrida $(get_bench_cmd) "${ARGS[@]}"
;;
"custom")
echo -e "${BLUE}Running custom deFRIDA benchmark...${NC}"
./target/release/frida-bench defrida $COMMAND "${ARGS[@]}"
./target/release/frida-bench defrida $(get_bench_cmd) "${ARGS[@]}"
;;
*)
echo -e "${RED}Error: Missing or invalid command for defrida benchmark${NC}"
Expand Down