diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2011-12-06 13:45:33 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2011-12-06 13:45:33 -0800 |
| commit | 4518cc29290315cb528d260a7ca2c0427bb1579d (patch) | |
| tree | 3201197d21eb42a9abce5a171d914c8e0fc2cdd8 | |
| parent | bea3d23dc5316222d31127299ea1896223075ac4 (diff) | |
two small fixes, for benchmarks and memory growth
| -rw-r--r-- | src/runtime.js | 2 | ||||
| -rw-r--r-- | tests/runner.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/runtime.js b/src/runtime.js index e0eb7404..637632f8 100644 --- a/src/runtime.js +++ b/src/runtime.js @@ -59,7 +59,7 @@ var RuntimeGenerator = { var ret = ''; if (USE_TYPED_ARRAYS) ret += 'LAST_STATICTOP = STATICTOP;' ret += RuntimeGenerator.alloc(size, 'STATIC', INIT_HEAP); - if (USE_TYPED_ARRAYS) ret += 'if (STATICTOP >= TOTAL_MEMORY) enlargeMemory();' + if (USE_TYPED_ARRAYS) ret += '; if (STATICTOP >= TOTAL_MEMORY) enlargeMemory();' return ret; }, diff --git a/tests/runner.py b/tests/runner.py index aa1d5922..a34d1eb2 100644 --- a/tests/runner.py +++ b/tests/runner.py @@ -4886,6 +4886,8 @@ else: class benchmark(RunnerCore): def setUp(self): + super(benchmark, self).setUp() + Settings.RELOOP = Settings.MICRO_OPTS = 1 Settings.USE_TYPED_ARRAYS = 1 Settings.QUANTUM_SIZE = 1 @@ -4903,8 +4905,6 @@ else: Building.LLVM_OPTS = 1 if Settings.USE_TYPED_ARRAYS != 2 else 2 Building.pick_llvm_opts(2, safe=Building.LLVM_OPTS != 2) - super(benchmark, self).setUp() - def print_stats(self, times, native_times, last=False): mean = sum(times)/len(times) squared_times = map(lambda x: x*x, times) |