Merge branch 'main' into roll-and-repoint-tests

Author: kainino0x

.circleci/config.yml

@@ -142,6 +142,10 @@ commands:
             cd ~/emsdk
             ./emsdk install tot
             ./emsdk activate tot
+            # Write the version of clang into a file for use in the ccache key
+            ./upstream/bin/clang --version > clang_version.txt
+            echo "clang version:"
+            cat ~/emsdk/clang_version.txt
             # Remove the emsdk version of emscripten to save space in the
             # persistent workspace and to avoid any confusion with the version
             # we are trying to test.
@@ -171,7 +175,7 @@ commands:
           command: |
             ./emcc --clear-cache
       - pip-install
-      - run: apt-get install -q -y ninja-build
+      - run: apt-get install -q -y ninja-build ccache
       - run:
           name: embuilder build ALL
           command: |
@@ -196,6 +200,12 @@ commands:
           command: |
             ./embuilder build MINIMAL --pic --lto
             ./test/runner test_hello_world
+      - run:
+          name: "Ccache stats"
+          command: |
+            ccache --print-stats
+            ccache --zero-stats
+
   persist:
     description: "Persist the emsdk, libraries, and engines"
     steps:
@@ -209,6 +219,19 @@ commands:
             - vms/
             - wasi-sdk/
             - .jsvu/
+      - when:
+          # Only the main branch will store its cache results, and only the non-main branches
+          # will use cached results. This prevents untrusted PRs from polluting caches used
+          # by other branches.
+          condition:
+            equal: [ "main", << pipeline.git.branch >> ]
+          steps:
+            - save_cache:
+                name: "Save Ccache cache"
+                paths:
+                  - ~/.ccache
+                key: clang-{{ checksum "~/emsdk/clang_version.txt" }}
+
   prepare-for-tests:
     description: "Setup emscripten tests"
     steps:
@@ -543,6 +566,7 @@ jobs:
     environment:
       EMCC_CORES: 16
       EMCC_USE_NINJA: 1
+      EM_COMPILER_WRAPPER: "ccache"
     steps:
       - checkout
       - run:
@@ -570,6 +594,14 @@ jobs:
             tar xvf wasi-sysroot-11.0.tar.gz -C ~/wasi-sdk/
       - install-v8
       - install-emsdk
+      - when:
+          condition:
+            not:
+              equal: [ "main", << pipeline.git.branch >> ]
+          steps:
+            - restore_cache:
+                name: "Restore Ccache cache"
+                key: clang-{{ checksum "~/emsdk/clang_version.txt" }}
       - build-libs
       - run:
           name: Clean build directory
@@ -714,6 +746,8 @@ jobs:
             wasmfs.test_fs_llseek_rawfs
             wasmfs.test_freetype
             minimal0.test_utf
+            minimal0.test_static_variable
+            minimal0.test_stack_overflow
             omitexports0.test_asyncify_longjmp
             omitexports0.test_emscripten_api
             strict.test_no_declare_asm_module_exports

emrun.py

@@ -229,8 +229,9 @@ def create_emrun_safe_firefox_profile():
   temp_firefox_profile_dir = tempfile.mkdtemp(prefix='temp_emrun_firefox_profile_')
   with open(os.path.join(temp_firefox_profile_dir, 'prefs.js'), 'w') as f:
     f.write('''
-// Lift the default max 20 workers limit to something higher to avoid hangs when page needs to spawn a lot of threads.
-user_pref("dom.workers.maxPerDomain", 100);
+// Old Firefox browsers have a maxPerDomain limit of 20. Newer Firefox browsers default to 512. Match the new
+// default here to help test spawning a lot of threads also on older Firefox versions.
+user_pref("dom.workers.maxPerDomain", 512);
 // Always allow opening popups
 user_pref("browser.popups.showPopupBlocker", false);
 user_pref("dom.disable_open_during_load", false);

eslint.config.mjs

@@ -27,6 +27,7 @@ export default [{
     '**/test/',
     'src/polyfill/',
     'src/lib/',
+    'src/minimum_runtime_check.js',
     'src/runtime_*.js',
     'src/shell*.js',
     'src/modularize.js',

site/source/docs/tools_reference/settings_reference.rst

@@ -2511,6 +2511,18 @@ full documentation in site/source/docs/api_reference/wasm_audio_worklets.rst
 
 Default value: 0
 
+.. _audio_worklet_support_audio_params:
+
+AUDIO_WORKLET_SUPPORT_AUDIO_PARAMS
+==================================
+
+If true, enables utilizing k- and a-rate AudioParams based properties in
+Wasm Audio Worklet code. If false, AudioParams are not used. Set to false
+for a tiny improvement to code size and AudioWorklet CPU performance when
+audio synthesis is synchronized using custom WebAssembly Memory-based means.
+
+Default value: true
+
 .. _webaudio_debug:
 
 WEBAUDIO_DEBUG

src/audio_worklet.js

@@ -18,7 +18,11 @@ var instantiatePromise;
 
 if (ENVIRONMENT_IS_AUDIO_WORKLET) {
 
+#if AUDIO_WORKLET_SUPPORT_AUDIO_PARAMS
 function createWasmAudioWorkletProcessor(audioParams) {
+#else
+function createWasmAudioWorkletProcessor() {
+#endif
   class WasmAudioWorkletProcessor extends AudioWorkletProcessor {
     constructor(args) {
       super();
@@ -76,9 +80,11 @@ function createWasmAudioWorkletProcessor(audioParams) {
       stackRestore(oldStackPtr);
     }
 
+#if AUDIO_WORKLET_SUPPORT_AUDIO_PARAMS
     static get parameterDescriptors() {
       return audioParams;
     }
+#endif
 
     /**
      * Marshals all inputs and parameters to the Wasm memory on the thread's
@@ -87,7 +93,13 @@ function createWasmAudioWorkletProcessor(audioParams) {
      *
      * @param {Object} parameters
      */
+#if AUDIO_WORKLET_SUPPORT_AUDIO_PARAMS
     process(inputList, outputList, parameters) {
+#else
+    /** @suppress {checkTypes} */
+    process(inputList, outputList) {
+#endif
+
 #if ALLOW_MEMORY_GROWTH
       // Recreate the output views if the heap has changed
       // TODO: add support for GROWABLE_ARRAYBUFFERS
@@ -117,11 +129,13 @@ function createWasmAudioWorkletProcessor(audioParams) {
       }
       stackMemoryData += outputViewsNeeded * this.bytesPerChannel;
       var numParams = 0;
+#if AUDIO_WORKLET_SUPPORT_AUDIO_PARAMS
       for (entry in parameters) {
         ++numParams;
         stackMemoryStruct += {{{ C_STRUCTS.AudioParamFrame.__size__ }}};
         stackMemoryData += parameters[entry].byteLength;
       }
+#endif
       var oldStackPtr = stackSave();
 #if ASSERTIONS
       console.assert(oldStackPtr == this.ctorOldStackPtr, 'AudioWorklet stack address has unexpectedly moved');
@@ -158,6 +172,7 @@ function createWasmAudioWorkletProcessor(audioParams) {
         }
       }
 
+#if AUDIO_WORKLET_SUPPORT_AUDIO_PARAMS
       // Copy parameters descriptor structs and data to Wasm. 'paramsPtr' is the
       // start of the C callback's input AudioParamFrame.
       var /*const*/ paramsPtr = structPtr;
@@ -170,6 +185,9 @@ function createWasmAudioWorkletProcessor(audioParams) {
         HEAPF32.set(subentry, {{{ getHeapOffset('dataPtr', 'float') }}});
         dataPtr += subentry.length * {{{ getNativeTypeSize('float') }}};
       }
+#else
+      var paramsPtr = 0;
+#endif
 
       // Copy output audio descriptor structs to Wasm. 'outputsPtr' is the start
       // of the C callback's output AudioSampleFrame. 'dataPtr' will now be
@@ -261,7 +279,11 @@ class BootstrapMessages extends AudioWorkletProcessor {
         // '_wpn' is short for 'Worklet Processor Node', using an identifier
         // that will never conflict with user messages
         // Register a real AudioWorkletProcessor that will actually do audio processing.
+#if AUDIO_WORKLET_SUPPORT_AUDIO_PARAMS
         registerProcessor(d['_wpn'], createWasmAudioWorkletProcessor(d.audioParams));
+#else
+        registerProcessor(d['_wpn'], createWasmAudioWorkletProcessor());
+#endif
 #if WEBAUDIO_DEBUG
         console.log(`Registered a new WasmAudioWorkletProcessor "${d['_wpn']}" with AudioParams: ${d.audioParams}`);
 #endif

src/cpuprofiler.js

@@ -756,7 +756,7 @@ function cpuprofiler_add_hooks() {
   emscriptenCpuProfiler.initialize();
 }
 
-if (typeof document != 'undefined') {
+if (globalThis.document) {
   emscriptenCpuProfiler.initialize();
 }
 

src/deterministic.js

@@ -20,7 +20,7 @@ Date.now = deterministicNow;
 // Setting performance.now to deterministicNow doesn't work so we instead
 // use a helper function in parseTools (getPerformanceNow()) to call it
 // directly.
-// if (typeof performance == 'object') performance.now = Date.now;
+// if (globalThis.performance) performance.now = Date.now;
 
 Module['thisProgram'] = 'thisProgram'; // for consistency between different builds than between runs of the same build
 

src/emrun_postjs.js

@@ -7,7 +7,7 @@
  * emcc is run with `--emrun`
  */
 
-if (typeof window == "object" && (typeof ENVIRONMENT_IS_PTHREAD == 'undefined' || !ENVIRONMENT_IS_PTHREAD)) {
+if (globalThis.window && (typeof ENVIRONMENT_IS_PTHREAD == 'undefined' || !ENVIRONMENT_IS_PTHREAD)) {
   var emrun_register_handlers = () => {
     // When C code exit()s, we may still have remaining stdout and stderr
     // messages in flight. In that case, we can't close the browser until all
@@ -89,7 +89,7 @@ if (typeof window == "object" && (typeof ENVIRONMENT_IS_PTHREAD == 'undefined' |
     http.send(data); // XXX  this does not work in workers, for some odd reason (issue #2681)
   };
 
-  if (typeof document != 'undefined') {
+  if (globalThis.document) {
     emrun_register_handlers();
   }
 }

src/emrun_prejs.js

@@ -8,7 +8,7 @@
  */
 
 // Route URL GET parameters to argc+argv
-if (typeof window == 'object') {
+if (globalThis.window) {
   Module['arguments'] = window.location.search.slice(1).trim().split('&');
   for (let i = 0; i < Module['arguments'].length; ++i) {
     Module['arguments'][i] = decodeURI(Module['arguments'][i]);

src/lib/libaddfunction.js

@@ -77,21 +77,16 @@ addToLibrary({
     return code;
   })),
 
+#if !WASM2JS || WASM == 2
   // Wraps a JS function as a wasm function with a given signature.
-#if !WASM2JS
   $convertJsFunctionToWasm__deps: [
     '$uleb128EncodeWithLen',
 #if WASM_JS_TYPES
     '$sigToWasmTypes',
 #endif
     '$generateTypePack'
   ],
-#endif
   $convertJsFunctionToWasm: (func, sig) => {
-#if WASM2JS
-    // return func;
-#else // WASM2JS
-
 #if ASSERTIONS && !WASM_BIGINT
     assert(!sig.includes('j'), 'i64 not permitted in function signatures when WASM_BIGINT is disabled');
 #endif
@@ -100,7 +95,7 @@ addToLibrary({
     // "WebAssembly.Function" constructor.
     // Otherwise, construct a minimal wasm module importing the JS function and
     // re-exporting it.
-    if (typeof WebAssembly.Function == "function") {
+    if (WebAssembly.Function) {
       return new WebAssembly.Function(sigToWasmTypes(sig), func);
     }
 #endif
@@ -135,8 +130,8 @@ addToLibrary({
     var instance = new WebAssembly.Instance(module, { 'e': { 'f': func } });
     var wrappedFunc = instance.exports['f'];
     return wrappedFunc;
-#endif // WASM2JS
   },
+#endif // !WASM2JS && WASM != 2
 
   $freeTableIndexes: [],
 
@@ -192,18 +187,21 @@ addToLibrary({
    * 'sig' parameter is required if the function being added is a JS function.
    */
   $addFunction__docs: '/** @param {string=} sig */',
-  $addFunction__deps: ['$convertJsFunctionToWasm', '$getFunctionAddress',
+  $addFunction__deps: ['$getFunctionAddress',
                        '$functionsInTableMap', '$getEmptyTableSlot',
                        '$setWasmTableEntry',
+#if !WASM2JS || WASM == 2
+                       '$convertJsFunctionToWasm',
+#endif
 #if ASSERTIONS >= 2
                        '$getWasmTableEntry', '$wasmTable',
 #endif
   ],
 
   $addFunction: (func, sig) => {
-  #if ASSERTIONS
+#if ASSERTIONS
     assert(typeof func != 'undefined');
-  #endif // ASSERTIONS
+#endif // ASSERTIONS
     // Check if the function is already in the table, to ensure each function
     // gets a unique index.
     var rtn = getFunctionAddress(func);
@@ -213,17 +211,20 @@ addToLibrary({
 
     // It's not in the table, add it now.
 
-  #if ASSERTIONS >= 2
+#if ASSERTIONS >= 2
     // Make sure functionsInTableMap is actually up to date, that is, that this
     // function is not actually in the wasm Table despite not being tracked in
     // functionsInTableMap.
     for (var i = 0; i < wasmTable.length; i++) {
       assert(getWasmTableEntry(i) != func, 'function in Table but not functionsInTableMap');
     }
-  #endif
+#endif
 
     var ret = getEmptyTableSlot();
 
+#if WASM2JS && WASM != 2
+    setWasmTableEntry(ret, func);
+#else
     // Set the new value.
     try {
       // Attempting to call this with JS function will cause of table.set() to fail
@@ -232,12 +233,13 @@ addToLibrary({
       if (!(err instanceof TypeError)) {
         throw err;
       }
-  #if ASSERTIONS
+#if ASSERTIONS
       assert(typeof sig != 'undefined', 'Missing signature argument to addFunction: ' + func);
-  #endif
+#endif
       var wrapped = convertJsFunctionToWasm(func, sig);
       setWasmTableEntry(ret, wrapped);
     }
+#endif
 
     functionsInTableMap.set(func, ret);