Benchmarks and Analysis Scripts: Fix everything for 2D cache sensitivity exp.

- Adds plot_cache_sensitivity_at_4mb.py to plot the results
- Fixes run_bench.sh to work in mode `dis`
- Fixes postproc.sh to use updated paths

1 files changed, 5 insertions, 5 deletions

diff --git a/run_bench.sh b/run_bench.sh
index 6e4abb5..39e9dcb 100755
--- a/run_bench.sh
+++ b/run_bench.sh
@@ -27,8 +27,8 @@ if [ $# -lt 5 ]; then
     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 " -W FILE      List of kB working set sizes to pass gen_input.py"
+    echo " -T IN_ID     Input template to pass to gen_input.py (eg. in0)"
     echo " -C FILE      List of cache configurations to test"
     echo "Mode pair options:"
     echo " -P CPU       CPU to run the 2nd benchmark on"
@@ -87,7 +87,7 @@ if [[ "$mode" == "dis" ]] && [[ ! -f "$wss_settings" ]]; then
     echo "Invalid argument: $wss_settings does not exist"
     exit
 fi
-if [[ "$mode" == "dis" ]] && [[ ! -f "$template_input" ]]; then
+if [[ "$mode" == "dis" ]] && [[ ! -f "inputs/Field/$template_input" ]]; then
     echo "Invalid argument: $template_input does not exist"
     exit
 fi
@@ -350,9 +350,9 @@ for (( i = 0; i < ${#bench[@]} ; i++ )); do
             echo $j > /sys/fs/resctrl/benchmarks/schemata
             while read ii; do # For WSS setting
                 if [[ -v $LITMUS ]]; then
-                    ./gen_input.py ${bench[$i]} inputs/${bench[$i]^}/$template_input $ii | numactl $numa_arg0 $prefix/${bench[$i]} $bench[$i]}-$ii-$j $maxJobs $core $runID 1
+                    ./gen_input.py ${bench[$i]} inputs/${bench[$i]^}/$template_input $ii | numactl $numa_arg0 $prefix/${bench[$i]} $bench{[$i]}-$ii-$j $maxJobs $core $runID-$userRunID 1
                 else
-                    ./gen_input.py ${bench[$i]} inputs/${bench[$i]^}/$template_input $ii | chrt -r 97 numactl $numa_arg0 taskset -c $core $prefix/${bench[$i]} ${bench[$i]}-$ii-$j $maxJobs $core $runID 1
+                    ./gen_input.py ${bench[$i]} inputs/${bench[$i]^}/$template_input $ii | chrt -r 97 numactl $numa_arg0 taskset -c $core $prefix/${bench[$i]} ${bench[$i]}-$ii-$j $maxJobs $core $runID-$userRunID 1
                 fi
             done < $wss_settings
         done < $cache_settings