diff options
| -rwxr-xr-x | tests/runner.py | 2 | ||||
| -rw-r--r-- | tests/test_benchmark.py | 13 |
2 files changed, 11 insertions, 4 deletions
diff --git a/tests/runner.py b/tests/runner.py index 72e940cb..494297db 100755 --- a/tests/runner.py +++ b/tests/runner.py @@ -352,7 +352,7 @@ process(sys.argv[1]) generated_libs.append(bc_file) return generated_libs - print >> sys.stderr, '<building and saving %s into cache> ' % cache_name, + print >> sys.stderr, '<building and saving %s into cache> ' % cache_name return Building.build_library(name, build_dir, output_dir, generated_libs, configure, configure_args, make, make_args, self.library_cache, cache_name, copy_project=True, env_init=env_init, native=native) diff --git a/tests/test_benchmark.py b/tests/test_benchmark.py index 625340ea..a2580521 100644 --- a/tests/test_benchmark.py +++ b/tests/test_benchmark.py @@ -90,7 +90,8 @@ class JSBenchmarker(Benchmarker): def build(self, parent, filename, args, shared_args, emcc_args, native_args, native_exec, lib_builder): self.filename = filename - if lib_builder: emcc_args = emcc_args + lib_builder('js', native=False, env_init={}) + llvm_root = self.env.get('LLVM') or LLVM_ROOT + if lib_builder: emcc_args = emcc_args + lib_builder('js_' + llvm_root, native=False, env_init=self.env) open('hardcode.py', 'w').write(''' def process(filename): @@ -120,10 +121,16 @@ process(sys.argv[1]) # Benchmarkers benchmarkers = [ - NativeBenchmarker('clang', CLANG_CC, CLANG), + #NativeBenchmarker('clang', CLANG_CC, CLANG), + #NativeBenchmarker('clang-3.2', os.path.join(LLVM_3_2, 'clang'), os.path.join(LLVM_3_2, 'clang++')), + #NativeBenchmarker('clang-3.3', os.path.join(LLVM_3_3, 'clang'), os.path.join(LLVM_3_3, 'clang++')), + #NativeBenchmarker('clang-3.4', os.path.join(LLVM_3_4, 'clang'), os.path.join(LLVM_3_4, 'clang++')), #NativeBenchmarker('gcc', 'gcc', 'g++'), #JSBenchmarker('sm-f32', SPIDERMONKEY_ENGINE, ['-s', 'PRECISE_F32=2']), - JSBenchmarker('sm', SPIDERMONKEY_ENGINE), + JSBenchmarker('sm-f32-3.2', SPIDERMONKEY_ENGINE, ['-s', 'PRECISE_F32=2'], env={ 'LLVM': LLVM_3_2 }), + JSBenchmarker('sm-f32-3.3', SPIDERMONKEY_ENGINE, ['-s', 'PRECISE_F32=2'], env={ 'LLVM': LLVM_3_3 }), + JSBenchmarker('sm-f32-3.4', SPIDERMONKEY_ENGINE, ['-s', 'PRECISE_F32=2'], env={ 'LLVM': LLVM_3_4 }), + #JSBenchmarker('sm', SPIDERMONKEY_ENGINE), #JSBenchmarker('sm-fc', SPIDERMONKEY_ENGINE, env={ 'EMCC_FAST_COMPILER': '1' }), #JSBenchmarker('sm-noasm', SPIDERMONKEY_ENGINE + ['--no-asmjs']), #JSBenchmarker('sm-noasm-f32', SPIDERMONKEY_ENGINE + ['--no-asmjs'], ['-s', 'PRECISE_F32=2']), |