Merge branch 'fastcomp-by-default' into incoming

21 files changed, 823 insertions, 807 deletions

diff --git a/emcc b/emcc
index 6d8ff6f6..102b7f5d 100755
--- a/emcc
+++ b/emcc
@@ -425,59 +425,6 @@ Options that are modified or new in %s include:
                            -v to Clang, and also enable EMCC_DEBUG
                            to details emcc's operations
 
-  --jcache                 Use a JavaScript cache. This is disabled by
-                           default. When enabled, emcc will store the
-                           results of compilation in a cache and check
-                           the cache when compiling later, something
-                           like what ccache does. This allows incremental
-                           builds - where you are compiling a large
-                           program but only modified a small part of it -
-                           to be much faster (at the cost of more disk
-                           IO for cache accesses). Note that you need
-                           to enable --jcache for both loading and saving
-                           of data, so you must enable it on a full build
-                           for a later incremental build (where you also
-                           enable it) to be sped up.
-
-                           Caching works separately on 4 parts of compilation:
-                           'pre' which is types and global variables; that
-                           information is then fed into 'funcs' which are
-                           the functions (which we parallelize), and then
-                           'post' which adds final information based on
-                           the functions (e.g., do we need long64 support
-                           code). Finally, 'jsfuncs' are JavaScript-level
-                           optimizations. Each of the 4 parts can be cached
-                           separately, but note that they can affect each
-                           other: If you recompile a single C++ file that
-                           changes a global variable - e.g., adds, removes
-                           or modifies a global variable, say by adding
-                           a printf or by adding a compile-time timestamp,
-                           then 'pre' cannot be loaded from the cache. And
-                           since 'pre's output is sent to 'funcs' and 'post',
-                           they will get invalidated as well, and only
-                           'jsfuncs' will be cached. So avoid modifying
-                           globals to let caching work fully.
-
-                           To work around the problem mentioned in the
-                           previous paragraph, you can use
-
-                            emscripten_jcache_printf
-
-                           when adding debug printfs to your code. That
-                           function is specially preprocessed so that it
-                           does not create a constant string global for
-                           its first argument. See emscripten.h for more
-                           details. Note in particular that you need to
-                           already have a call to that function in your
-                           code *before* you add one and do an incremental
-                           build, so that adding an external reference
-                           (also a global property) does not invalidate
-                           everything.
-
-                           Note that you should use -g during the linking
-                           stage (bitcode to JS), for jcache to work
-                           (otherwise, JS minification can confuse it).
-
   --clear-cache            Manually clears the cache of compiled
                            emscripten system libraries (libc++,
                            libc++abi, libc). This is normally
@@ -986,6 +933,7 @@ try:
       logging.warning ('--remove-duplicates is deprecated as it is no longer needed. If you cannot link without it, file a bug with a testcase')
       newargs[i] = ''
     elif newargs[i] == '--jcache':
+      logging.warning('jcache is deprecated')
       jcache = True
       newargs[i] = ''
     elif newargs[i] == '--clear-cache':
@@ -1200,26 +1148,33 @@ try:
     logging.warning('disabling asm.js since embind is not ready for it yet')
     shared.Settings.ASM_JS = 0
 
-  fastcomp = os.environ.get('EMCC_FAST_COMPILER') == '1'
+  fastcomp = os.environ.get('EMCC_FAST_COMPILER') != '0'
 
   if fastcomp:
     shared.Settings.ASM_JS = 1 if opt_level > 0 else 2
-    assert shared.Settings.UNALIGNED_MEMORY == 0, 'forced unaligned memory not supported in fastcomp'
-    assert shared.Settings.CHECK_HEAP_ALIGN == 0, 'check heap align not supported in fastcomp yet'
-    assert shared.Settings.SAFE_DYNCALLS == 0, 'safe dyncalls not supported in fastcomp'
-    assert shared.Settings.ASM_HEAP_LOG == 0, 'asm heap log not supported in fastcomp'
-    assert shared.Settings.LABEL_DEBUG == 0, 'label debug not supported in fastcomp'
-    assert shared.Settings.EXECUTION_TIMEOUT == -1, 'execution timeout not supported in fastcomp'
-    assert shared.Settings.NAMED_GLOBALS == 0, 'named globals not supported in fastcomp'
-    assert shared.Settings.PGO == 0, 'pgo not supported in fastcomp'
-    assert shared.Settings.TARGET_LE32 == 1, 'fastcomp requires le32'
-    assert shared.Settings.USE_TYPED_ARRAYS == 2, 'fastcomp assumes ta2'
-    assert not split_js_file, '--split-js is deprecated and not supported in fastcomp'
-    assert not bind, 'embind not supported in fastcomp yet'
-    assert shared.Settings.MAX_SETJMPS == 20, 'changing MAX_SETJMPS is not supported in fastcomp yet'
-    assert shared.Settings.INIT_HEAP == 0, 'HEAP_INIT is not supported in fastcomp (and should never be needed except for debugging)'
+    try:
+      assert shared.Settings.UNALIGNED_MEMORY == 0, 'forced unaligned memory not supported in fastcomp'
+      assert shared.Settings.CHECK_HEAP_ALIGN == 0, 'check heap align not supported in fastcomp yet'
+      assert shared.Settings.SAFE_DYNCALLS == 0, 'safe dyncalls not supported in fastcomp'
+      assert shared.Settings.ASM_HEAP_LOG == 0, 'asm heap log not supported in fastcomp'
+      assert shared.Settings.LABEL_DEBUG == 0, 'label debug not supported in fastcomp'
+      assert shared.Settings.EXECUTION_TIMEOUT == -1, 'execution timeout not supported in fastcomp'
+      assert shared.Settings.NAMED_GLOBALS == 0, 'named globals not supported in fastcomp'
+      assert shared.Settings.PGO == 0, 'pgo not supported in fastcomp'
+      assert shared.Settings.TARGET_LE32 == 1, 'fastcomp requires le32'
+      assert shared.Settings.USE_TYPED_ARRAYS == 2, 'fastcomp assumes ta2'
+      assert not split_js_file, '--split-js is deprecated and not supported in fastcomp'
+      assert not bind, 'embind not supported in fastcomp yet'
+      assert shared.Settings.MAX_SETJMPS == 20, 'changing MAX_SETJMPS is not supported in fastcomp yet'
+      assert shared.Settings.INIT_HEAP == 0, 'HEAP_INIT is not supported in fastcomp (and should never be needed except for debugging)'
+      assert not shared.Settings.RUNTIME_TYPE_INFO, 'RUNTIME_TYPE_INFO is not supported in fastcomp'
+      assert not shared.Settings.CORRUPTION_CHECK, 'CORRUPTION_CHECK is not supported in asm.js mode, which is what fastcomp can emit (you can use non-asm.js mode in non-fastcomp)'
+    except Exception, e:
+      logging.error('Compiler settings are incompatible with fastcomp. You can fall back to the older compiler core, although that is not recommended, see https://github.com/kripken/emscripten/wiki/LLVM-Backend')
+      raise e
+
     if jcache:
-      logging.warning('jcache is not supported in fastcomp (you should not need it anyhow), disabling')
+      logging.warning('jcache is deprecated and not supported in fastcomp (you should not need it anyhow), disabling')
       jcache = False
 
     fastcomp_opts = ['-pnacl-abi-simplify-preopt', '-pnacl-abi-simplify-postopt']
@@ -1284,7 +1239,7 @@ try:
     shared.Settings.LINKABLE = 1 # TODO: add FORCE_DCE option for the brave people that do want to dce here and in side modules
     debug_level = max(debug_level, 2)
 
-  if shared.Settings.ASSERTIONS and shared.Settings.ALIASING_FUNCTION_POINTERS:
+  if not fastcomp and shared.Settings.ASSERTIONS and shared.Settings.ALIASING_FUNCTION_POINTERS:
     logging.warning('ALIASING_FUNCTION_POINTERS is on, function pointer comparisons may be invalid across types')
 
   if shared.Settings.STB_IMAGE and final_suffix in JS_CONTAINING_SUFFIXES:
diff --git a/emscripten.py b/emscripten.py
index 59a0666c..6b49a3cc 100755
--- a/emscripten.py
+++ b/emscripten.py
@@ -1257,7 +1257,7 @@ Runtime.stackRestore = function(top) { asm['stackRestore'](top) };
 
   if DEBUG: logging.debug('  emscript: final python processing took %s seconds' % (time.time() - t))
 
-if os.environ.get('EMCC_FAST_COMPILER') == '1':
+if os.environ.get('EMCC_FAST_COMPILER') != '0':
   emscript = emscript_fast
 
 def main(args, compiler_engine, cache, jcache, relooper, temp_files, DEBUG, DEBUG_CACHE):
diff --git a/src/library_gc.js b/src/library_gc.js
index b3dae0e9..d86f2d15 100644
--- a/src/library_gc.js
+++ b/src/library_gc.js
@@ -1,4 +1,6 @@
 
+// WARNING: this is deprecated. You should just build Boehm from source, it is much faster than the toy version written in emscripten
+
 if (GC_SUPPORT) {
   EXPORTED_FUNCTIONS['_calloc'] = 1;
   EXPORTED_FUNCTIONS['_realloc'] = 1;
diff --git a/src/preamble.js b/src/preamble.js
index 27a98422..28a1dcbc 100644
--- a/src/preamble.js
+++ b/src/preamble.js
@@ -194,9 +194,6 @@ function SAFE_HEAP_STORE(dest, value, bytes, isFloat) {
 }
 
 function SAFE_HEAP_LOAD(dest, bytes, isFloat, unsigned) {
-#if SAFE_HEAP_LOG
-  Module.print('SAFE_HEAP load: ' + [dest, bytes, isFloat, unsigned]);
-#endif
   assert(dest > 0, 'segmentation fault');
   assert(dest % bytes === 0);
   assert(dest < Math.max(DYNAMICTOP, STATICTOP));
@@ -204,6 +201,9 @@ function SAFE_HEAP_LOAD(dest, bytes, isFloat, unsigned) {
   var type = getSafeHeapType(bytes, isFloat);
   var ret = getValue(dest, type, 1);
   if (unsigned) ret = unSign(ret, parseInt(type.substr(1)), 1);
+#if SAFE_HEAP_LOG
+  Module.print('SAFE_HEAP load: ' + [dest, ret, bytes, isFloat, unsigned]);
+#endif
   return ret;
 }
 
diff --git a/src/settings.js b/src/settings.js
index c8114059..1c6b998e 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -446,7 +446,7 @@ var HEADLESS = 0; // If 1, will include shim code that tries to 'fake' a browser
 var BENCHMARK = 0; // If 1, will just time how long main() takes to execute, and not
                    // print out anything at all whatsoever. This is useful for benchmarking.
 
-var ASM_JS = 0; // If 1, generate code in asm.js format. If 2, emits the same code except
+var ASM_JS = 1; // If 1, generate code in asm.js format. If 2, emits the same code except
                 // for omitting 'use asm'
 
 var PGO = 0; // Enables profile-guided optimization in the form of runtime checks for
diff --git a/system/include/emscripten/emscripten.h b/system/include/emscripten/emscripten.h
index b92d920c..852a8e0d 100644
--- a/system/include/emscripten/emscripten.h
+++ b/system/include/emscripten/emscripten.h
@@ -40,10 +40,15 @@ extern "C" {
 #define EM_ASM(...) emscripten_asm_const(#__VA_ARGS__)
 
 /*
- * Input-output versions of EM_ASM. EM_ASM_INT receives arguments of
- * either int or double type and returns an int; EM_ASM_DOUBLE
- * receives similar arguments (int or double) but returns a double.
- * Arguments arrive as $0, $1 etc; output value should be returned:
+ * Input-output versions of EM_ASM.
+ *
+ * EM_ASM_ (an extra _ is added) allows sending values (ints
+ * or doubles) into the code. If you also want a return value,
+ * EM_ASM_INT receives arguments (of int or double type)
+ * and returns an int; EM_ASM_DOUBLE does the same and returns
+ * a double.
+ *
+ * Arguments arrive as $0, $1 etc. The output value should be returned:
  *
  *    int x = EM_ASM_INT({
  *      console.log('I received: ' + [$0, $1]);
@@ -54,6 +59,7 @@ extern "C" {
  * (int or double) but *not* to pass any values, you can use
  * EM_ASM_INT_V and EM_ASM_DOUBLE_V respectively.
  */
+#define EM_ASM_(code, ...) emscripten_asm_const_int(#code, __VA_ARGS__)
 #define EM_ASM_INT(code, ...) emscripten_asm_const_int(#code, __VA_ARGS__)
 #define EM_ASM_DOUBLE(code, ...) emscripten_asm_const_double(#code, __VA_ARGS__)
 #define EM_ASM_INT_V(code) emscripten_asm_const_int(#code)
diff --git a/system/include/gc.h b/system/include/gc.h
index a21fd410..affa615f 100644
--- a/system/include/gc.h
+++ b/system/include/gc.h
@@ -1,5 +1,7 @@
 /*
  * Boehm-compatible GC API
+ *
+ * WARNING: this is deprecated. You should just build Boehm from source, it is much faster than the toy version written in emscripten
  */
 #ifndef _GC_H_INCLUDED
 #define _GC_H_INCLUDED
diff --git a/tests/core/test_inlinejs3.in b/tests/core/test_inlinejs3.in
index 9ddd5907..12e31007 100644
--- a/tests/core/test_inlinejs3.in
+++ b/tests/core/test_inlinejs3.in
@@ -7,6 +7,7 @@ int main(int argc, char **argv) {
   for (int i = 0; i < 3; i++) {
     EM_ASM(Module.print('hello dere3'); Module.print('hello dere' + 4););
   }
+  EM_ASM_({ Module.print('hello input ' + $0) }, 123);
   int sum = 0;
   for (int i = 0; i < argc * 3; i++) {
     sum += EM_ASM_INT({
diff --git a/tests/core/test_inlinejs3.out b/tests/core/test_inlinejs3.out
index c293e80b..1f64a89a 100644
--- a/tests/core/test_inlinejs3.out
+++ b/tests/core/test_inlinejs3.out
@@ -6,6 +6,7 @@ hello dere3
 hello dere4
 hello dere3
 hello dere4
+hello input 123
 i: 0,0.00
 i: 1,0.08
 i: 2,0.17
diff --git a/tests/runner.py b/tests/runner.py
index 501299c7..32575a1a 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -27,6 +27,19 @@ sys.path += [path_from_root(''), path_from_root('third_party/websockify')]
 import tools.shared
 from tools.shared import *
 
+# Utils
+
+def nonfastcomp(test):
+  try:
+    old_fastcomp = os.environ.get('EMCC_FAST_COMPILER')
+    os.environ['EMCC_FAST_COMPILER'] = '0'
+    test()
+  finally:
+    if old_fastcomp is None:
+      del os.environ['EMCC_FAST_COMPILER']
+    else:
+      os.environ['EMCC_FAST_COMPILER'] = old_fastcomp
+
 # Sanity check for config
 
 try:
@@ -36,10 +49,7 @@ except:
 
 # Core test runner class, shared between normal tests and benchmarks
 checked_sanity = False
-if os.environ.get('EMCC_FAST_COMPILER') == '1':
-  test_modes = ['default', 'asm1', 'asm2', 'asm3', 'asm2f', 'asm2g']
-else:
-  test_modes = ['default', 'o1', 'o2', 'asm1', 'asm2', 'asm3', 'asm2f', 'asm2g', 'asm2x86', 's_0_0', 's_0_1']
+test_modes = ['default', 'asm1', 'asm2', 'asm3', 'asm2f', 'asm2g', 'slow2', 'slow2asm', 's_0_0', 's_0_1']
 test_index = 0
 
 class RunnerCore(unittest.TestCase):
diff --git a/tests/test_benchmark.py b/tests/test_benchmark.py
index 023ac1e2..2bc34c60 100644
--- a/tests/test_benchmark.py
+++ b/tests/test_benchmark.py
@@ -134,7 +134,6 @@ try:
     #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-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']),
     #JSBenchmarker('v8',           V8_ENGINE)
diff --git a/tests/test_browser.py b/tests/test_browser.py
index c1d1caab..f2e17ea0 100644
--- a/tests/test_browser.py
+++ b/tests/test_browser.py
@@ -1,5 +1,5 @@
 import BaseHTTPServer, multiprocessing, os, shutil, subprocess, unittest, zlib, webbrowser, time, shlex
-from runner import BrowserCore, path_from_root
+from runner import BrowserCore, path_from_root, nonfastcomp
 from tools.shared import *
 
 # User can specify an environment variable EMSCRIPTEN_BROWSER to force the browser test suite to
@@ -120,8 +120,6 @@ If manually bisecting:
 '''
 
   def test_emscripten_log(self):
-    if os.environ.get('EMCC_FAST_COMPILER') == '1': return self.skip('fastcomp uses asm, where call stacks are sometimes less clear')
-
     src = os.path.join(self.get_dir(), 'src.cpp')
     open(src, 'w').write(self.with_report_result(open(path_from_root('tests', 'emscripten_log', 'emscripten_log.cpp')).read()))
 
@@ -143,191 +141,193 @@ If manually bisecting:
       os.chdir(cwd)
 
   def test_split(self):
-    if os.environ.get('EMCC_FAST_COMPILER') == '1': return self.skip('no --split in fastcomp, deprecated')
+    def nfc():
+      # test HTML generation.
+      self.reftest(path_from_root('tests', 'htmltest.png'))
+      output = Popen([PYTHON, EMCC, path_from_root('tests', 'hello_world_sdl.cpp'), '-o', 'something.js', '--split', '100', '--pre-js', 'reftest.js']).communicate()
+      assert os.path.exists(os.path.join(self.get_dir(), 'something.js')), 'must be main js file'
+      assert os.path.exists(os.path.join(self.get_dir(), 'something_functions.js')), 'must be functions js file'
+      assert os.path.exists(os.path.join(self.get_dir(), 'something.include.html')), 'must be js include file'
 
-    # test HTML generation.
-    self.reftest(path_from_root('tests', 'htmltest.png'))
-    output = Popen([PYTHON, EMCC, path_from_root('tests', 'hello_world_sdl.cpp'), '-o', 'something.js', '--split', '100', '--pre-js', 'reftest.js']).communicate()
-    assert os.path.exists(os.path.join(self.get_dir(), 'something.js')), 'must be main js file'
-    assert os.path.exists(os.path.join(self.get_dir(), 'something_functions.js')), 'must be functions js file'
-    assert os.path.exists(os.path.join(self.get_dir(), 'something.include.html')), 'must be js include file'
-
-    open(os.path.join(self.get_dir(), 'something.html'), 'w').write('''
-
-    <!doctype html>
-    <html lang="en-us">
-      <head>
-        <meta charset="utf-8">
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-        <title>Emscripten-Generated Code</title>
-        <style>
-          .emscripten { padding-right: 0; margin-left: auto; margin-right: auto; display: block; }
-          canvas.emscripten { border: 1px solid black; }
-          textarea.emscripten { font-family: monospace; width: 80%; }
-          div.emscripten { text-align: center; }
-        </style>
-      </head>
-      <body>
-        <hr/>
-        <div class="emscripten" id="status">Downloading...</div>
-        <div class="emscripten">
-          <progress value="0" max="100" id="progress" hidden=1></progress>
-        </div>
-        <canvas class="emscripten" id="canvas" oncontextmenu="event.preventDefault()"></canvas>
-        <hr/>
-        <div class="emscripten"><input type="button" value="fullscreen" onclick="Module.requestFullScreen()"></div>
-        <hr/>
-        <textarea class="emscripten" id="output" rows="8"></textarea>
-        <hr>
-        <script type='text/javascript'>
-          // connect to canvas
-          var Module = {
-            preRun: [],
-            postRun: [],
-            print: (function() {
-              var element = document.getElementById('output');
-              element.value = ''; // clear browser cache
-              return function(text) {
-                // These replacements are necessary if you render to raw HTML
-                //text = text.replace(/&/g, "&amp;");
-                //text = text.replace(/</g, "&lt;");
-                //text = text.replace(/>/g, "&gt;");
-                //text = text.replace('\\n', '<br>', 'g');
-                element.value += text + "\\n";
-                element.scrollTop = element.scrollHeight; // focus on bottom
-              };
-            })(),
-            printErr: function(text) {
-              if (0) { // XXX disabled for safety typeof dump == 'function') {
-                dump(text + '\\n'); // fast, straight to the real console
-              } else {
-                console.log(text);
-              }
-            },
-            canvas: document.getElementById('canvas'),
-            setStatus: function(text) {
-              if (Module.setStatus.interval) clearInterval(Module.setStatus.interval);
-              var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/);
-              var statusElement = document.getElementById('status');
-              var progressElement = document.getElementById('progress');
-              if (m) {
-                text = m[1];
-                progressElement.value = parseInt(m[2])*100;
-                progressElement.max = parseInt(m[4])*100;
-                progressElement.hidden = false;
-              } else {
-                progressElement.value = null;
-                progressElement.max = null;
-                progressElement.hidden = true;
+      open(os.path.join(self.get_dir(), 'something.html'), 'w').write('''
+
+      <!doctype html>
+      <html lang="en-us">
+        <head>
+          <meta charset="utf-8">
+          <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+          <title>Emscripten-Generated Code</title>
+          <style>
+            .emscripten { padding-right: 0; margin-left: auto; margin-right: auto; display: block; }
+            canvas.emscripten { border: 1px solid black; }
+            textarea.emscripten { font-family: monospace; width: 80%; }
+            div.emscripten { text-align: center; }
+          </style>
+        </head>
+        <body>
+          <hr/>
+          <div class="emscripten" id="status">Downloading...</div>
+          <div class="emscripten">
+            <progress value="0" max="100" id="progress" hidden=1></progress>
+          </div>
+          <canvas class="emscripten" id="canvas" oncontextmenu="event.preventDefault()"></canvas>
+          <hr/>
+          <div class="emscripten"><input type="button" value="fullscreen" onclick="Module.requestFullScreen()"></div>
+          <hr/>
+          <textarea class="emscripten" id="output" rows="8"></textarea>
+          <hr>
+          <script type='text/javascript'>
+            // connect to canvas
+            var Module = {
+              preRun: [],
+              postRun: [],
+              print: (function() {
+                var element = document.getElementById('output');
+                element.value = ''; // clear browser cache
+                return function(text) {
+                  // These replacements are necessary if you render to raw HTML
+                  //text = text.replace(/&/g, "&amp;");
+                  //text = text.replace(/</g, "&lt;");
+                  //text = text.replace(/>/g, "&gt;");
+                  //text = text.replace('\\n', '<br>', 'g');
+                  element.value += text + "\\n";
+                  element.scrollTop = element.scrollHeight; // focus on bottom
+                };
+              })(),
+              printErr: function(text) {
+                if (0) { // XXX disabled for safety typeof dump == 'function') {
+                  dump(text + '\\n'); // fast, straight to the real console
+                } else {
+                  console.log(text);
+                }
+              },
+              canvas: document.getElementById('canvas'),
+              setStatus: function(text) {
+                if (Module.setStatus.interval) clearInterval(Module.setStatus.interval);
+                var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/);
+                var statusElement = document.getElementById('status');
+                var progressElement = document.getElementById('progress');
+                if (m) {
+                  text = m[1];
+                  progressElement.value = parseInt(m[2])*100;
+                  progressElement.max = parseInt(m[4])*100;
+                  progressElement.hidden = false;
+                } else {
+                  progressElement.value = null;
+                  progressElement.max = null;
+                  progressElement.hidden = true;
+                }
+                statusElement.innerHTML = text;
+              },
+              totalDependencies: 0,
+              monitorRunDependencies: function(left) {
+                this.totalDependencies = Math.max(this.totalDependencies, left);
+                Module.setStatus(left ? 'Preparing... (' + (this.totalDependencies-left) + '/' + this.totalDependencies + ')' : 'All downloads complete.');
               }
-              statusElement.innerHTML = text;
-            },
-            totalDependencies: 0,
-            monitorRunDependencies: function(left) {
-              this.totalDependencies = Math.max(this.totalDependencies, left);
-              Module.setStatus(left ? 'Preparing... (' + (this.totalDependencies-left) + '/' + this.totalDependencies + ')' : 'All downloads complete.');
-            }
-          };
-          Module.setStatus('Downloading...');
-        </script>''' + open(os.path.join(self.get_dir(), 'something.include.html')).read() + '''
-      </body>
-    </html>
-    ''')
+            };
+            Module.setStatus('Downloading...');
+          </script>''' + open(os.path.join(self.get_dir(), 'something.include.html')).read() + '''
+        </body>
+      </html>
+      ''')
 
-    self.run_browser('something.html', 'You should see "hello, world!" and a colored cube.', '/report_result?0')
+      self.run_browser('something.html', 'You should see "hello, world!" and a colored cube.', '/report_result?0')
+
+    nonfastcomp(nfc)
 
   def test_split_in_source_filenames(self):
-    if os.environ.get('EMCC_FAST_COMPILER') == '1': return self.skip('no --split in fastcomp, deprecated')
-
-    self.reftest(path_from_root('tests', 'htmltest.png'))
-    output = Popen([PYTHON, EMCC, path_from_root('tests', 'hello_world_sdl.cpp'), '-o', 'something.js', '-g', '--split', '100', '--pre-js', 'reftest.js']).communicate()
-    assert os.path.exists(os.path.join(self.get_dir(), 'something.js')), 'must be main js file'
-    assert os.path.exists(os.path.join(self.get_dir(), 'something', 'hello_world_sdl.cpp.js')), 'must be functions js file'
-    assert os.path.exists(os.path.join(self.get_dir(), 'something.include.html')), 'must be js include file'
-
-    open(os.path.join(self.get_dir(), 'something.html'), 'w').write('''
-
-    <!doctype html>
-    <html lang="en-us">
-      <head>
-        <meta charset="utf-8">
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-        <title>Emscripten-Generated Code</title>
-        <style>
-          .emscripten { padding-right: 0; margin-left: auto; margin-right: auto; display: block; }
-          canvas.emscripten { border: 1px solid black; }
-          textarea.emscripten { font-family: monospace; width: 80%; }
-          div.emscripten { text-align: center; }
-        </style>
-      </head>
-      <body>
-        <hr/>
-        <div class="emscripten" id="status">Downloading...</div>
-        <div class="emscripten">
-          <progress value="0" max="100" id="progress" hidden=1></progress>
-        </div>
-        <canvas class="emscripten" id="canvas" oncontextmenu="event.preventDefault()"></canvas>
-        <hr/>
-        <div class="emscripten"><input type="button" value="fullscreen" onclick="Module.requestFullScreen()"></div>
-        <hr/>
-        <textarea class="emscripten" id="output" rows="8"></textarea>
-        <hr>
-        <script type='text/javascript'>
-          // connect to canvas
-          var Module = {
-            preRun: [],
-            postRun: [],
-            print: (function() {
-              var element = document.getElementById('output');
-              element.value = ''; // clear browser cache
-              return function(text) {
-                // These replacements are necessary if you render to raw HTML
-                //text = text.replace(/&/g, "&amp;");
-                //text = text.replace(/</g, "&lt;");
-                //text = text.replace(/>/g, "&gt;");
-                //text = text.replace('\\n', '<br>', 'g');
-                element.value += text + "\\n";
-                element.scrollTop = element.scrollHeight; // focus on bottom
-              };
-            })(),
-            printErr: function(text) {
-              if (0) { // XXX disabled for safety typeof dump == 'function') {
-                dump(text + '\\n'); // fast, straight to the real console
-              } else {
-                console.log(text);
-              }
-            },
-            canvas: document.getElementById('canvas'),
-            setStatus: function(text) {
-              if (Module.setStatus.interval) clearInterval(Module.setStatus.interval);
-              var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/);
-              var statusElement = document.getElementById('status');
-              var progressElement = document.getElementById('progress');
-              if (m) {
-                text = m[1];
-                progressElement.value = parseInt(m[2])*100;
-                progressElement.max = parseInt(m[4])*100;
-                progressElement.hidden = false;
-              } else {
-                progressElement.value = null;
-                progressElement.max = null;
-                progressElement.hidden = true;
+    def nfc():
+      self.reftest(path_from_root('tests', 'htmltest.png'))
+      output = Popen([PYTHON, EMCC, path_from_root('tests', 'hello_world_sdl.cpp'), '-o', 'something.js', '-g', '--split', '100', '--pre-js', 'reftest.js']).communicate()
+      assert os.path.exists(os.path.join(self.get_dir(), 'something.js')), 'must be main js file'
+      assert os.path.exists(os.path.join(self.get_dir(), 'something', 'hello_world_sdl.cpp.js')), 'must be functions js file'
+      assert os.path.exists(os.path.join(self.get_dir(), 'something.include.html')), 'must be js include file'
+
+      open(os.path.join(self.get_dir(), 'something.html'), 'w').write('''
+
+      <!doctype html>
+      <html lang="en-us">
+        <head>
+          <meta charset="utf-8">
+          <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+          <title>Emscripten-Generated Code</title>
+          <style>
+            .emscripten { padding-right: 0; margin-left: auto; margin-right: auto; display: block; }
+            canvas.emscripten { border: 1px solid black; }
+            textarea.emscripten { font-family: monospace; width: 80%; }
+            div.emscripten { text-align: center; }
+          </style>
+        </head>
+        <body>
+          <hr/>
+          <div class="emscripten" id="status">Downloading...</div>
+          <div class="emscripten">
+            <progress value="0" max="100" id="progress" hidden=1></progress>
+          </div>
+          <canvas class="emscripten" id="canvas" oncontextmenu="event.preventDefault()"></canvas>
+          <hr/>
+          <div class="emscripten"><input type="button" value="fullscreen" onclick="Module.requestFullScreen()"></div>
+          <hr/>
+          <textarea class="emscripten" id="output" rows="8"></textarea>
+          <hr>
+          <script type='text/javascript'>
+            // connect to canvas
+            var Module = {
+              preRun: [],
+              postRun: [],
+              print: (function() {
+                var element = document.getElementById('output');
+                element.value = ''; // clear browser cache
+                return function(text) {
+                  // These replacements are necessary if you render to raw HTML
+                  //text = text.replace(/&/g, "&amp;");
+                  //text = text.replace(/</g, "&lt;");
+                  //text = text.replace(/>/g, "&gt;");
+                  //text = text.replace('\\n', '<br>', 'g');
+                  element.value += text + "\\n";
+                  element.scrollTop = element.scrollHeight; // focus on bottom
+                };
+              })(),
+              printErr: function(text) {
+                if (0) { // XXX disabled for safety typeof dump == 'function') {
+                  dump(text + '\\n'); // fast, straight to the real console
+                } else {
+                  console.log(text);
+                }
+              },
+              canvas: document.getElementById('canvas'),
+              setStatus: function(text) {
+                if (Module.setStatus.interval) clearInterval(Module.setStatus.interval);
+                var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/);
+                var statusElement = document.getElementById('status');
+                var progressElement = document.getElementById('progress');
+                if (m) {
+                  text = m[1];
+                  progressElement.value = parseInt(m[2])*100;
+                  progressElement.max = parseInt(m[4])*100;
+                  progressElement.hidden = false;
+                } else {
+                  progressElement.value = null;
+                  progressElement.max = null;
+                  progressElement.hidden = true;
+                }
+                statusElement.innerHTML = text;
+              },
+              totalDependencies: 0,
+              monitorRunDependencies: function(left) {
+                this.totalDependencies