1 files changed, 50 insertions, 21 deletions

diff --git a/run_case_study_dag.py b/run_case_study_dag.py
index 516458f..d4f12e1 100755
--- a/run_case_study_dag.py
+++ b/run_case_study_dag.py
@@ -17,6 +17,8 @@ import subprocess
 binary_path = "./SD-VBS/dag_binaries/"
 stderr_file = open("./deadline_misses", 'w+')
 
+LITMUS = True
+
 BINARY_NAME = 1
 TASK_NAME = 2
 NUM_ITERS = 3
@@ -98,13 +100,17 @@ def main(pathName):
         mask = "0000"
         mask = mask[:in_ccx] +'f'+ mask[in_ccx+1:]
         if ccx == 0:
+            run('echo {} > /sys/fs/resctrl/core-{}/cpus_list'.format(core, core))
             run('echo "L3:0=' + mask + ';1=0000;2=0000;3=0000" > /sys/fs/resctrl/core-{}/schemata'.format(core))
             # run('echo "L3:0=ffff;1=0000;2=0000;3=0000" > /sys/fs/resctrl/core-{}/schemata'.format(core))
         if ccx == 1:
+            run('echo {} > /sys/fs/resctrl/core-{}/cpus_list'.format(core, core))
             run('echo "L3:0=0000;1=' + mask + ';2=0000;3=0000" > /sys/fs/resctrl/core-{}/schemata'.format(core))
         if ccx == 2:
+            run('echo {} > /sys/fs/resctrl/core-{}/cpus_list'.format(core, core))
             run('echo "L3:0=0000;1=0000;2=' + mask + ';3=0000" > /sys/fs/resctrl/core-{}/schemata'.format(core))
         if ccx == 3:
+            run('echo {} > /sys/fs/resctrl/core-{}/cpus_list'.format(core, core))
             run('echo "L3:0=0000;1=0000;2=0000;3=' + mask + '" > /sys/fs/resctrl/core-{}/schemata'.format(core))
 
     # return 1
@@ -120,9 +126,10 @@ def main(pathName):
         core_num =launch[CORE_NUM].strip()
         run_id = launch[RUN_ID].strip()
         save_result = launch[SAVE_RESULT].strip()
-        period = launch[PERIOD].strip()
-        crt_level = launch[CRT_LEVEL].strip()
-        phase = launch[PHASE].strip()
+        if LITMUS:
+            period = launch[PERIOD].strip()
+            crt_level = launch[CRT_LEVEL].strip()
+            phase = launch[PHASE].strip()
 
 
         phys_core = int(core_num) % 16
@@ -131,13 +138,20 @@ def main(pathName):
             return 1
         # single tasks
         if launch[0] == '0':
-            # binary =  binary_path + binary_name + "_single"
-            binary =  binary_path + binary_name + "_single_no_litmus"
-            # Arg format: <unique name> <num_iters> <core> <NULL runID> <save?> <period> <crit lvl>
-            # arg = " " + task_name  + " " + num_iters +" " +  core_num +" " +  run_id +" " + save_result+" " + period +" " +  crt_level + " "+ phase
-            arg = " " + task_name  + " " + num_iters +" " +  core_num +" " +  run_id +" " + save_result+" "     
-            # print(input_cmd[binary_name] + " | numactl --interleave=all " + binary + arg)
-            bench_tsk = subprocess.Popen(input_cmd[binary_name] + " | numactl --interleave=all " + binary + arg, shell=True, executable='/bin/bash', stderr=stderr_file)
+            if LITMUS:
+                binary =  binary_path + binary_name + "_single"
+                # Arg format: <unique name> <num_iters> <core> <NULL runID> <save?> <period> <crit lvl> <phase>
+                arg = " " + task_name  + " " + num_iters +" " +  core_num +" " +  run_id +" " + save_result+" " + period +" " +  crt_level + " "+ phase
+                bench_tsk = subprocess.Popen(input_cmd[binary_name] + " | numactl --interleave=all " + binary + arg, shell=True, executable='/bin/bash', stderr=stderr_file)
+            else:
+                # Arg format: <unique name> <num_iters> <core> <NULL runID> 
+                binary =  binary_path + binary_name + "_single_no_litmus"
+                arg = " " + task_name  + " " + num_iters +" " +  core_num +" " +  run_id +" " + save_result+" "     
+                bench_tsk = subprocess.Popen(input_cmd[binary_name] + " |  numactl --interleave=all taskset -c " +  core_num + " " + binary + arg, shell=True, executable='/bin/bash', stderr=stderr_file)
+            
+            # print(input_cmd[binary_name] + " | numactl --interleave=all " + binary + arg) 
+            # print(binary)
+            # print(arg)
             pid_str = ID2PID(binary + " " + task_name)
             if not pid_str:
                 print("Unable to launch {} as a solo task! Exiting...".format(task_name))
@@ -154,15 +168,24 @@ def main(pathName):
             if ID2PID(other_task_name):
                 print("ERROR: Task Name {} is already running! Did you end the previous case study?".format(other_task_name))
                 return 1
-            binary =  binary_path + binary_name + "_pair"
-            other_binary =  binary_path + other_binary_name + "_pair"
-            # Arg format: <unique name> <num iters> <core> <0 other core> <other name> <runID> <save?> <pairID> <period> <crit lvl>
-            arg1 = " " + task_name  + " " + num_iters +" " +  core_num +" " + other_core_num+" "+ other_task_name+" "+ run_id +" " + save_result+" " +str(pairID) +" "+ period +" " +  crt_level +" "+phase
-            arg2 = " " + other_task_name  + " " + num_iters +" " +  other_core_num +" " + core_num+" "+ task_name+" "+ run_id +" " + save_result+" " +str(pairID) +" "+ period +" " +  crt_level+" " +phase
-            # print(input_cmd[binary_name] + " | numactl --membind=0 " + binary + arg1)
-            # print(input_cmd[other_binary_name] + " | numactl --membind=1 " + other_binary + arg2)
-            bench_tsk1 = subprocess.Popen(input_cmd[binary_name] + " | numactl --membind=0 " + binary + arg1, shell=True, executable='/bin/bash', stderr=stderr_file)
-            bench_tsk2 = subprocess.Popen(input_cmd[other_binary_name] + " | numactl --membind=1 " + other_binary + arg2, shell=True, executable='/bin/bash', stderr=stderr_file)
+            if LITMUS:
+                binary =  binary_path + binary_name + "_pair"
+                other_binary =  binary_path + other_binary_name + "_pair"
+                # Arg format: <unique name> <num iters> <core> <0 other core> <other name> <runID> <save?> <pairID> <period> <crit lvl> <phase>
+                arg1 = " " + task_name  + " " + num_iters +" " +  core_num +" " + other_core_num+" "+ other_task_name+" "+ run_id +" " + save_result+" " +str(pairID) +" "+ period +" " +  crt_level +" "+phase
+                arg2 = " " + other_task_name  + " " + num_iters +" " +  other_core_num +" " + core_num+" "+ task_name+" "+ run_id +" " + save_result+" " +str(pairID) +" "+ period +" " +  crt_level+" " +phase
+                # print(input_cmd[binary_name] + " | numactl --membind=0 " + binary + arg1)
+                # print(input_cmd[other_binary_name] + " | numactl --membind=1 " + other_binary + arg2)
+                bench_tsk1 = subprocess.Popen(input_cmd[binary_name] + " | numactl --membind=0 " + binary + arg1, shell=True, executable='/bin/bash', stderr=stderr_file)
+                bench_tsk2 = subprocess.Popen(input_cmd[other_binary_name] + " | numactl --membind=1 " + other_binary + arg2, shell=True, executable='/bin/bash', stderr=stderr_file)
+            else:
+                binary =  binary_path + binary_name + "_pair_no_litmus"
+                other_binary =  binary_path + other_binary_name + "_pair_no_litmus"
+                 # Arg format: <unique name> <num iters> <core> <0 other core> <other name> <runID> <save?> <pairID> 
+                arg1 = " " + task_name  + " " + num_iters +" " +  core_num +" " + other_core_num+" "+ other_task_name+" "+ run_id +" " + save_result+" " +str(pairID)
+                arg2 = " " + other_task_name  + " " + num_iters +" " +  other_core_num +" " + core_num+" "+ task_name+" "+ run_id +" " + save_result+" " +str(pairID)
+                bench_tsk1 = subprocess.Popen(input_cmd[binary_name] + " | numactl --membind=0 taskset -c " +  core_num + " " + binary + arg1, shell=True, executable='/bin/bash', stderr=stderr_file)
+                bench_tsk2 = subprocess.Popen(input_cmd[other_binary_name] + " | numactl --membind=1 taskset -c " +  core_num + " " +  other_binary + arg2, shell=True, executable='/bin/bash', stderr=stderr_file)
             # print(binary + " " + task_name,other_binary + " " +other_task_name)
             pid1_str = ID2PID(binary + " " + task_name)
             pid2_str = ID2PID(other_binary + " " +other_task_name)
@@ -175,13 +198,19 @@ def main(pathName):
             pairID += 1
 
 if __name__ == "__main__":
-    if len(sys.argv) < 2:
-        print("Usage: " + sys.argv[0] + " <task sets path>")
+    if len(sys.argv) < 3:
+        print("Usage: " + sys.argv[0] + " <task sets path> <LITMUS>")
         exit(1)
     if os.geteuid() != 0:
         print("You must run this script as root to enable cache isolation and access LITMUS-RT.")
         exit(1)
     pathName = sys.argv[1]
+    if sys.argv[2] == '1':
+        LITMUS =True
+    else:
+        LITMUS = False
+    print("Litmus on ? " + str(LITMUS))
+    # exit(0)
     err = main(pathName)
     input("Done. Waiting for termination signal...")
     exit(err)