Merge branch 'wip-ecrts14-pgm' of ssh://rtsrv.cs.unc.edu/home/litmus/experiment-scripts into wip-ecrts14-pgm

Conflicts:
	gen/edf_generators.py
	gen/generator.py

1 files changed, 8 insertions, 2 deletions

diff --git a/gen/edf_generators.py b/gen/edf_generators.py
index 0e5cb03..e8507f6 100644
--- a/gen/edf_generators.py
+++ b/gen/edf_generators.py
@@ -85,6 +85,9 @@ class EdfPgmGenerator(gen.Generator):
                 gen.Generator._dist_option('depth_factor', ['pipeline'],
                                            ecrts14.NAMED_HEIGHT_FACTORS,
                                            'Depth of graphs.'),
+                gen.Generator._dist_option('clustering', ['L1', 'L2', 'L3', 'ALL'],
+                                            {},
+                                           'Clustering configurations'),
                 gen.Generator._dist_option('partitions', ['no_cache', 'parallel', 'cache_aware'],
                                            PARTITION_METHOD,
                                            'Partition methods.'),
@@ -108,7 +111,7 @@ class EdfPgmGenerator(gen.Generator):
                 gen.Generator._dist_option('task_util', ['uni-medium'],
                                            NAMED_UTILIZATIONS,
                                            'Task utilization.'),
-                gen.Generator._dist_option('polluters', False,
+                gen.Generator._dist_option('polluters', [False, True],
                                            {},
                                            'Polluters.'),
                 gen.Generator._dist_option('job_splitting', True,
@@ -247,6 +250,8 @@ class CflSplitPgmGenerator(EdfPgmGenerator):
         else:
             assert False
 
+        exp_params['fan_in_cap'] = int(exp_params['fan_in_cap'])
+
         dp.nr_clusters = cpus / cluster_sz
         assert dp.nr_clusters * cluster_sz == cpus
 
@@ -261,6 +266,7 @@ class CflSplitPgmGenerator(EdfPgmGenerator):
         # compute split factor
         working_ts = ts
         partitions = get_partitions(working_ts, dp.nr_clusters, cluster_sz)
-        is_srt_sched = split.compute_splits_nolock(overheads, False, working_ts, partitions, bypass_split = not dp.job_splitting)
+        do_splits = dp.job_splitting == 'True'
+        is_srt_sched = split.compute_splits_nolock(overheads, False, working_ts, partitions, bypass_split = not do_splits)
 
         return True, working_ts