Unify unpaired timing scripts for DIS, TACLe, and SD-VBS

Now supports specifying an input generation command for
each benchmark - see dis/dis2MbInNames.txt for an example.

12 files changed, 217 insertions, 220 deletions

diff --git a/dis/bin/field_2mb b/dis/bin/field_2mb
deleted file mode 100755
index 31f2a8d..0000000
--- a/dis/bin/field_2mb
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-taskset -c 0 ./gen_input.py field inputs/Field/in0 2097152 | ./field $@
diff --git a/dis/bin/matrix_2mb b/dis/bin/matrix_2mb
deleted file mode 100755
index 72710ab..0000000
--- a/dis/bin/matrix_2mb
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-taskset -c 0 ./gen_input.py matrix inputs/Matrix/in4 2097152 | ./matrix $@ > /dev/null
diff --git a/dis/bin/neighborhood_2mb b/dis/bin/neighborhood_2mb
deleted file mode 100755
index 226bd98..0000000
--- a/dis/bin/neighborhood_2mb
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-taskset -c 0 ./gen_input.py neighborhood inputs/Neighborhood/in0 2097152 | ./neighborhood $@ > /dev/null
diff --git a/dis/bin/pointer_2mb b/dis/bin/pointer_2mb
deleted file mode 100755
index 3ce8f2b..0000000
--- a/dis/bin/pointer_2mb
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-taskset -c 0 ./gen_input.py pointer inputs/Pointer/in0 2097152 | ./pointer $@
diff --git a/dis/bin/transitive_2mb b/dis/bin/transitive_2mb
deleted file mode 100755
index b8bcf5a..0000000
--- a/dis/bin/transitive_2mb
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-taskset -c 0 ./gen_input.py transitive inputs/Transitive/in0 2097152 | ./transitive $@
diff --git a/dis/bin/update_2mb b/dis/bin/update_2mb
deleted file mode 100755
index 3bc33f4..0000000
--- a/dis/bin/update_2mb
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-taskset -c 0 ./gen_input.py update inputs/Update/in0 2097152 | ./update $@
diff --git a/dis/dis2MbInNames.txt b/dis/dis2MbInNames.txt
new file mode 100644
index 0000000..00e6a22
--- /dev/null
+++ b/dis/dis2MbInNames.txt
@@ -0,0 +1,6 @@
+field                   ./gen_input.py field inputs/Field/in0 2097152
+matrix                  ./gen_input.py matrix inputs/Matrix/in0 2097152
+neighborhood    ./gen_input.py neighborhood inputs/Neighborhood/in0 2097152
+pointer                 ./gen_input.py pointer inputs/Pointer/in0 2097152
+transitive              ./gen_input.py transitive inputs/Transitive/in0 2097152
+update                  ./gen_input.py update inputs/Update/in0 2097152
diff --git a/dis/run_dis.sh b/dis/run_dis.sh
deleted file mode 100755
index 78745ec..0000000
--- a/dis/run_dis.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/bash
-
-core=$1
-maxJobs=$2
-runID=$3
-benchmark=${4,}
-template_input=inputs/$4/in0
-wss_settings=inputs/WSSS
-cache_settings=inputs/caches
-
-if [ $# -lt 4 ]; then
-    echo "Usage $0 <core ID> <number of iterations> <run ID> <benchmark> [template input] [DIS WSS file] [DIS cache file]"
-    exit
-fi
-
-if [ $# -gt 4 ]; then
-    echo "Using alternate input template from $5"
-    template_input=$5
-fi
-
-if [ $# -gt 5 ]; then
-    echo "Using alternate WSS settings from $6"
-    wss_settings=$6
-fi
-
-if [ $# -gt 6 ]; then
-    echo "Using alternate cache settings from $7"
-    cache_settings=$7
-fi
-
-echo "Making sure that binary is up to date..."
-make $benchmark
-echo "Done. Disabling real-time throttling..."
-
-# Turn off rt throttling
-echo -1 > /proc/sys/kernel/sched_rt_runtime_us
-echo "Done. Redirecting all interrupts to core 0..."
-
-# Redirect all interrupts to core 0
-i=0
-for IRQ in /proc/irq/*
-do
-    # Skip default_smp_affinity
-    if [ -d $IRQ ]; then
-        irqList[$i]=$(cat $IRQ/smp_affinity_list)
-        echo 0 2> /dev/null > $IRQ/smp_affinity_list
-    fi
-    i=$(( $i + 1 ))
-done
-
-echo "Done. Checking for wbinvd module..."
-if [[ ! -f "/proc/wbinvd" ]]; then
-    echo "ERROR: wbinvd module not loaded. Exiting..."
-    exit
-fi
-
-# Enable L3 isolation
-echo "Done. Enabling L3 isolation..."
-mount -t resctrl resctrl /sys/fs/resctrl
-mkdir -p /sys/fs/resctrl/benchmarks
-echo $1 > /sys/fs/resctrl/benchmarks/cpus_list
-# Reset global bandwith control and remove L3 from global
-echo "L3:0=ffff;1=ffff;2=ffff;3=0000" > /sys/fs/resctrl/schemata
-echo "MB:0=2048;1=2048;2=2048;3=2048" > /sys/fs/resctrl/schemata
-# Alloc L3 to benchmark
-echo "L3:0=0000;1=0000;2=0000;3=ffff" > /sys/fs/resctrl/benchmarks/schemata
-echo "MB:0=2048;1=2048;2=2048;3=2048" > /sys/fs/resctrl/benchmarks/schemata
-echo "Done. Beginning benchmarks..."
-
-# Execute the benchmark for each WSS and cache config
-while read j; do
-    echo $j > /sys/fs/resctrl/benchmarks/schemata
-    while read i; do
-        if grep -q "#define LITMUS 1" ../baseline/source/extra.h; then
-            echo "Using LITMUS-RT!"
-            ./gen_input.py $benchmark $template_input $i | numactl -m 0 ./$benchmark $benchmark-$i-$j $maxJobs $core $runID 1
-        else
-            ./gen_input.py $benchmark $template_input $i | chrt -r 97 numactl -m 0 taskset -c $core ./$benchmark $benchmark-$i-$j $maxJobs $core $runID 1
-        fi
-    done < $wss_settings
-done < $cache_settings
-
-# Put IRQs back as they were
-i=0
-for IRQ in /proc/irq/*
-do
-    if [ -d $IRQ ]; then
-        echo ${irqList[$i]} 2> /dev/null > $IRQ/smp_affinity_list
-    fi
-    i=$(( $i + 1 ))
-done
-
diff --git a/run_all_dis.sh b/run_all_dis.sh
deleted file mode 100755
index 5a6b6e1..0000000
--- a/run_all_dis.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-# Run baselines for all the DIS tasks
-if [ "$EUID" -ne 0 ]
-then
-    echo "You need to be root to enable cache way and interrupt isolation!"
-    exit
-fi
-
-if uname -a | grep -q "mc2"; then
-    echo "MC^2 detected! Cache isolation will be enabled"
-    iso="i"
-else
-    echo "MC^2 not detected."
-    iso="xi"
-fi
-
-datestring=$(date +"%b%d-%H")
-if ! grep -q irqaffinity /proc/cmdline; then
-    /playpen/move_interrupts_off_core15.sh
-else
-    echo "performance" > /sys/devices/system/cpu/cpu15/cpufreq/scaling_governor
-fi
-WSSS=WSSS_maxstride2mb
-caches=caches_all
-# Consider re-enabling this only if you're interested in exploring bandwidth effects
-#./setup_mem_and_global.sh
-if [[ $1 == "--contend" ]]; then
-    echo "Will run 6 contending tasks"
-    echo "Files will be named $datestring-<benchmark name>-c-"$iso".txt"
-    echo "Please verify the above settings. Press enter to continue..."
-    read
-    # Run two contending tasks on each other CCX
-    taskset -c 1 /playpen/mc2/imx6q-thrasher/thrasher &
-    taskset -c 2 /playpen/mc2/imx6q-thrasher/thrasher &
-    taskset -c 5 /playpen/mc2/imx6q-thrasher/thrasher &
-    taskset -c 6 /playpen/mc2/imx6q-thrasher/thrasher &
-    taskset -c 9 /playpen/mc2/imx6q-thrasher/thrasher &
-    taskset -c 10 /playpen/mc2/imx6q-thrasher/thrasher &
-    ./run_dis.sh 15 10 $datestring-field-c-$iso Field inputs/Field/in0 inputs/$WSSS inputs/$caches
-    ./postproc.sh $datestring-field-c-$iso
-    ./run_dis.sh 15 10 $datestring-matrix-c-$iso Matrix inputs/Matrix/in0 inputs/$WSSS inputs/$caches
-    ./postproc.sh $datestring-matrix-c-$iso
-    ./run_dis.sh 15 10 $datestring-neighborhood-c-$iso Neighborhood inputs/Neighborhood/in0 inputs/$WSSS inputs/$caches
-    ./postproc.sh $datestring-neighborhood-c-$iso
-    ./run_dis.sh 15 10 $datestring-pointer-c-$iso Pointer inputs/Pointer/in0 inputs/$WSSS inputs/$caches
-    ./postproc.sh $datestring-pointer-c-$iso
-    ./run_dis.sh 15 10 $datestring-transitive-c-$iso Transitive inputs/Transitive/in0 inputs/$WSSS inputs/$caches
-    ./postproc.sh $datestring-transitive-c-$iso
-    ./run_dis.sh 15 10 $datestring-update-c-$iso Update inputs/Update/in0 inputs/$WSSS inputs/$caches
-    ./postproc.sh $datestring-update-c-$iso
-    killall thrasher
-else
-    echo "Will run no contending tasks (use --contend for contending tasks)"
-    echo "Files will be named $datestring-<benchmark name>-xc-"$iso".txt"
-    echo "Please verify the above settings. Press enter to continue..."
-    read
-    killall thrasher
-    ./run_dis.sh 15 10 $datestring-field-xc-$iso Field inputs/Field/in0 inputs/$WSSS inputs/$caches
-    ./postproc.sh $datestring-field-xc-$iso
-    ./run_dis.sh 15 10 $datestring-matrix-xc-$iso Matrix inputs/Matrix/in0 inputs/$WSSS inputs/$caches
-    ./postproc.sh $datestring-matrix-xc-$iso
-    ./run_dis.sh 15 10 $datestring-neighborhood-xc-$iso Neighborhood inputs/Neighborhood/in0 inputs/$WSSS inputs/$caches
-    ./postproc.sh $datestring-neighborhood-xc-$iso
-    ./run_dis.sh 15 10 $datestring-pointer-xc-$iso Pointer inputs/Pointer/in0 inputs/$WSSS inputs/$caches
-    ./postproc.sh $datestring-pointer-xc-$iso
-    ./run_dis.sh 15 10 $datestring-transitive-xc-$iso Transitive inputs/Transitive/in0 inputs/$WSSS inputs/$caches
-    ./postproc.sh $datestring-transitive-xc-$iso
-    ./run_dis.sh 15 10 $datestring-update-xc-$iso Update inputs/Update/in0 inputs/$WSSS inputs/$caches