From 0163557cb47d1cbe9018ab39b5f8f8ace65b9af7 Mon Sep 17 00:00:00 2001
From: Joshua Bakita <jbakita@cs.unc.edu>
Date: Thu, 11 Mar 2021 16:59:03 -0500
Subject: Benchmarks: Allow test CPU specification in top-level runner scripts

This allows artifact evaluators to test on CPUs other than CPU 15
---
 run_all_dis.sh    | 19 +++++++++++--------
 run_all_sd-vbs.sh | 19 +++++++++++--------
 run_all_tacle.sh  | 19 +++++++++++--------
 3 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/run_all_dis.sh b/run_all_dis.sh
index 3907789..4022c88 100755
--- a/run_all_dis.sh
+++ b/run_all_dis.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
@@ -26,18 +29,18 @@ make baseline -j30 > /dev/null # Suppress noisy output
 echo "Done. Running experiments..."
 # Full L3, full L2 - xi is the baseline for the pairs
 baseXI=dis/$(date +"%b%d-%H")-c-xi-$runID.txt
-echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b dis2MbInNames.txt -B -I xi $runID
+echo "" | ../run_bench.sh -m base -p $coreCPU -l $maxJobs -b dis2MbInNames.txt -B -I xi $runID
 # Half L3, full L2 - i3 sees effect of half L3
 baseI3=dis/$(date +"%b%d-%H")-c-i3-$runID.txt
-echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b dis2MbInNames.txt -B -I i3 $runID
+echo "" | ../run_bench.sh -m base -p $coreCPU -l $maxJobs -b dis2MbInNames.txt -B -I i3 $runID
 # Half L3, half L2 - additional effect of half L2
 baseI=dis/$(date +"%b%d-%H")-c-i-$runID.txt
-echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b dis2MbInNames.txt -B -I i $runID
+echo "" | ../run_bench.sh -m base -p $coreCPU -l $maxJobs -b dis2MbInNames.txt -B -I i $runID
 date
 
 # Run the Level-C pairs
 pairC=dis/$(date +"%b%d-%H")-c-xi-async-$runID.txt
-echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b dis2MbInNames.txt -B -I xi -A $runID
+echo "" | ../run_bench.sh -m pair -p $coreCPU -P $threadCPU -l $maxJobs -b dis2MbInNames.txt -B -I xi -A $runID
 date
 
 # Run the Level-A/-B pairs
@@ -46,13 +49,13 @@ make pairs -j30 > /dev/null # Suppress noisy output
 echo "Done. Continuing experiments..."
 # No cache isolation
 pairXI=dis/$(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 disPairs2MbInNames.txt -B -I xi $runID
+echo "" | ../run_bench.sh -m pair -p $coreCPU -P $threadCPU -l $maxJobs -b disPairs2MbInNames.txt -B -I xi $runID
 # Shared L2, split L3
 pairI3=dis/$(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 disPairs2MbInNames.txt -B -I i3 $runID
+echo "" | ../run_bench.sh -m pair -p $coreCPU -P $threadCPU -l $maxJobs -b disPairs2MbInNames.txt -B -I i3 $runID
 # Split L2, split L3
 pairI=dis/$(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 disPairs2MbInNames.txt -B -I i $runID
+echo "" | ../run_bench.sh -m pair -p $coreCPU -P $threadCPU -l $maxJobs -b disPairs2MbInNames.txt -B -I i $runID
 date
 
 echo "==== DONE ===="
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 ===="
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 ===="
-- 
cgit v1.2.2