More benchmark setup

diff --git a/microbench/run-common.sh b/microbench/run-common.sh
index e1aa8c0..b95f02a 100644 (file)
--- a/microbench/run-common.sh
+++ b/microbench/run-common.sh
@@ -4,7 +4,7 @@
 
 SCRIPT_PATH=/scratch/bluesky.git/microbench/setup
 
-PARAMS="BLUESKY_RUN_NAME BLUESKY_CACHE_SIZE BLUESKY_TARGET BENCH_DURATION BENCH_FILESIZE BENCH_FILECOUNT BENCH_WRITERATIO BENCH_THREADS BENCH_OPS BENCH_INTERVALS BENCH_DIRSIZE BENCH_BLOCKSIZE NFS_BLOCKSIZE SPEC_CONF BLUESKY_OPT_FULL_SEGMENTS"
+PARAMS="BLUESKY_RUN_NAME BLUESKY_CACHE_SIZE BLUESKY_TARGET BENCH_DURATION BENCH_FILESIZE BENCH_FILECOUNT BENCH_WRITERATIO BENCH_THREADS BENCH_OPS BENCH_INTERVALS BENCH_DIRSIZE BENCH_BLOCKSIZE NFS_BLOCKSIZE SPEC_CONF BLUESKY_OPT_FULL_SEGMENTS SYNREAD_OUTSTANDING SYNREAD_PROCS SYNREAD_SIZE SYNREAD_DURATION"
 
 BLUESKY_RUN_NAME=$(date +%Y%m%d)-$$
 BENCHER=vrable1.sysnet.ucsd.edu

diff --git a/microbench/run-synread.sh b/microbench/run-synread.sh
index 3d3d6b6..f7fa67c 100755 (executable)
--- a/microbench/run-synread.sh
+++ b/microbench/run-synread.sh
@@ -6,15 +6,24 @@ BASEDIR=$(dirname $(which $0))
 BLUESKY_TARGET=s3:mvrable-readbench-west
 BLUESKY_EXTRA_OPTS="BLUESKY_OPT_NO_CRYPTO=1"
 
+sizes="1048576 131072 32768"
+
 run_synbench() {
-    BLUESKY_RUN_NAME=$(date +%Y%m%d)-$1
+    basename=$(date +%Y%m%d)-$1
+    BLUESKY_RUN_NAME=$basename
 
     run_cmd $PROXY cleanup-proxy
     run_cmd $PROXY run-proxy >$BLUESKY_RUN_NAME.proxy 2>&1 &
     proxy_pid=$!
     sleep 10
 
-    run_cmd $BENCHER run-specsfs
+    SYNREAD_SIZE=1048576
+    run_cmd $BENCHER warmup-synread
+    for s in sizes; do
+        SYNREAD_SIZE=$s
+        BLUESKY_RUN_NAME=$basename-$s
+        run_cmd $BENCHER run-synread
+    done
 
     run_cmd $PROXY stop-proxy
     echo "Waiting for proxy to stop..."
@@ -24,7 +33,7 @@ run_synbench() {
 for BLUESKY_CACHE_SIZE in $((256 * 1024)) $((8192 * 1024 * 1024)); do
 done
 
-run_spec s3-west-noagg sfs_bluesky
+run_synbench s3-west-noagg sfs_bluesky
 
 BLUESKY_EXTRA_OPTS="BLUESKY_OPT_NO_CRYPTO=1"
 run_spec s3-west-nocrypt sfs_bluesky

diff --git a/microbench/setup/warmup-synread b/microbench/setup/warmup-synread
new file mode 100755 (executable)
index 0000000..5a346ae
--- /dev/null
+++ b/microbench/setup/warmup-synread
@@ -0,0 +1,19 @@
+#!/bin/bash
+#
+# Launch the synthetic read benchmark.
+
+SYNREAD_OUTSTANDING=32
+SYNREAD_PROCS=4
+SYNREAD_SIZE=$((1 << 20))
+SYNREAD_DURATION=30
+
+# Export any environment variables specified on the command line
+for e in "$@"; do
+    echo "$e" 1>&2
+    if echo "$e" | grep = >/dev/null; then
+        eval "$e"
+        export ${e%=*}
+    fi
+done
+
+/scratch/bluesky.git/nfs3/synreadbench /scratch/inodes.txt $SYNREAD_OUTSTANDING $SYNREAD_SIZE WARMUP