summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Bakita <jbakita@cs.unc.edu>2021-03-11 16:59:03 -0500
committerJoshua Bakita <jbakita@cs.unc.edu>2021-03-11 16:59:03 -0500
commit0163557cb47d1cbe9018ab39b5f8f8ace65b9af7 (patch)
treeae95832b537d1b5bdb248f8c3521b8b687eb6163
parent1d44f945a2fd163b35dc30f599fdcc5e016011bc (diff)
Benchmarks: Allow test CPU specification in top-level runner scripts
This allows artifact evaluators to test on CPUs other than CPU 15
Diffstat
-rwxr-xr-xrun_all_dis.sh19
-rwxr-xr-xrun_all_sd-vbs.sh19
-rwxr-xr-xrun_all_tacle.sh19
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 @@
5 5
6maxJobs=$1 6maxJobs=$1
7runID=$2 7runID=$2
8coreCPU=${3:-15}
9threadCPU=${4:-31}
8 10
9if [ $# -lt 2 ]; then 11if [ $# -lt 2 ]; then
10 echo "Usage $0 <number of iterations> <run ID>" 12 echo "Usage $0 <number of iterations> <run ID> <core CPU ID> <thread CPU ID>"
13 echo "CPU IDs are optional, otherwise assumed to be 15 and 31 respectively."
11 exit 14 exit
12fi 15fi
13if [[ "$EUID" != 0 ]]; then 16if [[ "$EUID" != 0 ]]; then
@@ -26,18 +29,18 @@ make baseline -j30 > /dev/null # Suppress noisy output
26echo "Done. Running experiments..." 29echo "Done. Running experiments..."
27# Full L3, full L2 - xi is the baseline for the pairs 30# Full L3, full L2 - xi is the baseline for the pairs
28baseXI=dis/$(date +"%b%d-%H")-c-xi-$runID.txt 31baseXI=dis/$(date +"%b%d-%H")-c-xi-$runID.txt
29echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b dis2MbInNames.txt -B -I xi $runID 32echo "" | ../run_bench.sh -m base -p $coreCPU -l $maxJobs -b dis2MbInNames.txt -B -I xi $runID
30# Half L3, full L2 - i3 sees effect of half L3 33# Half L3, full L2 - i3 sees effect of half L3
31baseI3=dis/$(date +"%b%d-%H")-c-i3-$runID.txt 34baseI3=dis/$(date +"%b%d-%H")-c-i3-$runID.txt
32echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b dis2MbInNames.txt -B -I i3 $runID 35echo "" | ../run_bench.sh -m base -p $coreCPU -l $maxJobs -b dis2MbInNames.txt -B -I i3 $runID
33# Half L3, half L2 - additional effect of half L2 36# Half L3, half L2 - additional effect of half L2
34baseI=dis/$(date +"%b%d-%H")-c-i-$runID.txt 37baseI=dis/$(date +"%b%d-%H")-c-i-$runID.txt
35echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b dis2MbInNames.txt -B -I i $runID 38echo "" | ../run_bench.sh -m base -p $coreCPU -l $maxJobs -b dis2MbInNames.txt -B -I i $runID
36date 39date
37 40
38# Run the Level-C pairs 41# Run the Level-C pairs
39pairC=dis/$(date +"%b%d-%H")-c-xi-async-$runID.txt 42pairC=dis/$(date +"%b%d-%H")-c-xi-async-$runID.txt
40echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b dis2MbInNames.txt -B -I xi -A $runID 43echo "" | ../run_bench.sh -m pair -p $coreCPU -P $threadCPU -l $maxJobs -b dis2MbInNames.txt -B -I xi -A $runID
41date 44date
42 45
43# Run the Level-A/-B pairs 46# Run the Level-A/-B pairs
@@ -46,13 +49,13 @@ make pairs -j30 > /dev/null # Suppress noisy output
46echo "Done. Continuing experiments..." 49echo "Done. Continuing experiments..."
47# No cache isolation 50# No cache isolation
48pairXI=dis/$(date +"%b%d-%H")-c-xi-$runID"-A.txt and -B.txt" 51pairXI=dis/$(date +"%b%d-%H")-c-xi-$runID"-A.txt and -B.txt"
49echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b disPairs2MbInNames.txt -B -I xi $runID 52echo "" | ../run_bench.sh -m pair -p $coreCPU -P $threadCPU -l $maxJobs -b disPairs2MbInNames.txt -B -I xi $runID
50# Shared L2, split L3 53# Shared L2, split L3
51pairI3=dis/$(date +"%b%d-%H")-c-i3-$runID"-A.txt and -B.txt" 54pairI3=dis/$(date +"%b%d-%H")-c-i3-$runID"-A.txt and -B.txt"
52echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b disPairs2MbInNames.txt -B -I i3 $runID 55echo "" | ../run_bench.sh -m pair -p $coreCPU -P $threadCPU -l $maxJobs -b disPairs2MbInNames.txt -B -I i3 $runID
53# Split L2, split L3 56# Split L2, split L3
54pairI=dis/$(date +"%b%d-%H")-c-i-$runID"-A.txt and -B.txt" 57pairI=dis/$(date +"%b%d-%H")-c-i-$runID"-A.txt and -B.txt"
55echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b disPairs2MbInNames.txt -B -I i $runID 58echo "" | ../run_bench.sh -m pair -p $coreCPU -P $threadCPU -l $maxJobs -b disPairs2MbInNames.txt -B -I i $runID
56date 59date
57 60
58echo "==== DONE ====" 61echo "==== 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 @@
5 5
6maxJobs=$1 6maxJobs=$1
7runID=$2 7runID=$2
8coreCPU=${3:-15}
9threadCPU=${4:-31}
8 10
9if [ $# -lt 2 ]; then 11if [ $# -lt 2 ]; then
10 echo "Usage $0 <number of iterations> <run ID>" 12 echo "Usage $0 <number of iterations> <run ID> <core CPU ID> <thread CPU ID>"
13 echo "CPU IDs are optional, otherwise assumed to be 15 and 31 respectively."
11 exit 14 exit
12fi 15fi
13if [[ "$EUID" != 0 ]]; then 16if [[ "$EUID" != 0 ]]; then
@@ -27,18 +30,18 @@ cd ..
27echo "Done. Running experiments..." 30echo "Done. Running experiments..."
28# Full L3, full L2 - xi is the baseline for the pairs 31# Full L3, full L2 - xi is the baseline for the pairs
29baseXI=SD-VBS/$(date +"%b%d-%H")-c-xi-$runID.txt 32baseXI=SD-VBS/$(date +"%b%d-%H")-c-xi-$runID.txt
30echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b sd-vbsNames.txt -B -I xi $runID 33echo "" | ../run_bench.sh -m base -p coreCPU -l $maxJobs -b sd-vbsNames.txt -B -I xi $runID
31# Half L3, full L2 - i3 sees effect of half L3 34# Half L3, full L2 - i3 sees effect of half L3
32baseI3=SD-VBS/$(date +"%b%d-%H")-c-i3-$runID.txt 35baseI3=SD-VBS/$(date +"%b%d-%H")-c-i3-$runID.txt
33echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b sd-vbsNames.txt -B -I i3 $runID 36echo "" | ../run_bench.sh -m base -p coreCPU -l $maxJobs -b sd-vbsNames.txt -B -I i3 $runID
34# Half L3, half L2 - additional effect of half L2 37# Half L3, half L2 - additional effect of half L2
35baseI=SD-VBS/$(date +"%b%d-%H")-c-i-$runID.txt 38baseI=SD-VBS/$(date +"%b%d-%H")-c-i-$runID.txt
36echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b sd-vbsNames.txt -B -I i $runID 39echo "" | ../run_bench.sh -m base -p coreCPU -l $maxJobs -b sd-vbsNames.txt -B -I i $runID
37date 40date
38 41
39# Run the Level-C pairs 42# Run the Level-C pairs
40pairC=SD-VBS/$(date +"%b%d-%H")-c-xi-async-$runID.txt 43pairC=SD-VBS/$(date +"%b%d-%H")-c-xi-async-$runID.txt
41echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b sd-vbsNames.txt -B -I xi -A $runID 44echo "" | ../run_bench.sh -m pair -p coreCPU -P $threadCPU -l $maxJobs -b sd-vbsNames.txt -B -I xi -A $runID
42date 45date
43 46
44# Run the Level-A/-B pairs 47# Run the Level-A/-B pairs
@@ -49,13 +52,13 @@ cd ..
49echo "Done. Continuing experiments..." 52echo "Done. Continuing experiments..."
50# No cache isolation 53# No cache isolation
51pairXI=SD-VBS/$(date +"%b%d-%H")-c-xi-$runID"-A.txt and -B.txt" 54pairXI=SD-VBS/$(date +"%b%d-%H")-c-xi-$runID"-A.txt and -B.txt"
52echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b sd-vbsNames.txt -B -I xi $runID 55echo "" | ../run_bench.sh -m pair -p coreCPU -P $threadCPU -l $maxJobs -b sd-vbsNames.txt -B -I xi $runID
53# Shared L2, split L3 56# Shared L2, split L3
54pairI3=SD-VBS/$(date +"%b%d-%H")-c-i3-$runID"-A.txt and -B.txt" 57pairI3=SD-VBS/$(date +"%b%d-%H")-c-i3-$runID"-A.txt and -B.txt"
55echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b sd-vbsNames.txt -B -I i3 $runID 58echo "" | ../run_bench.sh -m pair -p coreCPU -P $threadCPU -l $maxJobs -b sd-vbsNames.txt -B -I i3 $runID
56# Split L2, split L3 59# Split L2, split L3
57pairI=SD-VBS/$(date +"%b%d-%H")-c-i-$runID"-A.txt and -B.txt" 60pairI=SD-VBS/$(date +"%b%d-%H")-c-i-$runID"-A.txt and -B.txt"
58echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b sd-vbsNames.txt -B -I i $runID 61echo "" | ../run_bench.sh -m pair -p coreCPU -P $threadCPU -l $maxJobs -b sd-vbsNames.txt -B -I i $runID
59date 62date
60 63
61echo "==== DONE ====" 64echo "==== 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 @@
5 5
6maxJobs=$1 6maxJobs=$1
7runID=$2 7runID=$2
8coreCPU=${3:-15}
9threadCPU=${4:-31}
8 10
9if [ $# -lt 2 ]; then 11if [ $# -lt 2 ]; then
10 echo "Usage $0 <number of iterations> <run ID>" 12 echo "Usage $0 <number of iterations> <run ID> <core CPU ID> <thread CPU ID>"
13 echo "CPU IDs are optional, otherwise assumed to be $coreCPU and $threadCPU respectively."
11 exit 14 exit
12fi 15fi
13if [[ "$EUID" != 0 ]]; then 16if [[ "$EUID" != 0 ]]; then
@@ -24,13 +27,13 @@ cd baseline
24make all -j32 27make all -j32
25# Full L3, full L2 - xi is the baseline for the pairs 28# Full L3, full L2 - xi is the baseline for the pairs
26baseXI=baseline/$(date +"%b%d-%H")-c-xi-$runID.txt 29baseXI=baseline/$(date +"%b%d-%H")-c-xi-$runID.txt
27echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b tacleNames.txt -B -I xi $runID 30echo "" | ../run_bench.sh -m base -p $coreCPU -l $maxJobs -b tacleNames.txt -B -I xi $runID
28# Half L3, full L2 - i3 sees effect of half L3 31# Half L3, full L2 - i3 sees effect of half L3
29baseI3=baseline/$(date +"%b%d-%H")-c-i3-$runID.txt 32baseI3=baseline/$(date +"%b%d-%H")-c-i3-$runID.txt
30echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b tacleNames.txt -B -I i3 $runID 33echo "" | ../run_bench.sh -m base -p $coreCPU -l $maxJobs -b tacleNames.txt -B -I i3 $runID
31# Half L3, half L2 - additional effect of half L2 34# Half L3, half L2 - additional effect of half L2
32baseI=baseline/$(date +"%b%d-%H")-c-i-$runID.txt 35baseI=baseline/$(date +"%b%d-%H")-c-i-$runID.txt
33echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b tacleNames.txt -B -I i $runID 36echo "" | ../run_bench.sh -m base -p $coreCPU -l $maxJobs -b tacleNames.txt -B -I i $runID
34date 37date
35 38
36# Run the Level-A/-B pairs 39# Run the Level-A/-B pairs
@@ -38,19 +41,19 @@ cd ../all_pairs
38make all -j32 41make all -j32
39# No cache isolation 42# No cache isolation
40pairXI=all_pairs/$(date +"%b%d-%H")-c-xi-$runID"-A.txt and -B.txt" 43pairXI=all_pairs/$(date +"%b%d-%H")-c-xi-$runID"-A.txt and -B.txt"
41echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b tacleNames.txt -B -I xi $runID 44echo "" | ../run_bench.sh -m pair -p $coreCPU -P $threadCPU -l $maxJobs -b tacleNames.txt -B -I xi $runID
42# Shared L2, split L3 45# Shared L2, split L3
43pairI3=all_pairs/$(date +"%b%d-%H")-c-i3-$runID"-A.txt and -B.txt" 46pairI3=all_pairs/$(date +"%b%d-%H")-c-i3-$runID"-A.txt and -B.txt"
44echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b tacleNames.txt -B -I i3 $runID 47echo "" | ../run_bench.sh -m pair -p $coreCPU -P $threadCPU -l $maxJobs -b tacleNames.txt -B -I i3 $runID
45# Split L2, split L3 48# Split L2, split L3
46pairI=all_pairs/$(date +"%b%d-%H")-c-i-$runID"-A.txt and -B.txt" 49pairI=all_pairs/$(date +"%b%d-%H")-c-i-$runID"-A.txt and -B.txt"
47echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b tacleNames.txt -B -I i $runID 50echo "" | ../run_bench.sh -m pair -p $coreCPU -P $threadCPU -l $maxJobs -b tacleNames.txt -B -I i $runID
48date 51date
49 52
50# Run the Level-C pairs 53# Run the Level-C