updated the cost model suite to the bhir-paper

bh107 · Feb 19, 2016 · 54a88c8 · 54a88c8
1 parent cb25671
commit 54a88c8
Showing 1 changed file with 43 additions and 8 deletions.
diff --git a/suites/fuse_paper_cost_models.py b/suites/fuse_paper_cost_models.py
@@ -1,11 +1,6 @@
 from benchpress.default import *
 import copy
 
-scripts_cpu = [
-    ('Alain Example',  'alain',  '--size=100000000*10'),
-    ('Alain Counterexample',  'alain_counterexample',  '--size=50000000*10'),
-]
-
 def fuse_cache(value):
     envs = ["BH_SINGLETON_FUSE_CACHE", "BH_TOPOLOGICAL_FUSE_CACHE",\
             "BH_GREEDY_FUSE_CACHE", "BH_OPTIMAL_FUSE_CACHE", "BH_GENTLE_FUSE_CACHE"]
@@ -14,6 +9,21 @@ def fuse_cache(value):
         ret[env] = value
     return ret
 
+scripts_cpu_alain = [
+    ('Alain Example',  'alain',  '--size=100000000*10'),
+]
+
+scripts_cpu_alain_fixed = [
+    ('Alain Example Fixed',  'alain',  '--size=100000000*10'),
+]
+
+scripts_cpu_calain = [
+    ('Alain Counterexample',  'alain_counterexample',  '--size=50000000*10'),
+]
+
+MaxShare_fixed_fusion = "2:1+2,2:6+7,2:8+9,2:10+11,2:12+13,2:5+6,2:5+8,2:5+10"
+TmpElem_fixed_fusion = "2:1+2,2:6+7,2:8+9,2:10+11,2:12+13"
+
 stack_cpu = [
     [('default',    'bridge',       None)],
     [('bccon',      'bccon',        None)],
@@ -32,14 +42,39 @@ def fuse_cache(value):
     [('pricer',     'pricer',       None)],
     [('cpu',        'cpu',  {"BH_CPU_JIT_LEVEL": "3", "OMP_NUM_THREADS":"4"})],
 ]
+stack_cpu_alain_fixed = copy.deepcopy(stack_cpu)
+stack_cpu_alain_fixed[2] =\
+[
+    ('UniqueViews', 'bcexp', {'BH_PRICE_MODEL':'unique_views'}),
+    ('TmpElem',     'bcexp', {'BH_PRICE_MODEL':'temp_elemination',
+                              'BH_FUSER_OPTIMAL_MERGE':TmpElem_fixed_fusion}),
+    ('MaxShare',    'bcexp', {'BH_PRICE_MODEL':'max_share',
+                              'BH_FUSER_OPTIMAL_MERGE':MaxShare_fixed_fusion}),
+    ('AmosRobinson','bcexp', {'BH_PRICE_MODEL':'amos',
+                              'BH_FUSER_OPTIMAL_MERGE':MaxShare_fixed_fusion}),
+]
+
+stack_cpu_calain = copy.deepcopy(stack_cpu)
 
-suite_cpu = {
-    'scripts': scripts_cpu,
+suite_cpu_alain = {
+    'scripts': scripts_cpu_alain,
     'launchers':  [python_bohrium],
     'bohrium': stack_cpu
 }
+suite_cpu_alain_fixed = {
+    'scripts': scripts_cpu_alain_fixed,
+    'launchers':  [python_bohrium],
+    'bohrium': stack_cpu_alain_fixed
+}
+suite_cpu_calain = {
+    'scripts': scripts_cpu_calain,
+    'launchers':  [python_bohrium],
+    'bohrium': stack_cpu_calain
+}
 
 suites = [
-    suite_cpu,
+    suite_cpu_alain,
+    suite_cpu_alain_fixed,
+    suite_cpu_calain,
 ]