fixed power issue and extra.h first job issue

1 files changed, 30 insertions, 9 deletions

diff --git a/run_bench.sh b/run_bench.sh
index 39e9dcb..242d987 100755
--- a/run_bench.sh
+++ b/run_bench.sh
@@ -11,7 +11,7 @@
 # - L2+L3 cache splitting (if OS supported)
 
 if grep -q "#define LITMUS 1" ../extra.h ./extra.h 2> /dev/null; then
-    LITMUS=1
+LITMUS=1
 fi
 
 if [ $# -lt 5 ]; then
@@ -174,7 +174,7 @@ do
     fi
     i=$(( $i + 1 ))
 done
-
+ 
 echo "Done. Creating cleanup handler..."
 function cleanup {
     # End contending tasks
@@ -327,8 +327,16 @@ FAIL_COLOR="\033[0;31m"
 GOOD_COLOR="\033[0;32m"
 RESET_COLOR="\033[0m"
 
+
 # For each benchmark
 for (( i = 0; i < ${#bench[@]} ; i++ )); do
+    # PERIOD="1000"
+ 
+    # if [[ "${bench[$i]}"  == "multi_ncut_qcif" ]]; then
+    #     PERIOD="10000"
+    #     echo "-------------${bench[$i]}------------------"
+    # fi
+
     # Search for the benchmark in this directory, than /bin
     if [[ -f ${bench[$i]} ]]; then
         prefix="."
@@ -338,8 +346,13 @@ for (( i = 0; i < ${#bench[@]} ; i++ )); do
     if [[ "$mode" == "base" ]]; then
         # Just run the benchmark if TACLeBench
         # Check if we're using LITMUS^RT or not
-        if [[ -v $LITMUS ]]; then
-            echo "${input[$i]}" | numactl $numa_arg0 $prefix/${bench[$i]} ${bench[$i]} $maxJobs $core $runID-$userRunID 1
+        if [[ -v LITMUS ]]; then
+            # echo "numactl $numa_arg0 $prefix/${bench[$i]} ${bench[$i]} $maxJobs $core $runID-$userRunID 1 $PERIOD 1 0"
+            echo "${input[$i]}" | numactl $numa_arg0 $prefix/${bench[$i]} ${bench[$i]} $maxJobs $core $runID-$userRunID 1 $PERIOD 1 0 & PID1=$!
+            # sudo /home/ae/liblitmus/release_ts
+            # echo "waiting......"
+            # wait $PID1
+            # exit 0
         else
             # Remember: Unpaired tasks always get access to all colors (so we --interleave all)
             echo "${input[$i]}" | chrt -r 97 numactl $numa_arg0 taskset -c $core $prefix/${bench[$i]} ${bench[$i]} $maxJobs $core $runID-$userRunID 1
@@ -349,7 +362,7 @@ for (( i = 0; i < ${#bench[@]} ; i++ )); do
         while read j; do # For cache setting
             echo $j > /sys/fs/resctrl/benchmarks/schemata
             while read ii; do # For WSS setting
-                if [[ -v $LITMUS ]]; then
+                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-$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-$userRunID 1
@@ -364,11 +377,19 @@ for (( i = 0; i < ${#bench[@]} ; i++ )); do
             start=0
         fi
         for (( j = $start; j < ${#bench[@]} ; j++ )); do
+            # PERIOD="1000"
+            # if [[ "${bench[$i]}"  == "multi_ncut_qcif" || "${bench[$j]}"  == "multi_ncut_qcif" ]]; then
+            #     PERIOD="20000"
+            #     echo "-------------${bench[$i]}---------${bench[$j]}---------"
+            # fi
             if [[ ! -v async ]]; then
                 # Synchronize between pairs - original hard real-time SMT approach
-                if [[ -v $LITMUS ]]; then
-                    echo "${input[$i]}" | numactl $numa_arg0 taskset -c $core $prefix/${bench[$i]} ${bench[$i]} $maxJobs $core $core_two ${bench[$j]} $runID-$userRunID-A 1 & PID1=$!;
-                    echo "${input[$j]}" | numactl $numa_arg1 taskset -c $core_two $prefix/${bench[$j]} ${bench[$j]} $maxJobs $core_two $core ${bench[$i]} $runID-$userRunID-B 1 & PID2=$!;
+                if [[ -v LITMUS ]]; then
+                    # echo "numactl $numa_arg0 taskset -c $core $prefix/${bench[$i]} ${bench[$i]} $maxJobs $core $core_two ${bench[$j]} $runID-$userRunID-A 1 $PERIOD 1 0 & PID1=$!;"
+                    # echo "numactl $numa_arg1 taskset -c $core_two $prefix/${bench[$j]} ${bench[$j]} $maxJobs $core_two $core ${bench[$i]} $runID-$userRunID-B 1 $PERIOD 1 0 & PID2=$!;"
+                    echo "${input[$i]}" | numactl $numa_arg0 taskset -c $core $prefix/${bench[$i]} ${bench[$i]} $maxJobs $core $core_two ${bench[$j]} $runID-$userRunID-A 1 $PERIOD 1 0 & PID1=$!;
+                    echo "${input[$j]}" | numactl $numa_arg1 taskset -c $core_two $prefix/${bench[$j]} ${bench[$j]} $maxJobs $core_two $core ${bench[$i]} $runID-$userRunID-B 1 $PERIOD 1 0 & PID2=$!;
+                    # sudo /home/ae/liblitmus/release_ts
                 else
                     echo "${input[$i]}" | chrt -r 97 numactl $numa_arg0 taskset -c $core $prefix/${bench[$i]} ${bench[$i]} $maxJobs $core $core_two ${bench[$j]} $runID-$userRunID-A 1 & PID1=$!;
                     echo "${input[$j]}" | chrt -r 97 numactl $numa_arg1 taskset -c $core_two $prefix/${bench[$j]} ${bench[$j]} $maxJobs $core_two $core ${bench[$i]} $runID-$userRunID-B 1 & PID2=$!;
@@ -377,7 +398,7 @@ for (( i = 0; i < ${#bench[@]} ; i++ )); do
                 wait $PID1 $PID2
             else
                 # No synchronization between pairs - original soft real-time SMT approach
-                if [[ -v $LITMUS ]]; then
+                if [[ -v LITMUS ]]; then
                     echo "${input[$j]}" | numactl $numa_arg0 taskset -c $core $prefix/${bench[$j]} ${bench[$j]} -1 $core NULL 0 & PID1=$!;
                     echo "${input[$i]}" | numactl $numa_arg1 taskset -c $core_two $prefix/${bench[$i]} ${bench[$i]}"+"${bench[$j]} $maxJobs $core_two $runID-$userRunID 1 & PID2=$!;
                 else