1 files changed, 114 insertions, 205 deletions

diff --git a/run_case_study_dag.py b/run_case_study_dag.py
index 0b2f61c..f098e9e 100755
--- a/run_case_study_dag.py
+++ b/run_case_study_dag.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#/usr/bin/python3
 # Make sure to run this as root!!!!!
 import os
 import sys
@@ -7,22 +7,30 @@ import csv
 import time
 import subprocess
 
-A_SUITE = 1
-A_BIN = 2
-A_CRIT = 3
-A_PERIOD = 5
 
-P_CORE = 0
-P_CRIT = 1
-P_T1_ID = 2
-P_T2_ID = 5
+# Single tasks:
+# 0, binary_name, task_name, iterations, my_core, runID, save?, period, criticality, phase
+# Paired tasks:
+# 1, binary_name, task_name, iterations, my_core, runID, save?, period, criticality, phase, other_binary_name, other_task_name
 
-T_ID = 0
-T_BIN = 1
-T_PERIOD = 2
-T_CCX = 3
 
-CRIT_LEVEL_C = 2
+binary_path = "./SD-VBS/dag_binaries/"
+stderr_file = open("./deadline_misses", 'w+')
+
+BINARY_NAME = 1
+TASK_NAME = 2
+NUM_ITERS = 3
+CORE_NUM = 4
+RUN_ID = 5
+SAVE_RESULT = 6
+PERIOD = 7
+CRT_LEVEL = 8
+PHASE= 9
+
+OTHER_BINARY_NAME = 10
+OTHER_TASK_NAME = 11
+# OTHER_CORE_NUM = 12
+# PAIR_ID = 12
 
 all_pids=[]
 def run(command):
@@ -56,215 +64,116 @@ def main(pathName):
     # Each list represents the parameters for a task as:
     # [id, suite, binary name, criticality level (0-base), pet us (unused), period ms, wss (unused)]
     all_tasks = []
-    # List of lists
-    # Each list represents the parameters for a pairing as:
-    # [core, criticality level (0-base), task 1 ID, task 1 name (unused), task 1 period, task 2 ID, task 2 name, task 2 period]
-    # if task 1 ID = task 2 ID, it's not actually a pair at all
-    levelAB = []
-    levelC = []
-    levelC_s = []
+   
     input_cmd = {}
     # Load input command for each binary
-    with open("baseline/tacleNames.txt") as f:
-        for benchName in f:
-            # TACLeBench doesn't need inputs
-            input_cmd[benchName.strip()] = "echo ' '"
+    
     with open("SD-VBS/sd-vbsNames.txt") as f:
         for line in f:
             name, cmd = line.split(maxsplit=1)
             input_cmd[name.replace("./", "")] = cmd.replace("./", "./SD-VBS/").strip()
-    with open("dis/dis2MbInNames.txt") as f:
-        for line in f:
-            name, cmd = line.split(maxsplit=1)
-            input_cmd[name.replace("./", "")] = cmd.replace("./", "./dis/").strip()
+    # for k in input_cmd:
+    #     print(k, input_cmd[k])
+    # return 1
 
+    task_launches = []
+    max_core = 0
     # Load task specifications
-    with open(pathName+"/all_tasks.csv", "r") as csv_file:
-        csv_reader = csv.reader(csv_file, delimiter = ',')
-        line = 0
-        for row in csv_reader:
-            if line > 0:
-                all_tasks.append(row)
-            line += 1 
-    with open(pathName+"/levelAB_pairs.csv", "r") as csv_file:
-        csv_reader = csv.reader(csv_file, delimiter = ',')
-        line = 0
-        for row in csv_reader:
-            if line > 0:
-                levelAB.append(row)
-            line += 1
-    with open(pathName+"/levelC_threads.csv", "r") as csv_file:
-        csv_reader = csv.reader(csv_file, delimiter = ',')
-        line = 0
-        ccx = "0"
-        threaded = True
-        for row in csv_reader:
-            if(len(row) < 3):
-                continue
-            # Start of a cluster - read definition
-            if(row[0] == "threaded" or row[0] == "solo"):
-                threaded = row[0] == "threaded"
-                if(row[1] == "4"):
-                    ccx = "1"
-                else:
-                    ccx = "0"
-                continue
-            # Start of a thread speficication
-            if(row[0] != "task id" and row[0] != ""):
-                row.append(ccx)
-                if(threaded):
-                    row.append("t")
-                else:
-                    row.append("s")
-                levelC.append(row)
-            line += 1
+    with open(pathName, "r") as file:
+        for line in file:
+            parameters = line.split(",")
+            task_launches.append(parameters)
+            core_num = int(parameters[CORE_NUM]) % 16
+            if max_core < core_num:
+                max_core = core_num
+            # if parameters[0] == '1':
+            #     other_core_num = int(parameters[OTHER_CORE_NUM]) % 16
+            #     if other_core_num > max_core:
+            #         max_core = other_core_num
+
+    core_count = max_core+1
+    # print(parameters)
+
     ### Allocate Cache Ways ###
-    run('mount -t resctrl resctrl /sys/fs/resctrl')
+    run('mount -t resctrl resctrl /sys/fs/resctrl') 
 #    run('echo "L3:0=0000,1=0000,2=0000,3=0000" > /sys/fs/resctrl/schemata')
-    with open(pathName+"/l3alloc.csv", "r") as csv_file:
-        csv_reader = csv.reader(csv_file, delimiter = ',')
-        line = 0
-        ccx = 0
-        for row in csv_reader:
-            if line > 0:
-                core = int(row[0])
-                way_AB = int(row[1])
-                way_C = int(row[3])
-                # Level C allocation
-                if(core == 1):
-                    run("mkdir -p /sys/fs/resctrl/level-c-ccx-0")
-                    run('echo "L3:0=' + ("%0.4x" % (int("1"*way_C, 2))) + ';1=0000;2=0000;3=0000" > /sys/fs/resctrl/level-c-ccx-0/schemata')
-
-                if(core == 4):
-                    run("mkdir -p /sys/fs/resctrl/level-c-ccx-1")
-                    run('echo "L3:0=0000;1=' + ("%0.4x" % (int("1"*way_C, 2))) + ';2=0000;3=0000" > /sys/fs/resctrl/level-c-ccx-1/schemata')
-                run('mkdir -p /sys/fs/resctrl/level-ab-core-' + str(core))
-                if(core < 4):
-                    run('echo "L3:0=' + ("%0.4x" % (int("1"*way_AB + "0"*(16-way_AB), 2))) + ';1=0000;2=0000;3=0000" > /sys/fs/resctrl/level-ab-core-' + str(core) + '/schemata')
-                else:
-                    run('echo "L3:0=0000;1=' + ("%0.4x" % (int("1"*way_AB + "0"*(16-way_AB), 2))) + ';2=0000;3=0000" > /sys/fs/resctrl/level-ab-core-' + str(core) + '/schemata')
-            line += 1
-    ### Cleanup Old State ###
+    # for core in range(16):
+    #     run("mkdir -p /sys/fs/resctrl/core-{}".format(core))
+    #     ccx = core // 4
+    #     in_ccx = core % 4
+    #     mask = "0000"
+    #     mask = mask[:in_ccx] +'f'+ mask[in_ccx+1:]
+    #     if ccx == 0:
+    #         run('echo "L3:0=' + mask + ';1=0000;2=0000;3=0000" > /sys/fs/resctrl/core-{}/schemata'.format(core))
+    #     if ccx == 1:
+    #         run('echo "L3:0=0000;1='  + mask + ';2=0000;3=0000" > /sys/fs/resctrl/core-{}/schemata'.format(core))
+    #     if ccx == 2:
+    #         run('echo "L3:0=0000;1=0000;2='+ mask +';3=0000" > /sys/fs/resctrl/core-{}/schemata'.format(core))
+    #     if ccx == 3:
+    #         run('echo "L3:0=0000;1=0000;2=0000;3=' + mask + '" > /sys/fs/resctrl/core-{}/schemata'.format(core))
+
+    # return 1
     run("rm -rf /dev/shm/*")
-    pairID = 0
-    ### Dispatch all the Level-A and -B paired and unpaired tasks ###
-    for pairing in levelAB:
-        task1 = int(pairing[P_T1_ID])
-        task2 = int(pairing[P_T2_ID])
-        # Lookup periods and binary location
-        name1 = all_tasks[task1][A_BIN]
-        name2 = all_tasks[task2][A_BIN]
-        period1 = all_tasks[task1][A_PERIOD]
-        period2 = all_tasks[task2][A_PERIOD]
-        suite1 = all_tasks[task1][A_SUITE]
-        suite2 = all_tasks[task2][A_SUITE]
-        core = pairing[P_CORE]
-        criticality = pairing[P_CRIT]
-        binary = ""
-        binary1 = ""
-        binary2 = ""
-        arg = ""
-        # If the IDs match, this isn't a pair at all
-        if task1 == task2:
-            if suite1 == "TACLe":
-                binary = "./baseline/bin/" + name1
-            elif suite1 == "SD-VBS":
-                binary = "./SD-VBS/" + name1 + "_qcif"
-            elif suite1 == "DIS":