20 files changed, 520 insertions, 17 deletions

diff --git a/.gitignore b/.gitignore
index 24a4e1f..1824f51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 # Ignore benchmark results
 *.txt
 *.txt.clean
+# But not benchmark lists
+!*Names.txt
 
 # Ignore DIS benchmark binaries
 **/field
diff --git a/dis/bin/field_2mb b/dis/bin/field_2mb
new file mode 100755
index 0000000..31f2a8d
--- /dev/null
+++ b/dis/bin/field_2mb
@@ -0,0 +1,2 @@
+#!/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
new file mode 100755
index 0000000..72710ab
--- /dev/null
+++ b/dis/bin/matrix_2mb
@@ -0,0 +1,2 @@
+#!/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
new file mode 100755
index 0000000..226bd98
--- /dev/null
+++ b/dis/bin/neighborhood_2mb
@@ -0,0 +1,2 @@
+#!/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
new file mode 100755
index 0000000..3ce8f2b
--- /dev/null
+++ b/dis/bin/pointer_2mb
@@ -0,0 +1,2 @@
+#!/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
new file mode 100755
index 0000000..b8bcf5a
--- /dev/null
+++ b/dis/bin/transitive_2mb
@@ -0,0 +1,2 @@
+#!/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
new file mode 100755
index 0000000..3bc33f4
--- /dev/null
+++ b/dis/bin/update_2mb
@@ -0,0 +1,2 @@
+#!/bin/bash
+taskset -c 0 ./gen_input.py update inputs/Update/in0 2097152 | ./update $@
diff --git a/dis/inputs/Field/in0 b/dis/inputs/Field/in0
new file mode 120000
index 0000000..2f8d436
--- /dev/null
+++ b/dis/inputs/Field/in0
@@ -0,0 +1 @@
+in1
\ No newline at end of file
diff --git a/dis/inputs/Matrix/in0 b/dis/inputs/Matrix/in0
new file mode 120000
index 0000000..2f8d436
--- /dev/null
+++ b/dis/inputs/Matrix/in0
@@ -0,0 +1 @@
+in1
\ No newline at end of file
diff --git a/dis/inputs/Neighborhood/in0 b/dis/inputs/Neighborhood/in0
new file mode 120000
index 0000000..83ac113
--- /dev/null
+++ b/dis/inputs/Neighborhood/in0
@@ -0,0 +1 @@
+test1.in
\ No newline at end of file
diff --git a/dis/inputs/Pointer/in0 b/dis/inputs/Pointer/in0
new file mode 100644
index 0000000..3535667
--- /dev/null
+++ b/dis/inputs/Pointer/in0
@@ -0,0 +1,3 @@
+10485770 15 12800000 -2 1
+
+10 10485760 10485760
diff --git a/dis/inputs/Transitive/in0 b/dis/inputs/Transitive/in0
new file mode 120000
index 0000000..2f8d436
--- /dev/null
+++ b/dis/inputs/Transitive/in0
@@ -0,0 +1 @@
+in1
\ No newline at end of file
diff --git a/dis/inputs/Update/in0 b/dis/inputs/Update/in0
new file mode 120000
index 0000000..2f8d436
--- /dev/null
+++ b/dis/inputs/Update/in0
@@ -0,0 +1 @@
+in1
\ No newline at end of file
diff --git a/dis/inputs/WSSS_maxstride2mb b/dis/inputs/WSSS_maxstride2mb
new file mode 100644
index 0000000..8fdbbc4
--- /dev/null
+++ b/dis/inputs/WSSS_maxstride2mb
@@ -0,0 +1,15 @@
+262144
+524288
+1048576
+2097152
+4194304
+6291456
+8388608
+10485760
+12582912
+14680064
+16777216
+18874368
+20971520
+23068672
+25165824
diff --git a/dis/inputs/caches_all b/dis/inputs/caches_all
new file mode 100644
index 0000000..92e936c
--- /dev/null
+++ b/dis/inputs/caches_all
@@ -0,0 +1,17 @@
+L3:0=0000;1=0000;2=0000;3=0000
+L3:0=0000;1=0000;2=0000;3=0001
+L3:0=0000;1=0000;2=0000;3=0003
+L3:0=0000;1=0000;2=0000;3=0007
+L3:0=0000;1=0000;2=0000;3=000f
+L3:0=0000;1=0000;2=0000;3=001f
+L3:0=0000;1=0000;2=0000;3=003f
+L3:0=0000;1=0000;2=0000;3=007f
+L3:0=0000;1=0000;2=0000;3=00ff
+L3:0=0000;1=0000;2=0000;3=01ff
+L3:0=0000;1=0000;2=0000;3=03ff
+L3:0=0000;1=0000;2=0000;3=07ff
+L3:0=0000;1=0000;2=0000;3=0fff
+L3:0=0000;1=0000;2=0000;3=1fff
+L3:0=0000;1=0000;2=0000;3=3fff
+L3:0=0000;1=0000;2=0000;3=7fff
+L3:0=0000;1=0000;2=0000;3=ffff
diff --git a/dis/run_all_dis.sh b/dis/run_all_dis.sh
new file mode 100755
index 0000000..5a6b6e1
--- /dev/null
+++ b/dis/run_all_dis.sh
@@ -0,0 +1,70 @@
+#!/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
+    ./postproc.sh $datestring-update-xc-$iso
+fi
diff --git a/dis/run_dis.sh b/dis/run_dis.sh
index 3e82bfb..78745ec 100755
--- a/dis/run_dis.sh
+++ b/dis/run_dis.sh
@@ -4,7 +4,7 @@ core=$1
 maxJobs=$2
 runID=$3
 benchmark=${4,}
-template_input=inputs/$4/in1
+template_input=inputs/$4/in0
 wss_settings=inputs/WSSS
 cache_settings=inputs/caches
 
@@ -36,7 +36,6 @@ echo "Done. Disabling real-time throttling..."
 echo -1 > /proc/sys/kernel/sched_rt_runtime_us
 echo "Done. Redirecting all interrupts to core 0..."
 
-# TODO: Make this cleaner
 # Redirect all interrupts to core 0
 i=0
 for IRQ in /proc/irq/*
@@ -44,27 +43,39 @@ do
     # Skip default_smp_affinity