Benchmarks: Allow test CPU specification in top-level runner scripts

This allows artifact evaluators to test on CPUs other than CPU 15

1 files changed, 11 insertions, 8 deletions

diff --git a/run_all_sd-vbs.sh b/run_all_sd-vbs.sh
index 6be9c87..9ba6062 100755
--- a/run_all_sd-vbs.sh
+++ b/run_all_sd-vbs.sh
@@ -5,9 +5,12 @@
 
 maxJobs=$1
 runID=$2
+coreCPU=${3:-15}
+threadCPU=${4:-31}
 
 if [ $# -lt 2 ]; then
-    echo "Usage $0 <number of iterations> <run ID>"
+    echo "Usage $0 <number of iterations> <run ID> <core CPU ID> <thread CPU ID>"
+    echo "CPU IDs are optional, otherwise assumed to be 15 and 31 respectively."
     exit
 fi
 if [[ "$EUID" != 0 ]]; then
@@ -27,18 +30,18 @@ cd ..
 echo "Done. Running experiments..."
 # Full L3, full L2 - xi is the baseline for the pairs
 baseXI=SD-VBS/$(date +"%b%d-%H")-c-xi-$runID.txt
-echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b sd-vbsNames.txt -B -I xi $runID
+echo "" | ../run_bench.sh -m base -p coreCPU -l $maxJobs -b sd-vbsNames.txt -B -I xi $runID
 # Half L3, full L2 - i3 sees effect of half L3
 baseI3=SD-VBS/$(date +"%b%d-%H")-c-i3-$runID.txt
-echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b sd-vbsNames.txt -B -I i3 $runID
+echo "" | ../run_bench.sh -m base -p coreCPU -l $maxJobs -b sd-vbsNames.txt -B -I i3 $runID
 # Half L3, half L2 - additional effect of half L2
 baseI=SD-VBS/$(date +"%b%d-%H")-c-i-$runID.txt
-echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b sd-vbsNames.txt -B -I i $runID
+echo "" | ../run_bench.sh -m base -p coreCPU -l $maxJobs -b sd-vbsNames.txt -B -I i $runID
 date
 
 # Run the Level-C pairs
 pairC=SD-VBS/$(date +"%b%d-%H")-c-xi-async-$runID.txt
-echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b sd-vbsNames.txt -B -I xi -A $runID
+echo "" | ../run_bench.sh -m pair -p coreCPU -P $threadCPU -l $maxJobs -b sd-vbsNames.txt -B -I xi -A $runID
 date
 
 # Run the Level-A/-B pairs
@@ -49,13 +52,13 @@ cd ..
 echo "Done. Continuing experiments..."
 # No cache isolation
 pairXI=SD-VBS/$(date +"%b%d-%H")-c-xi-$runID"-A.txt and -B.txt"
-echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b sd-vbsNames.txt -B -I xi $runID
+echo "" | ../run_bench.sh -m pair -p coreCPU -P $threadCPU -l $maxJobs -b sd-vbsNames.txt -B -I xi $runID
 # Shared L2, split L3
 pairI3=SD-VBS/$(date +"%b%d-%H")-c-i3-$runID"-A.txt and -B.txt"
-echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b sd-vbsNames.txt -B -I i3 $runID
+echo "" | ../run_bench.sh -m pair -p coreCPU -P $threadCPU -l $maxJobs -b sd-vbsNames.txt -B -I i3 $runID
 # Split L2, split L3
 pairI=SD-VBS/$(date +"%b%d-%H")-c-i-$runID"-A.txt and -B.txt"
-echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b sd-vbsNames.txt -B -I i $runID
+echo "" | ../run_bench.sh -m pair -p coreCPU -P $threadCPU -l $maxJobs -b sd-vbsNames.txt -B -I i $runID
 date
 
 echo "==== DONE ===="