merged

1 files changed, 313 insertions, 71 deletions

diff --git a/run_bench.sh b/run_bench.sh
index c5b67b6..ddc6bcc 100755
--- a/run_bench.sh
+++ b/run_bench.sh
@@ -1,30 +1,162 @@
 #!/bin/bash
+# Copyright 2020 Joshua Bakita
+# A unified script for timing:
+# - SMT pairs with synchronous launches (hard real-time methodolgy)
+# - SMT pairs with asynchronous launches (soft real-time methodolgy)
+# - Unpaired tasks
+# - The cache alloc vs WSS setting exploration for DIS
+# These can all be done with:
+# - No cache management
+# - L3 cache splitting
+# - L2+L3 cache splitting (if OS supported)
 
-core=$1
-maxJobs=$2
-userRunID=$3
-tacleNames=tacleNames.txt
+if grep -q "#define LITMUS 1" ../extra.h ./extra.h 2> /dev/null; then
+    LITMUS=1
+fi
+
+if [ $# -lt 5 ]; then
+    echo "Usage $0 -m MODE -p CPU -l LOOPS -b FILE [-B] [-I] RUN_ID"
+    echo " -m base|dis|pair  Which benchmarking mode to use"
+    echo " -p CPU       Which CPU to run each benchmark on"
+    echo " -l LOOPS     How many loops of each benchmark to do"
+    echo " -b FILE      List of benchmarks to execute. Optional tab-"
+    echo "              delimited 2nd column specifies an input"
+    echo "              generation command (fed to bench via stdin)"
+    echo " -B           Enable background contenders on other CCXes"
+    echo " -I xi|i3|i   Isolation mode: none (xi) (default), way-based"
+    echo "              L3-only (i3), or color-based L2+L3 (i)"
+    echo "Mode base requires no additional options."
+    echo "Mode dis does not support the 2nd col. of -b and needs:"
+    echo " -W FILE      List of working set sizes to pass gen_input.py"
+    echo " -T FILE      Input template to pass to gen_input.py"
+    echo " -C FILE      List of cache configurations to test"
+    echo "Mode pair options:"
+    echo " -P CPU       CPU to run the 2nd benchmark on"
+    echo " -A           Async. (Don't synchronize the pair at job"
+    echo "              boundries.) Typically used SMT in soft realtime"
+fi
+
+# Name options similarly to rtspin
+while getopts “m:p:l:b:BI:W:T:C:P:A” opt; do
+  case $opt in
+# Required
+    m) mode=$OPTARG ;;
+    p) core=$OPTARG ;;
+    l) maxJobs=$OPTARG ;;
+    b) benchNames=$OPTARG ;;
+# Optional
+    B) contend=1 ;;
+    I) iso_mode=$OPTARG ;;
+# DIS
+    W) wss_settings=$OPTARG ;;
+    T) template_input=$OPTARG ;;
+    C) cache_settings=$OPTARG ;;
+# Pair
+    P) core_two=$OPTARG ;;
+    A) async=1 ;;
+  esac
+done
+# Reset to read operands
+shift $((OPTIND -1))
+userRunID=$1
+
+# Required argument checking
+if [[ "$mode" != "base" && "$mode" != "dis" && $mode != pair ]]; then
+    echo "Invalid argument: MODE must be either 'base' or 'dis'"
+    exit
+fi
+if [[ ! -v core ]] || [[ ! -v maxJobs ]] || [[ ! -v benchNames ]]; then
+    echo "Missing argument: -p, -l, and -b are required"
+    exit
+fi
+if [[ ! -f "$benchNames" ]]; then
+    echo "Invalid argument: $benchNames des not exist"
+    exit
+fi
+if [[ ! -v userRunID ]]; then
+    echo "Missing argument: RUN_ID is required"
+    exit
+fi
+
+# DIS argument checking
+if [[ "$mode" == "dis" ]] && [[ ! -v wss_settings || ! -v template_input || -z $cache_settings ]]; then
+    echo "Missing argument: DIS needs -W FILE -T FILE and -C FILE"
+    exit
+fi
+if [[ "$mode" == "dis" ]] && [[ ! -f "$wss_settings" ]]; then
+    echo "Invalid argument: $wss_settings does not exist"
+    exit
+fi
+if [[ "$mode" == "dis" ]] && [[ ! -f "$template_input" ]]; then
+    echo "Invalid argument: $template_input does not exist"
+    exit
+fi
+if [[ "$mode" == "dis" ]] && [[ ! -f "$cache_settings" ]]; then
+    echo "Invalid argument: $cache_settings does not exist"
+    exit
+fi
 
-if [ $# -lt 3 ]; then
-    echo "Usage $0 <core ID> <number of iterations> <run ID> [TACLe names file] [--contend]"
+# Pair argument checking
+if [[ "$mode" == "pair" && ! -v core_two ]]; then
+    echo "Missing argument: mode=pair reqires -P"
+    exit
+fi
+if [[ "$mode" != "pair" ]] && [[ -v async || -v core_two ]]; then
+    echo "Invalid argument: -A and -P require mode=pair"
     exit
 fi
 
-if [ $# -gt 3 ]; then
-    echo "Using alternate list of TACLe benchmarks from $4"
-    tacleNames=$4
+# Additional checks
+if [[ $userRunID == "" ]]; then
+    echo "Missing argument: a run ID is required"
+    exit
+fi
+if [[ -v contend && ! -f "/playpen/mc2/imx6q-thrasher/thrasher" ]]; then
+    echo "ERROR: cannot find thrasher binary for -B. Exiting..."
+    exit
+fi
+if [[ $iso_mode == "i" && ! $(uname -a | grep "mc2") ]]; then
+    echo "Isolation mode 'i' requires the MC^2 kernel. Exiting..."
+    exit
 fi
 
-if [ "$EUID" -ne 0 ]
-then
+# Check permissions and update state
+if [[ "$EUID" != 0 ]]; then
     echo "You need to be root to enable interrupt isolation and real-time execution!"
     exit
 fi
 
-echo "Making sure that binaries are up to date..."
+echo "Loading benchmark names and input..."
+
+# Read the names of each benchmark and load input.
+# This might look a bit scary, but all it does is
+# separate the two fields (1 or more tabs in-between),
+# save the benchmark name, and execute the input
+# command (storing its output in-memory for later).
+j=0
+IFS=$'\r\n'
 while read i; do
-    make bin/$i
-done < $tacleNames
+    bench[$j]=$(echo $i | tr -s "\t" | cut -f1)
+    input[$j]=$(eval $(echo $i | tr -s "\t" | cut -s -f2))
+    j=$(( $j + 1 ))
+done < $benchNames
+echo "Making sure that binaries are up to date..."
+
+for b in ${bench[@]}; do
+    # Build "bin/bench" if bin directory
+    if [[ -d bin ]]; then
+        make bin/$b
+    fi
+    # If that failed, try a different name
+    if [[ "$?" != 0 || ! -d bin ]]; then
+        make $b
+    fi
+    # If bench is still not in bin or curr dir, fail
+    if [[ ! -f "./$b" && ! -f "./bin/$b" ]]; then
+        echo "Unable to find benchmark $b"
+        exit
+    fi
+done
 echo "Done. Disabling real-time throttling..."
 
 # Turn off rt throttling
@@ -43,12 +175,34 @@ do
     i=$(( $i + 1 ))
 done
 
-# Read the names of each benchmark
-j=0
-while read i; do
-    tacleProg[$j]=$i
-    j=$(( $j + 1 ))
-done < $tacleNames
+echo "Done. Creating cleanup handler..."
+function cleanup {
+    # End contending tasks
+    if [[ -v contend ]]; then
+        killall thrasher
+    fi
+
+    # Restore cache access to everyone
+    echo "L3:0=ffff;1=ffff;2=ffff;3=ffff" > /sys/fs/resctrl/schemata
+    if [[ -e /sys/fs/resctrl/benchmarks ]]; then
+        echo "" > /sys/fs/resctrl/benchmarks/cpus_list
+    fi
+    if [[ -e /sys/fs/resctrl/benchmarks2 ]]; then
+        echo "" > /sys/fs/resctrl/benchmarks2/cpus_list
+    fi
+
+    # Put smp_affinty back the way it was
+    i=0
+    for IRQ in /proc/irq/*
+    do
+        if [ -d $IRQ ]; then
+            echo ${irqList[$i]} 2> /dev/null > $IRQ/smp_affinity_list
+        fi