1 files changed, 36 insertions, 2 deletions

diff --git a/parse_exps.py b/parse_exps.py
index 87d0783..6a07ebc 100755
--- a/parse_exps.py
+++ b/parse_exps.py
@@ -16,6 +16,8 @@ from optparse import OptionParser
 from parse.point import ExpPoint
 from parse.tuple_table import ColMap,TupleTable
 
+# TODO: make 2-level graph optional
+
 def parse_args():
     # TODO: convert data-dir to proper option, clean 'dest' options
     parser = OptionParser("usage: %prog [options] [data_dir]...")
@@ -107,6 +109,17 @@ def gen_exp_data(exp_dirs, base_conf, col_map, force):
     sys.stderr.write('\n')
     return (plain_exps, scaling_bases)
 
+PAGE_SIZE=4092
+PROCS=4
+def compute_loops(util, dist, cost, wss):
+    scale = PROCS * dist / util
+    cost *= scale
+    pages = wss / PAGE_SIZE
+    per_loop = .023 * pages
+    loops = int(cost / per_loop) + 1
+    loops = loops + (5 - loops % 5)
+    return loops
+
 def main():
     opts, args = parse_args()
 
@@ -129,8 +142,14 @@ def main():
         for param in opts.ignore.split(","):
             col_map.try_remove(param)
 
+    # Begin coupling
+    loop_map = copy.deepcopy(col_map)
+    loop_map.try_remove('num_tasks')
+    loop_map.force_add('loops')
+
     base_table   = TupleTable(base_map) # For tracking 'base' experiments
     result_table = TupleTable(col_map)  # For generating output
+    loop_table   = TupleTable(loop_map) # For by-reuse scaling factor
 
     # Used to find matching scaling_base for each experiment
     for base in scaling_bases:
@@ -153,8 +172,17 @@ def main():
                 base = base_table.get_exps(base_params)[0]
 
             # Write deadline misses / tardiness into result
-            st.extract_sched_data(exp.data_files.st, result,
-                                  base.data_files.st if base else None)
+            sret = st.extract_sched_data(exp.data_files.st, result,
+                                           base.data_files.st if base else None)
+            # Terrible
+            if sret:
+                for wcet, points in sret.wcet_scales.iteritems():
+                    loop_params = copy.deepcopy(exp.params)
+                    # loops = compute_loops(sret.util, float(exp.params['hrt_dist']),
+                    #                       wcet, float(exp.params['wss']))
+                    # loop_params['loops'] = loops# * int(exp.params['wss'])
+                    for point in points:
+                        loop_table.add_exp(loop_params, point)
 
         result_table.add_exp(exp.params, result)
 
@@ -168,14 +196,20 @@ def main():
         sh.rmtree(opts.out)
 
     result_table.reduce()
+    loop_table.reduce()
 
     sys.stderr.write("Writing result...\n")
     if opts.write_map:
         # Write summarized results into map
         result_table.write_map(opts.out)
+        if base_conf:
+            loop_table.write_map(opts.out)
     else:
         # Write out csv directories for all variable params
         result_table.write_csvs(opts.out)
+        if base_conf:
+            loop_table.write_csvs(opts.out)
+
 
 if __name__ == '__main__':
     main()