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_tacle.sh b/run_all_tacle.sh
index 4729ada..4e005b6 100755
--- a/run_all_tacle.sh
+++ b/run_all_tacle.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 $coreCPU and $threadCPU respectively."
     exit
 fi
 if [[ "$EUID" != 0 ]]; then
@@ -24,13 +27,13 @@ cd baseline
 make all -j32
 # Full L3, full L2 - xi is the baseline for the pairs
 baseXI=baseline/$(date +"%b%d-%H")-c-xi-$runID.txt
-echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b tacleNames.txt -B -I xi $runID
+echo "" | ../run_bench.sh -m base -p $coreCPU -l $maxJobs -b tacleNames.txt -B -I xi $runID
 # Half L3, full L2 - i3 sees effect of half L3
 baseI3=baseline/$(date +"%b%d-%H")-c-i3-$runID.txt
-echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b tacleNames.txt -B -I i3 $runID
+echo "" | ../run_bench.sh -m base -p $coreCPU -l $maxJobs -b tacleNames.txt -B -I i3 $runID
 # Half L3, half L2 - additional effect of half L2
 baseI=baseline/$(date +"%b%d-%H")-c-i-$runID.txt
-echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b tacleNames.txt -B -I i $runID
+echo "" | ../run_bench.sh -m base -p $coreCPU -l $maxJobs -b tacleNames.txt -B -I i $runID
 date
 
 # Run the Level-A/-B pairs
@@ -38,19 +41,19 @@ cd ../all_pairs
 make all -j32
 # No cache isolation
 pairXI=all_pairs/$(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 tacleNames.txt -B -I xi $runID
+echo "" | ../run_bench.sh -m pair -p $coreCPU -P $threadCPU -l $maxJobs -b tacleNames.txt -B -I xi $runID
 # Shared L2, split L3
 pairI3=all_pairs/$(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 tacleNames.txt -B -I i3 $runID
+echo "" | ../run_bench.sh -m pair -p $coreCPU -P $threadCPU -l $maxJobs -b tacleNames.txt -B -I i3 $runID
 # Split L2, split L3
 pairI=all_pairs/$(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 tacleNames.txt -B -I i $runID
+echo "" | ../run_bench.sh -m pair -p $coreCPU -P $threadCPU -l $maxJobs -b tacleNames.txt -B -I i $runID
 date
 
 # Run the Level-C pairs
 cd ../baseline
 pairC=baseline/$(date +"%b%d-%H")-c-xi-async-$runID.txt
-echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b tacleNames.txt -B -I xi -A $runID
+echo "" | ../run_bench.sh -m pair -p $coreCPU -P $threadCPU -l $maxJobs -b tacleNames.txt -B -I xi -A $runID
 date
 
 echo "==== DONE ===="