diff options
Diffstat (limited to 'tools/js_optimizer.py')
| -rw-r--r-- | tools/js_optimizer.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tools/js_optimizer.py b/tools/js_optimizer.py index d5b1df27..4821cc81 100644 --- a/tools/js_optimizer.py +++ b/tools/js_optimizer.py @@ -11,9 +11,9 @@ def path_from_root(*pathelems): JS_OPTIMIZER = path_from_root('tools', 'js-optimizer.js') -NUM_CHUNKS_PER_CORE = 1.5 -MIN_CHUNK_SIZE = int(os.environ.get('EMCC_JSOPT_MIN_CHUNK_SIZE') or 1024*1024) # configuring this is just for debugging purposes -MAX_CHUNK_SIZE = 20*1024*1024 +NUM_CHUNKS_PER_CORE = 3 +MIN_CHUNK_SIZE = int(os.environ.get('EMCC_JSOPT_MIN_CHUNK_SIZE') or 512*1024) # configuring this is just for debugging purposes +MAX_CHUNK_SIZE = int(os.environ.get('EMCC_JSOPT_MAX_CHUNK_SIZE') or 5*1024*1024) WINDOWS = sys.platform.startswith('win') @@ -26,7 +26,7 @@ class Minifier: ''' asm.js minification support. We calculate minification of globals here, then pass that into the parallel js-optimizer.js runners which - during registerize perform minification of locals. + perform minification of locals. ''' def __init__(self, js, js_engine): @@ -117,9 +117,9 @@ def run_on_js(filename, passes, js_engine, jcache, source_map=False, extra_info= know_generated = suffix or start_funcs >= 0 - minify_globals = 'registerizeAndMinify' in passes and 'asm' in passes + minify_globals = 'minifyNames' in passes and 'asm' in passes if minify_globals: - passes = map(lambda p: p if p != 'registerizeAndMinify' else 'registerize', passes) + passes = map(lambda p: p if p != 'minifyNames' else 'minifyLocals', passes) start_asm = js.find(start_asm_marker) end_asm = js.rfind(end_asm_marker) assert (start_asm >= 0) == (end_asm >= 0) @@ -212,6 +212,7 @@ EMSCRIPTEN_FUNCS(); chunk_size = min(MAX_CHUNK_SIZE, max(MIN_CHUNK_SIZE, total_size / intended_num_chunks)) chunks = shared.chunkify(funcs, chunk_size, jcache.get_cachename('jsopt') if jcache else None) + if DEBUG and len(chunks) > 0: print >> sys.stderr, 'chunkification: intended size:', chunk_size, 'num funcs:', len(funcs), 'actual num chunks:', len(chunks), 'chunk size range:', max(map(len, chunks)), '-', min(map(len, chunks)) funcs = None if jcache: @@ -342,6 +343,7 @@ EMSCRIPTEN_FUNCS(); return filename def run(filename, passes, js_engine=shared.NODE_JS, jcache=False, source_map=False, extra_info=None): + js_engine = shared.listify(js_engine) return temp_files.run_and_clean(lambda: run_on_js(filename, passes, js_engine, jcache, source_map, extra_info)) if __name__ == '__main__': |