Merge branch 'rtas20-wip' into sd-vbs

28 files changed, 188 insertions, 366 deletions

diff --git a/baseline/run_baseline.sh b/baseline/run_baseline.sh
deleted file mode 100755
index c5b67b6..0000000
--- a/baseline/run_baseline.sh
+++ /dev/null
@@ -1,156 +0,0 @@
-#!/bin/bash
-
-core=$1
-maxJobs=$2
-userRunID=$3
-tacleNames=tacleNames.txt
-
-if [ $# -lt 3 ]; then
-    echo "Usage $0 <core ID> <number of iterations> <run ID> [TACLe names file] [--contend]"
-    exit
-fi
-
-if [ $# -gt 3 ]; then
-    echo "Using alternate list of TACLe benchmarks from $4"
-    tacleNames=$4
-fi
-
-if [ "$EUID" -ne 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..."
-while read i; do
-    make bin/$i
-done < $tacleNames
-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
-
-# Read the names of each benchmark
-j=0
-while read i; do
-    tacleProg[$j]=$i
-    j=$(( $j + 1 ))
-done < $tacleNames
-
-echo "Done. Checking for wbinvd module..."
-if [[ ! -f "/proc/wbinvd" ]]; then
-    echo "ERROR: wbinvd module not loaded. Exiting..."
-    exit
-fi
-
-echo "Done. Setting cores $firstCore and $secondCore to 'performance'..."
-echo "performance" > /sys/devices/system/cpu/cpu15/cpufreq/scaling_governor
-echo "performance" > /sys/devices/system/cpu/cpu31/cpufreq/scaling_governo
-
-# 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. Verifying configuration with user..."
-
-# Generate file name string
-# We append to this as we parse the environment settings
-runID=$(date +"%b%d-%H")
-
-# Confirm configuration with user
-echo "=== Global Config ==="
-cat /sys/fs/resctrl/schemata
-echo "=== Core $1 Config ==="
-cat /sys/fs/resctrl/benchmarks/schemata
-if [[ $5 == "--contend" ]]; then
-    if [[ ! -f "/playpen/mc2/imx6q-thrasher/thrasher" ]]; then
-        echo "ERROR: thrasher binary not fonud. Exiting..."
-        exit
-    fi
-    echo "Will run 6 contending tasks"
-    runID=$runID-c
-else
-    runID=$runID-xc
-fi
-if uname -a | grep -q "mc2"; then
-    echo "MC^2 Autodetected. Cache coloring and interleaving will be enabled."
-    runID=$runID-i
-else
-    echo "MC^2 not detected."
-    runID=$runID-xi
-fi
-if pwd | grep -qi dis; then
-    echo "Autodetected DIS. Will use script-level looping."
-fi
-echo "Results will be saved as $runID-$userRunID.txt"
-echo "Press enter to confirm environment, Ctrl-C to exit..."
-read
-
-# Start contending tasks
-if [[ $5 == "--contend" ]]; then
-    echo "Done. Starting 6 contending tasks..."
-    # 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 &
-fi
-sleep 1 # Wait for contending tasks to start
-echo "Done. Beginning benchmarks..."
-
-num_tests=$(wc -l < $tacleNames)
-for (( i = 0; i < $num_tests ; i++ ))
-do
-    # If using DIS, we have to iterate in the script as DIS won't do it for us
-    pwd | grep -qi dis
-    iters=$(python3 -c "print(int(not "$?")*("$maxJobs"-1))")
-    for ((k=0;k<=iters;k++)); do
-        # Check if we're using LITMUS^RT or not
-        if [[ -f source/extra.h ]] && grep -q "#define LITMUS 1" source/extra.h; then
-            ./bin/${tacleProg[$i]} ${tacleProg[$i]} $maxJobs $core $runID-$userRunID 1
-        else
-            # Interleave memory allocations between all nodes (only 1 node w/out MC^2)
-            chrt -r 97 numactl --interleave=all taskset -c $core ./bin/${tacleProg[$i]} ${tacleProg[$i]} $maxJobs $core $runID-$userRunID 1
-#chrt -r 97 numactl -m 0 taskset -c $core ./bin/${tacleProg[$i]} ${tacleProg[$i]} $maxJobs $core $runID-$userRunID-NOINTERLEAVE 1
-        fi
-    done
-    echo COMPLETE: ${tacleProg[$i]}
-done
-
-# End contending tasks
-if [[ $5 == "--contend" ]]; then
-    killall thrasher
-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
-    i=$(( $i + 1 ))
-done
-
diff --git a/baseline/source/adpcm_dec/adpcm_dec.c b/baseline/source/adpcm_dec/adpcm_dec.c
index 368e98d..0627c9c 100644
--- a/baseline/source/adpcm_dec/adpcm_dec.c
+++ b/baseline/source/adpcm_dec/adpcm_dec.c
@@ -708,12 +708,10 @@ void _Pragma( "entrypoint" ) adpcm_dec_main( void )
 int main(int argc, char **argv)