Optimize makeDynCall to use dynCall_xx function directly where needed

Now the runtime `dynCall` is only used in places where the
signature is not known at compile time, such as embind or
(the internally unused) `getFuncWrapper`.

Move `getDynCaller` into embind.js which is the only place
it was used.

Author: sbc100

emcc.py

@@ -1381,7 +1381,6 @@ def filter_out_duplicate_dynamic_libs(inputs):
       # See: https://github.com/emscripten-core/emscripten/issues/12065
       # See: https://github.com/emscripten-core/emscripten/issues/12066
       shared.Settings.USE_LEGACY_DYNCALLS = 1
-      shared.Settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$getDynCaller']
       shared.Settings.EXPORTED_FUNCTIONS += ['_emscripten_stack_get_base',
                                              '_emscripten_stack_get_end',
                                              '_emscripten_stack_set_limits']
@@ -1614,18 +1613,12 @@ def filter_out_duplicate_dynamic_libs(inputs):
     if not shared.Settings.MINIMAL_RUNTIME or shared.Settings.EXIT_RUNTIME:
       # MINIMAL_RUNTIME only needs callRuntimeCallbacks in certain cases, but the normal runtime
       # always does.
-      shared.Settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$callRuntimeCallbacks', '$dynCall']
+      shared.Settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$callRuntimeCallbacks']
 
     if shared.Settings.USE_PTHREADS:
       # memalign is used to ensure allocated thread stacks are aligned.
       shared.Settings.EXPORTED_FUNCTIONS += ['_memalign']
 
-      # dynCall is used to call pthread entry points in worker.js (as
-      # metadce does not consider worker.js, which is external, we must
-      # consider it an export, i.e., one which can never be removed).
-      shared.Settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$dynCall']
-      shared.Settings.EXPORTED_FUNCTIONS += ['dynCall']
-
       if shared.Settings.MINIMAL_RUNTIME:
         building.user_requested_exports += ['exit']
 

src/embind/embind.js

@@ -1062,6 +1062,26 @@ var LibraryEmbind = {
 #endif
   },
 
+#if USE_LEGACY_DYNCALLS || !WASM_BIGINT
+  // Used in library code to get JS function from wasm function pointer.
+  // All callers should use direct table access where possible and only fall
+  // back to this function if needed.
+  $getDynCaller__deps: ['$dynCall'],
+  $getDynCaller: function(sig, ptr) {
+#if !USE_LEGACY_DYNCALLS
+    assert(sig.indexOf('j') >= 0, 'getDynCaller should only be called with i64 sigs')
+#endif
+    var argCache = [];
+    return function() {
+      argCache.length = arguments.length;
+      for (var i = 0; i < arguments.length; i++) {
+        argCache[i] = arguments[i];
+      }
+      return dynCall(sig, ptr, argCache);
+    };
+  },
+#endif
+
   $embind__requireFunction__deps: ['$readLatin1String', '$throwBindingError'
 #if USE_LEGACY_DYNCALLS || !WASM_BIGINT
     , '$getDynCaller'

src/library.js

@@ -3707,27 +3707,9 @@ LibraryManager.library = {
     return Module['dynCall_' + sig].call(null, ptr);
   },
   $dynCall__deps: ['$dynCallLegacy'],
-
-  // Used in library code to get JS function from wasm function pointer.
-  // All callers should use direct table access where possible and only fall
-  // back to this function if needed.
-  $getDynCaller__deps: ['$dynCall'],
-  $getDynCaller: function(sig, ptr) {
-#if !USE_LEGACY_DYNCALLS
-    assert(sig.indexOf('j') >= 0, 'getDynCaller should only be called with i64 sigs')
-#endif
-    var argCache = [];
-    return function() {
-      argCache.length = arguments.length;
-      for (var i = 0; i < arguments.length; i++) {
-        argCache[i] = arguments[i];
-      }
-      return dynCall(sig, ptr, argCache);
-    };
-  },
 #endif
 
-  $dynCall: function (sig, ptr, args) {
+  $dynCall: function(sig, ptr, args) {
 #if USE_LEGACY_DYNCALLS
     return dynCallLegacy(sig, ptr, args);
 #else

src/library_browser.js

@@ -1105,10 +1105,9 @@ var LibraryBrowser = {
   },
 
   // TODO: currently not callable from a pthread, but immediately calls onerror() if not on main thread.
-  emscripten_async_load_script__deps: ['$getFuncWrapper'],
   emscripten_async_load_script: function(url, onload, onerror) {
-    onload = getFuncWrapper(onload, 'v');
-    onerror = getFuncWrapper(onerror, 'v');
+    onload = {{{ makeDynCall('v', 'onload') }}};
+    onerror = {{{ makeDynCall('v', 'onerror') }}};
 
 #if USE_PTHREADS
     if (ENVIRONMENT_IS_PTHREAD) {
@@ -1197,7 +1196,7 @@ var LibraryBrowser = {
   emscripten_set_main_loop__deps: ['$setMainLoop'],
   emscripten_set_main_loop__docs: '/** @param {number|boolean=} noSetTiming */',
   emscripten_set_main_loop: function(func, fps, simulateInfiniteLoop, arg, noSetTiming) {
-    var browserIterationFunc = function() { {{{ makeDynCall('v', 'func') }}}(); };
+    var browserIterationFunc = {{{ makeDynCall('v', 'func') }}};
     setMainLoop(browserIterationFunc, fps, simulateInfiniteLoop, arg, noSetTiming);
   },
 
@@ -1519,7 +1518,6 @@ var LibraryBrowser = {
     Browser.workers[id] = null;
   },
 
-  emscripten_call_worker__deps: ['$getFuncWrapper'],
   emscripten_call_worker__proxy: 'sync',
   emscripten_call_worker__sig: 'viiiiii',
   emscripten_call_worker: function(id, funcName, data, size, callback, arg) {
@@ -1531,7 +1529,7 @@ var LibraryBrowser = {
     if (callback) {
       callbackId = info.callbacks.length;
       info.callbacks.push({
-        func: getFuncWrapper(callback, 'viii'),
+        func: {{{ makeDynCall('viii', 'callback') }}},
         arg: arg
       });
       info.awaited++;

src/parseTools.js

@@ -985,7 +985,17 @@ function makeDynCall(sig, funcPtr) {
     }
   }
   if (USE_LEGACY_DYNCALLS) {
-    return `getDynCaller("${sig}", ${funcPtr})`;
+    let dyncall = exportedAsmFunc(`dynCall_${sig}`)
+    if (sig.length > 1) {
+      let args = [];
+      for (let i = 1; i < sig.length; ++i) {
+        args.push(`a${i}`);
+      }
+      args = args.join(', ');
+      return `(function(${args}) { ${dyncall}.apply(null, [${funcPtr}, ${args}]); })`;
+    } else {
+      return `(function() { ${dyncall}.call(null, ${funcPtr}); })`;
+    }
   } else {
     return `wasmTable.get(${funcPtr})`;
   }

src/worker.js

@@ -188,7 +188,7 @@ this.onmessage = function(e) {
         // enable that to work. If you find the following line to crash, either change the signature
         // to "proper" void *ThreadMain(void *arg) form, or try linking with the Emscripten linker
         // flag -s EMULATE_FUNCTION_POINTER_CASTS=1 to add in emulation for this x86 ABI extension.
-        var result = Module['dynCall']('ii', e.data.start_routine, [e.data.arg]);
+        var result = {{{ makeDynCall('ii', 'e.data.start_routine') }}} (e.data.arg);
 
 #if STACK_OVERFLOW_CHECK
         Module['checkStackCookie']();

tools/ports/sdl2.py

@@ -90,7 +90,7 @@ def clear(ports, settings, shared):
 
 
 def process_dependencies(settings):
-  settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$autoResumeAudioContext']
+  settings.DEFAULT_LIBRARY_FUNCS_TO_INCLUDE += ['$autoResumeAudioContext', '$dynCall']
 
 
 def process_args(ports):