...

bh107 · Apr 3, 2015 · fc8c2d4 · fc8c2d4
1 parent 5956cd5
commit fc8c2d4
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/suites/black_scholes_cpu.py b/suites/black_scholes_cpu.py
@@ -0,0 +1,32 @@
+from default import *
+
+scripts = [
+    ('Black Scholes', 'black_scholes', '--size=5000000*10'),
+]
+
+fusion_1_32 = [
+    ('fusion_01',   'cpu', {'BH_VE_CPU_JIT_FUSION': '1',    'OMP_NUM_THREADS': '1'  }),
+    ('fusion_02',   'cpu', {'BH_VE_CPU_JIT_FUSION': '1',    'OMP_NUM_THREADS': '2'  }),
+    ('fusion_04',   'cpu', {'BH_VE_CPU_JIT_FUSION': '1',    'OMP_NUM_THREADS': '4'  }),
+    ('fusion_08',   'cpu', {'BH_VE_CPU_JIT_FUSION': '1',    'OMP_NUM_THREADS': '8'  }),
+    ('fusion_16',   'cpu', {'BH_VE_CPU_JIT_FUSION': '1',    'OMP_NUM_THREADS': '16' }),
+    ('fusion_32',   'cpu', {'BH_VE_CPU_JIT_FUSION': '1',    'OMP_NUM_THREADS': '32' }),
+]
+
+omp_1_32 = [
+    ('omp_01',      'cpu', {'BH_VE_CPU_JIT_FUSION': '0',    'OMP_NUM_THREADS': '1'  }),
+    ('omp_02',      'cpu', {'BH_VE_CPU_JIT_FUSION': '0',    'OMP_NUM_THREADS': '2'  }),
+    ('omp_04',      'cpu', {'BH_VE_CPU_JIT_FUSION': '0',    'OMP_NUM_THREADS': '4'  }),
+    ('omp_08',      'cpu', {'BH_VE_CPU_JIT_FUSION': '0',    'OMP_NUM_THREADS': '8'  }),
+    ('omp_16',      'cpu', {'BH_VE_CPU_JIT_FUSION': '0',    'OMP_NUM_THREADS': '16' }),
+    ('omp_32',      'cpu', {'BH_VE_CPU_JIT_FUSION': '0',    'OMP_NUM_THREADS': '32' }),
+] 
+
+suites = [
+    {'bridges': [python_numpy],     'scripts': scripts, 'engines': fusion_1_32 + omp_1_32, 'filters':  [('complete_reduction', 'complete_reduction', None)]},
+    {'bridges': [cpp11_bxx],        'scripts': scripts, 'engines': fusion_1_32 + omp_1_32, 'filters':  [('complete_reduction', 'complete_reduction', None)]},
+    {'bridges': [cpp11_arma],       'scripts': scripts, 'engines': omp_1_32},
+    {'bridges': [python_bohrium],   'scripts': scripts}, 
+    {'bridges': [cpp11_blitz],      'scripts': scripts},
+]
+
diff --git a/suites/default.py b/suites/default.py
@@ -32,7 +32,7 @@
 cpp11_blitz = ('CPP/Blitz', './`bp_info --benchmarks`/{script}/cpp11_blitz/bin/{script} {args}', None)
 cpp11_eigen = ('CPP/Eigen', './`bp_info --benchmarks`/{script}/cpp11_eigen/bin/{script} {args}', None)
 cpp11_boost = ('CPP/Boost', './`bp_info --benchmarks`/{script}/cpp11_boost/bin/{script} {args}', None)
-cpp11_bohrium = ('CPP/BH',  './`bp_info --benchmarks`/{script}/cpp11_bxx/bin/{script} {args}', None)
+cpp11_bxx   = ('CPP/BH',    './`bp_info --benchmarks`/{script}/cpp11_bxx/bin/{script} {args}', None)
 
 # C#