13 files changed, 222 insertions, 25 deletions

diff --git a/SD-VBS/benchmarks/stitch/src/c/script_stitch.c b/SD-VBS/benchmarks/stitch/src/c/script_stitch.c
index 9310048..472e231 100644
--- a/SD-VBS/benchmarks/stitch/src/c/script_stitch.c
+++ b/SD-VBS/benchmarks/stitch/src/c/script_stitch.c
@@ -23,12 +23,6 @@ int main(int argc, char* argv[])
     cols = Icur->width;
 
     for_each_job {
-        iFreeHandle(Icur);
-        fFreeHandle(v);
-        fFreeHandle(interestPnts);
-        fFreeHandle(int1);
-        fFreeHandle(int2);
-        fFreeHandle(Fcur);
         v = harris(Icur);
         interestPnts = getANMS(v, 24);
         int1 = fMallocHandle(interestPnts->height, 1);
@@ -40,6 +34,12 @@ int main(int argc, char* argv[])
         }
 
         Fcur = extractFeatures(Icur, int1, int2);  
+        iFreeHandle(Icur);
+        fFreeHandle(v);
+        fFreeHandle(interestPnts);
+        fFreeHandle(int1);
+        fFreeHandle(int2);
+        fFreeHandle(Fcur);
     }
 
 #ifdef CHECK
diff --git a/all_pairs/bin/anagram b/all_pairs/bin/anagram
new file mode 100755
index 0000000..4d3b54e
--- /dev/null
+++ b/all_pairs/bin/anagram
diff --git a/all_pairs/bin/audiobeam b/all_pairs/bin/audiobeam
new file mode 100755
index 0000000..5d00fa1
--- /dev/null
+++ b/all_pairs/bin/audiobeam
diff --git a/all_pairs/bin/g723_enc b/all_pairs/bin/g723_enc
new file mode 100755
index 0000000..7ab3acb
--- /dev/null
+++ b/all_pairs/bin/g723_enc
diff --git a/all_pairs/bin/huff_dec b/all_pairs/bin/huff_dec
new file mode 100755
index 0000000..b638a87
--- /dev/null
+++ b/all_pairs/bin/huff_dec
diff --git a/baseline/bin/anagram b/baseline/bin/anagram
new file mode 100755
index 0000000..be58ec0
--- /dev/null
+++ b/baseline/bin/anagram
diff --git a/baseline/bin/audiobeam b/baseline/bin/audiobeam
new file mode 100755
index 0000000..cf776b4
--- /dev/null
+++ b/baseline/bin/audiobeam
diff --git a/baseline/bin/g723_enc b/baseline/bin/g723_enc
new file mode 100755
index 0000000..7289895
--- /dev/null
+++ b/baseline/bin/g723_enc
diff --git a/baseline/bin/huff_dec b/baseline/bin/huff_dec
new file mode 100755
index 0000000..07d4d32
--- /dev/null
+++ b/baseline/bin/huff_dec
diff --git a/dis/sudo b/dis/sudo
new file mode 100644
index 0000000..134ad48
--- /dev/null
+++ b/dis/sudo
@@ -0,0 +1,180 @@
+2097152 -1 35 80
+
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+
+ 
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+1 1 22 1 c2 1 2d 0
+
+
diff --git a/extra.h b/extra.h
index 990d2e0..623cdcb 100644
--- a/extra.h
+++ b/extra.h
@@ -120,7 +120,7 @@ static void _rt_load_params_itrl(int argc, char **argv) {
     _rt_will_output = atoi(argv[7]);
     char *pairId;
     int end;
-    if (argc > 8) {
+    if (argc > 7) {
         pairId = argv[8];
         end = 9;
     } else {
diff --git a/run_case_study.py b/run_case_study.py
index f5a4f61..d2a3922 100644
--- a/run_case_study.py
+++ b/run_case_study.py
@@ -3,6 +3,13 @@ import sys
 import re
 import csv
 import subprocess
+<<<<<<< HEAD
+def run(command):
+    print(command)
+    os.system(command)
+
+=======
+>>>>>>> rtas20-wip
 def main():
     pathName = sys.argv[1]
     tacle_pairs_path = "./all_pairs"
@@ -48,7 +55,7 @@ def main():
                     ccx = "1"
                 else:
                     ccx = "0"
-            continue
+                continue
             if(row[0] != "task id" and row[0] != ""):
                 row.append(ccx)
                 if(threaded):
@@ -56,7 +63,9 @@ def main():
                 else:
                     row.append("s")
                 levelC.append(row)
-    #os.system('echo "L3:0=L3:0=0000,1=0000,2=0000,3=0000" > /sys/fs/resctrl/schemata')
+            line += 1
+    #os.system('mount -t resctrl resctrl /sys/fs/resctrl')
+    run('sudo echo "L3:0=0000,1=0000,2=0000,3=0000" > sudo /sys/fs/resctrl/schemata')
     
     with open(pathName+"/l3alloc.csv", "r") as csv_file:
         csv_reader = csv.reader(csv_file, delimiter = ',')
@@ -69,17 +78,19 @@ def main():
                 way_C = int(row[3])
                 # Level C allocation
                 if(core == 1):
-                    os.system("mkdir /sys/fs/resctrl/level-c-ccx-0")
-                    os.system('echo "L3:0=' + ("%0.4x" % (int("1"*way_C, 2))) + ',1=0000,2=0000,3=0000" > /sys/fs/resctrl/level-c-ccx-0/schemata')
+                    run("mkdir -p /sys/fs/resctrl/level-c-ccx-0")
+                    run('sudo echo "L3:0=' + ("%0.4x" % (int("1"*way_C, 2))) + ',1=0000,2=0000,3=0000" > sudo /sys/fs/resctrl/level-c-ccx-0/schemata')
                     
                 if(core == 4):
-                    os.system("mkdir /sys/fs/resctrl/level-c-ccx-1")
-                    os.system('echo "L3:0=0000, 1=' + ("%0.4x" % (int("1"*way_C, 2))) + ',2=0000,3=0000" > /sys/fs/resctrl/level-c-ccx-1/schemata')
-                os.system('mkdir /sys/fs/resctrl/level-ab-core-' + core)
+                    run("mkdir -p /sys/fs/resctrl/level-c-ccx-1")
+                    run('sudo echo "L3:0=0000, 1=' + ("%0.4x" % (int("1"*way_C, 2))) + ',2=0000,3=0000" > sudo /sys/fs/resctrl/level-c-ccx-1/schemata')
+                run('mkdir -p /sys/fs/resctrl/level-ab-core-' + str(core))
                 if(core < 4):    
-                    os.system('echo "L3:0=' + ("%0.4x" % (int("1"*way_C + "0"*(16-way_AB), 2))) + ',1=0000,2=0000,3=0000" > /sys/fs/resctrl/level-ab-core-' + core + '/schemata')
+                    run('sudo echo "L3:0=' + ("%0.4x" % (int("1"*way_AB + "0"*(16-way_AB), 2))) + ',1=0000,2=0000,3=0000" > sudo /sys/fs/resctrl/level-ab-core-' + str(core) + '/schemata')
                 else:    
-                    os.system('echo "L3:0=0000,1=' + ("%0.4x" % (int("1"*way_C + "0"*(16-way_AB), 2))) + ',2=0000,3=0000" > /sys/fs/resctrl/level-ab-core-' + core + '/schemata')
+                    run('sudo echo "L3:0=0000,1=' + ("%0.4x" % (int("1"*way_AB + "0"*(16-way_AB), 2))) + ',2=0000,3=0000" > sudo /sys/fs/resctrl/level-ab-core-' + str(core) + '/schemata')
+            line += 1
+    run("sudo rm -rf /dev/shm/*")
     pairID = 0
     i = 0
     for task in levelAB:
@@ -113,13 +124,14 @@ def main():
             else:
                 binary = dis_inputs[name1] + " | ./dis/" + name1 + arg
             proc = subprocess.open([binary + " &"], shell = True)
+            print(binary + " &" )
             pid = proc.pid
-            os.system("echo " + pid + " > /sys/fs/resctrl/level-ab-core-" + core + "/tasks")
+            run("sudo echo " + pid + " > sudo /sys/fs/resctrl/level-ab-core-" + core + "/tasks")
 
         else:
             pairID += 1
             arg1 =  " NULL -1 " + core + " 0 NULL NULL 0 " + str(pairID) + " " + period1 + " " + criticality
-            arg2 =  " NULL -1 " + str(int(core)+16) + " 0 NULL NULL 0 " + str(pairID) + " " + period1 + " " + criticality
+            arg2 =  " NULL -1 " + str(int(core)+16) + " 0 NULL NULL 0 " + str(pairID) + " " + period2 + " " + criticality
 
             if(suite1 == "TACLe"):
                 binary1 = "./all_pairs/bin/" + name1 +  arg1
@@ -127,18 +139,20 @@ def main():
             else:
                 binary1 =  dis_inputs[name1] + " | ./dis/" + name1 + "_all" + arg1
                 binary2 =  dis_inputs[name2] + " | ./dis/" + name2 + "_all" + arg2
-            proc1 = subprocess.Popen(["numactl --membind=0 " + binary1 + " &"], shell = True)
-            proc2 = subprocess.Popen(["numactl --membind=1 " + binary2 + " &"], shell = True)
+            proc1 = subprocess.Popen(["sudo numactl --membind=0 " + binary1 + " &"], shell = True)
+            proc2 = subprocess.Popen(["sudo numactl --membind=1 " + binary2 + " &"], shell = True)
+            print("sudo numactl --membind=0 " + binary1 + " &")
+            print("sudo numactl --membind=1 " + binary2 + " &")
             pid1 = proc1.pid
             pid2 = proc2.pid
 
-            os.system("echo " + str(pid1) + " > /sys/fs/resctrl/level-ab-core-" + core + "/tasks")
-            os.system("echo " + str(pid2) + " > /sys/fs/resctrl/level-ab-core-" + core + "/tasks")
-
+            run("sudo echo " + str(pid1) + " > sudo /sys/fs/resctrl/level-ab-core-" + core + "/tasks")
+            run("sudo echo " + str(pid2) + " > sudo /sys/fs/resctrl/level-ab-core-" + core + "/tasks")
+    #exit(1)
 
     for task in levelC:
         i+=1
-        if(i>6):
+        if(i>8):
             break
         tid = int(task[0])
         name = all_tasks[tid][2]
@@ -159,9 +173,11 @@ def main():
             binary = "./baseline/bin/" + name1 + arg
         else:
             binary = dis_inputs[name1] + " | ./dis/" + name1 + "_all" + arg
+
+        print(binary + " &")
         proc = subprocess.Popen([binary + " &"], shell = True)
         pid = proc.pid
-        os.system("echo " + str(pid) + " > /sys/fs/resctrl/level-ab-ccx-" + ccx + "/tasks")
+        run("sudo echo " + str(pid) + " > sudo /sys/fs/resctrl/level-ab-ccx-" + ccx + "/tasks")
     #os.system("/playpen/mc2/liblitmus/release_ts")
     #os.system("ls")
 if __name__ == "__main__":
diff --git a/sudo b/sudo
new file mode 100644
index 0000000..0713b91
--- /dev/null
+++ b/sudo
@@ -0,0 +1 @@
+101404 /sys/fs/resctrl/level-ab-ccx-1/tasks