diff options
author | Joshua Bakita <jbakita@cs.unc.edu> | 2021-03-11 16:59:03 -0500 |
---|---|---|
committer | Joshua Bakita <jbakita@cs.unc.edu> | 2021-03-11 16:59:03 -0500 |
commit | 0163557cb47d1cbe9018ab39b5f8f8ace65b9af7 (patch) | |
tree | ae95832b537d1b5bdb248f8c3521b8b687eb6163 | |
parent | 1d44f945a2fd163b35dc30f599fdcc5e016011bc (diff) |
Benchmarks: Allow test CPU specification in top-level runner scripts
This allows artifact evaluators to test on CPUs other than CPU 15
-rwxr-xr-x | run_all_dis.sh | 19 | ||||
-rwxr-xr-x | run_all_sd-vbs.sh | 19 | ||||
-rwxr-xr-x | 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 @@ | |||
5 | 5 | ||
6 | maxJobs=$1 | 6 | maxJobs=$1 |
7 | runID=$2 | 7 | runID=$2 |
8 | coreCPU=${3:-15} | ||
9 | threadCPU=${4:-31} | ||
8 | 10 | ||
9 | if [ $# -lt 2 ]; then | 11 | if [ $# -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 |
12 | fi | 15 | fi |
13 | if [[ "$EUID" != 0 ]]; then | 16 | if [[ "$EUID" != 0 ]]; then |
@@ -26,18 +29,18 @@ make baseline -j30 > /dev/null # Suppress noisy output | |||
26 | echo "Done. Running experiments..." | 29 | echo "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 |
28 | baseXI=dis/$(date +"%b%d-%H")-c-xi-$runID.txt | 31 | baseXI=dis/$(date +"%b%d-%H")-c-xi-$runID.txt |
29 | echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b dis2MbInNames.txt -B -I xi $runID | 32 | echo "" | ../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 |
31 | baseI3=dis/$(date +"%b%d-%H")-c-i3-$runID.txt | 34 | baseI3=dis/$(date +"%b%d-%H")-c-i3-$runID.txt |
32 | echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b dis2MbInNames.txt -B -I i3 $runID | 35 | echo "" | ../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 |
34 | baseI=dis/$(date +"%b%d-%H")-c-i-$runID.txt | 37 | baseI=dis/$(date +"%b%d-%H")-c-i-$runID.txt |
35 | echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b dis2MbInNames.txt -B -I i $runID | 38 | echo "" | ../run_bench.sh -m base -p $coreCPU -l $maxJobs -b dis2MbInNames.txt -B -I i $runID |
36 | date | 39 | date |
37 | 40 | ||
38 | # Run the Level-C pairs | 41 | # Run the Level-C pairs |
39 | pairC=dis/$(date +"%b%d-%H")-c-xi-async-$runID.txt | 42 | pairC=dis/$(date +"%b%d-%H")-c-xi-async-$runID.txt |
40 | echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b dis2MbInNames.txt -B -I xi -A $runID | 43 | echo "" | ../run_bench.sh -m pair -p $coreCPU -P $threadCPU -l $maxJobs -b dis2MbInNames.txt -B -I xi -A $runID |
41 | date | 44 | date |
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 | |||
46 | echo "Done. Continuing experiments..." | 49 | echo "Done. Continuing experiments..." |
47 | # No cache isolation | 50 | # No cache isolation |
48 | pairXI=dis/$(date +"%b%d-%H")-c-xi-$runID"-A.txt and -B.txt" | 51 | pairXI=dis/$(date +"%b%d-%H")-c-xi-$runID"-A.txt and -B.txt" |
49 | echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b disPairs2MbInNames.txt -B -I xi $runID | 52 | echo "" | ../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 |
51 | pairI3=dis/$(date +"%b%d-%H")-c-i3-$runID"-A.txt and -B.txt" | 54 | pairI3=dis/$(date +"%b%d-%H")-c-i3-$runID"-A.txt and -B.txt" |
52 | echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b disPairs2MbInNames.txt -B -I i3 $runID | 55 | echo "" | ../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 |
54 | pairI=dis/$(date +"%b%d-%H")-c-i-$runID"-A.txt and -B.txt" | 57 | pairI=dis/$(date +"%b%d-%H")-c-i-$runID"-A.txt and -B.txt" |
55 | echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b disPairs2MbInNames.txt -B -I i $runID | 58 | echo "" | ../run_bench.sh -m pair -p $coreCPU -P $threadCPU -l $maxJobs -b disPairs2MbInNames.txt -B -I i $runID |
56 | date | 59 | date |
57 | 60 | ||
58 | echo "==== DONE ====" | 61 | 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 @@ | |||
5 | 5 | ||
6 | maxJobs=$1 | 6 | maxJobs=$1 |
7 | runID=$2 | 7 | runID=$2 |
8 | coreCPU=${3:-15} | ||
9 | threadCPU=${4:-31} | ||
8 | 10 | ||
9 | if [ $# -lt 2 ]; then | 11 | if [ $# -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 |
12 | fi | 15 | fi |
13 | if [[ "$EUID" != 0 ]]; then | 16 | if [[ "$EUID" != 0 ]]; then |
@@ -27,18 +30,18 @@ cd .. | |||
27 | echo "Done. Running experiments..." | 30 | echo "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 |
29 | baseXI=SD-VBS/$(date +"%b%d-%H")-c-xi-$runID.txt | 32 | baseXI=SD-VBS/$(date +"%b%d-%H")-c-xi-$runID.txt |
30 | echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b sd-vbsNames.txt -B -I xi $runID | 33 | echo "" | ../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 |
32 | baseI3=SD-VBS/$(date +"%b%d-%H")-c-i3-$runID.txt | 35 | baseI3=SD-VBS/$(date +"%b%d-%H")-c-i3-$runID.txt |
33 | echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b sd-vbsNames.txt -B -I i3 $runID | 36 | echo "" | ../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 |
35 | baseI=SD-VBS/$(date +"%b%d-%H")-c-i-$runID.txt | 38 | baseI=SD-VBS/$(date +"%b%d-%H")-c-i-$runID.txt |
36 | echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b sd-vbsNames.txt -B -I i $runID | 39 | echo "" | ../run_bench.sh -m base -p coreCPU -l $maxJobs -b sd-vbsNames.txt -B -I i $runID |
37 | date | 40 | date |
38 | 41 | ||
39 | # Run the Level-C pairs | 42 | # Run the Level-C pairs |
40 | pairC=SD-VBS/$(date +"%b%d-%H")-c-xi-async-$runID.txt | 43 | pairC=SD-VBS/$(date +"%b%d-%H")-c-xi-async-$runID.txt |
41 | echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b sd-vbsNames.txt -B -I xi -A $runID | 44 | echo "" | ../run_bench.sh -m pair -p coreCPU -P $threadCPU -l $maxJobs -b sd-vbsNames.txt -B -I xi -A $runID |
42 | date | 45 | date |
43 | 46 | ||
44 | # Run the Level-A/-B pairs | 47 | # Run the Level-A/-B pairs |
@@ -49,13 +52,13 @@ cd .. | |||
49 | echo "Done. Continuing experiments..." | 52 | echo "Done. Continuing experiments..." |
50 | # No cache isolation | 53 | # No cache isolation |
51 | pairXI=SD-VBS/$(date +"%b%d-%H")-c-xi-$runID"-A.txt and -B.txt" | 54 | pairXI=SD-VBS/$(date +"%b%d-%H")-c-xi-$runID"-A.txt and -B.txt" |
52 | echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b sd-vbsNames.txt -B -I xi $runID | 55 | echo "" | ../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 |
54 | pairI3=SD-VBS/$(date +"%b%d-%H")-c-i3-$runID"-A.txt and -B.txt" | 57 | pairI3=SD-VBS/$(date +"%b%d-%H")-c-i3-$runID"-A.txt and -B.txt" |
55 | echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b sd-vbsNames.txt -B -I i3 $runID | 58 | echo "" | ../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 |
57 | pairI=SD-VBS/$(date +"%b%d-%H")-c-i-$runID"-A.txt and -B.txt" | 60 | pairI=SD-VBS/$(date +"%b%d-%H")-c-i-$runID"-A.txt and -B.txt" |
58 | echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b sd-vbsNames.txt -B -I i $runID | 61 | echo "" | ../run_bench.sh -m pair -p coreCPU -P $threadCPU -l $maxJobs -b sd-vbsNames.txt -B -I i $runID |
59 | date | 62 | date |
60 | 63 | ||
61 | echo "==== DONE ====" | 64 | 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 @@ | |||
5 | 5 | ||
6 | maxJobs=$1 | 6 | maxJobs=$1 |
7 | runID=$2 | 7 | runID=$2 |
8 | coreCPU=${3:-15} | ||
9 | threadCPU=${4:-31} | ||
8 | 10 | ||
9 | if [ $# -lt 2 ]; then | 11 | if [ $# -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 |
12 | fi | 15 | fi |
13 | if [[ "$EUID" != 0 ]]; then | 16 | if [[ "$EUID" != 0 ]]; then |
@@ -24,13 +27,13 @@ cd baseline | |||
24 | make all -j32 | 27 | make 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 |
26 | baseXI=baseline/$(date +"%b%d-%H")-c-xi-$runID.txt | 29 | baseXI=baseline/$(date +"%b%d-%H")-c-xi-$runID.txt |
27 | echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b tacleNames.txt -B -I xi $runID | 30 | echo "" | ../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 |
29 | baseI3=baseline/$(date +"%b%d-%H")-c-i3-$runID.txt | 32 | baseI3=baseline/$(date +"%b%d-%H")-c-i3-$runID.txt |
30 | echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b tacleNames.txt -B -I i3 $runID | 33 | echo "" | ../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 |
32 | baseI=baseline/$(date +"%b%d-%H")-c-i-$runID.txt | 35 | baseI=baseline/$(date +"%b%d-%H")-c-i-$runID.txt |
33 | echo "" | ../run_bench.sh -m base -p 15 -l $maxJobs -b tacleNames.txt -B -I i $runID | 36 | echo "" | ../run_bench.sh -m base -p $coreCPU -l $maxJobs -b tacleNames.txt -B -I i $runID |
34 | date | 37 | date |
35 | 38 | ||
36 | # Run the Level-A/-B pairs | 39 | # Run the Level-A/-B pairs |
@@ -38,19 +41,19 @@ cd ../all_pairs | |||
38 | make all -j32 | 41 | make all -j32 |
39 | # No cache isolation | 42 | # No cache isolation |
40 | pairXI=all_pairs/$(date +"%b%d-%H")-c-xi-$runID"-A.txt and -B.txt" | 43 | pairXI=all_pairs/$(date +"%b%d-%H")-c-xi-$runID"-A.txt and -B.txt" |
41 | echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b tacleNames.txt -B -I xi $runID | 44 | echo "" | ../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 |
43 | pairI3=all_pairs/$(date +"%b%d-%H")-c-i3-$runID"-A.txt and -B.txt" | 46 | pairI3=all_pairs/$(date +"%b%d-%H")-c-i3-$runID"-A.txt and -B.txt" |
44 | echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b tacleNames.txt -B -I i3 $runID | 47 | echo "" | ../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 |
46 | pairI=all_pairs/$(date +"%b%d-%H")-c-i-$runID"-A.txt and -B.txt" | 49 | pairI=all_pairs/$(date +"%b%d-%H")-c-i-$runID"-A.txt and -B.txt" |
47 | echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b tacleNames.txt -B -I i $runID | 50 | echo "" | ../run_bench.sh -m pair -p $coreCPU -P $threadCPU -l $maxJobs -b tacleNames.txt -B -I i $runID |
48 | date | 51 | date |
49 | 52 | ||
50 | # Run the Level-C pairs | 53 | # Run the Level-C pairs |
51 | cd ../baseline | 54 | cd ../baseline |
52 | pairC=baseline/$(date +"%b%d-%H")-c-xi-async-$runID.txt | 55 | pairC=baseline/$(date +"%b%d-%H")-c-xi-async-$runID.txt |
53 | echo "" | ../run_bench.sh -m pair -p 15 -P 31 -l $maxJobs -b tacleNames.txt -B -I xi -A $runID | 56 | echo "" | ../run_bench.sh -m pair -p $coreCPU -P $threadCPU -l $maxJobs -b tacleNames.txt -B -I xi -A $runID |
54 | date | 57 | date |
55 | 58 | ||
56 | echo "==== DONE ====" | 59 | echo "==== DONE ====" |