Replace `Module["asm"]` with `wasmExports` global #19816

sbc100 · 2023-07-08T04:26:19Z

This brings the regular runtime closer MINIMAL_RUNTIME which uses the global asm to refer to exports object. As a followup we should consider merging these two symbols.

This also matches the names of the other globals such as wasmImports and wasmMemory.

sbc100 · 2023-07-08T04:29:37Z

If we think its necessary we could consider continuing to support the old Module['asm'] syntax property when not in STRICT mode?

sbc100 · 2023-07-10T22:47:55Z

If we think its necessary we could consider continuing to support the old Module['asm'] syntax property when not in STRICT mode?

I added support for a -sEXPORT_RUNTIME_METHODS=wasmImports so folks can still get access to this from the outside if they really need too.

src/preamble.js

kripken · 2023-07-11T15:42:21Z

src/modules.js

@@ -382,6 +382,7 @@ function exportRuntime() {
    'abort',
    'keepRuntimeAlive',
    'wasmMemory',
+    'wasmExports',


Is this needed? The explicit maybeExport in the proper places handles it, no?

kripken · 2023-07-11T15:44:28Z

src/parseTools.js

@@ -865,6 +865,13 @@ function hasExportedSymbol(sym) {
  return WASM_EXPORTS.has(sym);
 }

+function maybeExport(sym) {


How is this related to the function here with the same name?

emscripten/src/modules.js

Line 347 in 3e780ad

function maybeExport(name) {

Good point. The one in module.js is local to the exportRuntime so is not public/accessible. Its also has some logic for renaming/legacy support that we don't need in this case. I'm not sure its wroth trying to combine them

Perhaps a different name would be helpful, at least, to avoid confusion? Can maybe rename the other one if that's simpler, to maybe maybeExportAndCheck ("check" for that other renaming/legacy stuff you mentioned..?)

I renamed the new function receivedSymbol for now, and added a comment.

We could potentially clean this up as a followup by introducing the concept of a delayed export (i.e. and export that cannot be set until after instantiation. But for now I think this change is big enough.

tools/acorn-optimizer.js

This brings the regular runtime closer `MINIMAL_RUNTIME` which uses the global `asm` to refer to exports object. As a followup we should consider merging these two symbols.

kripken

I don't have a better idea for a name for the new function... if we think of one maybe we can refactor later. Looks great for now.

I missed a few cases back in #19816. This change completely the transition saving even more on code size.

This matches the name used by the regualar runtime as of #19816 and removes one of them major differences between the two runtimes.

I missed a few cases back in #19816. This change completely the transition saving even more on code size.

This matches the name used by the regualar runtime as of #19816 and removes one of them major differences between the two runtimes.

I missed a few cases back in #19816. This change completely the transition saving even more on code size.

This matches the name used by the regualar runtime as of #19816 and removes one of them major differences between the two runtimes.

I missed a few cases back in #19816. This change completely the transition saving even more on code size.

This matches the name used by the regualar runtime as of #19816 and removes one of them major differences between the two runtimes.

Module.asm was removed, use wasmExports instead. Context: emscripten-core/emscripten#19816

* [wasm] Bump emscripten to 3.1.56 * Replace Module.asm with Module.wasmExports Module.asm was removed, use wasmExports instead. Context: emscripten-core/emscripten#19816 * Updates for .native.worker.js -> mjs rename Context: emscripten-core/emscripten#21041 * Update deps * Add general testing feed * Update mode deps * Update path * Use current python packages for now, we don't have newer ones The current names 3.1.34 are new enough * Keep using llvm 16 for runtime and aot compiler * Add -Wno-pre-c11-compat only for browser * Temporarily disable version checks to get further * Temporarily disable version checks to get further #2 * Disable -Wunused-command-line-argument * Update emsdk deps * Update icu dependency * Revert "Temporarily disable version checks to get further #2" This reverts commit 3f8834f. * Revert "Temporarily disable version checks to get further" This reverts commit fe1e5c6. * Fix emsdk check We use system python on osx too * Workaround wasm-opt crash * Workaround wasm-opt crash * Workaround wasm-opt crash * Fix WBT test * Feedback * Update ICU dependency * Update emscripten deps * Revert "Workaround wasm-opt crash" This reverts commit 200cf3b. * Revert "Workaround wasm-opt crash" This reverts commit 4530edf. * Revert "Workaround wasm-opt crash" This reverts commit 3593c41. * Increase tests timeout * Show test progress * Increase MT library tests timeout * Disable WBT tests with SkiaSharp * Increase helix tests timeout on browser * Increase WBT timeout * Increase initial heap sizes * Fix mono_wasm_load_runtime cwrap signature Fixes: `Uncaught ExitStatus: Assertion failed: stringToUTF8Array expects a string (got number)` * Enable XunitShowProgress for threading tasks tests * Try to reduce number of parallel AOT compilations To check whether it will improve memory issues on CI * Use new docker image for helix/windows tests * Revert "Try to reduce number of parallel AOT compilations" This reverts commit 5d9a6d2. * Reduce the timeouts * Reduce intitial heap size * use active issues for MT * Remove testing channel from nuget config, update deps * Update emsdk and icu dependencies --------- Co-authored-by: Larry Ewing <lewing@microsoft.com> Co-authored-by: pavelsavara <pavel.savara@gmail.com>

sbc100 requested a review from kripken July 8, 2023 04:28

sbc100 force-pushed the wasmExports branch from 4283c50 to e8f10db Compare July 8, 2023 04:28

sbc100 force-pushed the wasmExports branch 5 times, most recently from 14f3f38 to 5a3b9e8 Compare July 10, 2023 22:47

sbc100 force-pushed the wasmExports branch from 5a3b9e8 to 626f25e Compare July 10, 2023 22:52

sbc100 mentioned this pull request Jul 11, 2023

How should I access the WebAssembly.Memory instance? #19832

Open

sbc100 force-pushed the wasmExports branch from 626f25e to 3e780ad Compare July 11, 2023 00:51

kripken reviewed Jul 11, 2023

View reviewed changes

sbc100 force-pushed the wasmExports branch 3 times, most recently from a1d149f to 00e9f24 Compare July 12, 2023 18:43

Replace Module["asm"] with wasmExports global

f6b8ff1

This brings the regular runtime closer `MINIMAL_RUNTIME` which uses the global `asm` to refer to exports object. As a followup we should consider merging these two symbols.

sbc100 force-pushed the wasmExports branch from 00e9f24 to f6b8ff1 Compare July 12, 2023 18:46

kripken approved these changes Jul 12, 2023

View reviewed changes

sbc100 merged commit 68ee2af into main Jul 12, 2023
2 checks passed

sbc100 deleted the wasmExports branch July 12, 2023 20:08

pavelsavara mentioned this pull request Jul 25, 2023

[wasm] Jiterpreter multithreading support dotnet/runtime#88279

Merged

sbc100 added a commit that referenced this pull request Jul 26, 2023

Continue transition from asm to wasmExports. NFC

ce521e0

I missed a few cases back in #19816. This change completely the transition saving even more on code size.

sbc100 mentioned this pull request Jul 26, 2023

Continue transition from asm to wasmExports. NFC #19900

Merged

sbc100 added a commit that referenced this pull request Jul 26, 2023

Continue transition from asm to wasmExports. NFC

d54e9d9

I missed a few cases back in #19816. This change completely the transition saving even more on code size.

sbc100 added a commit that referenced this pull request Jul 26, 2023

Rename asm to wasmExports under MINIMAL_RUNTIME

b2f9b9c

This matches the name used by the regualar runtime as of #19816 and removes one of them major differences between the two runtimes.

sbc100 mentioned this pull request Jul 26, 2023

Rename asm to wasmExports under MINIMAL_RUNTIME #19901

Merged

sbc100 added a commit that referenced this pull request Jul 26, 2023

Continue transition from asm to wasmExports. NFC

140c53e

I missed a few cases back in #19816. This change completely the transition saving even more on code size.

sbc100 added a commit that referenced this pull request Jul 26, 2023

Rename asm to wasmExports under MINIMAL_RUNTIME

7a01695

This matches the name used by the regualar runtime as of #19816 and removes one of them major differences between the two runtimes.

sbc100 added a commit that referenced this pull request Jul 26, 2023

Continue transition from asm to wasmExports. NFC

829e61e

I missed a few cases back in #19816. This change completely the transition saving even more on code size.

sbc100 added a commit that referenced this pull request Jul 26, 2023

Rename asm to wasmExports under MINIMAL_RUNTIME

8287b65

This matches the name used by the regualar runtime as of #19816 and removes one of them major differences between the two runtimes.

sbc100 added a commit that referenced this pull request Jul 26, 2023

Rename asm to wasmExports under MINIMAL_RUNTIME

f2fe5d2

This matches the name used by the regualar runtime as of #19816 and removes one of them major differences between the two runtimes.

sbc100 added a commit that referenced this pull request Jul 26, 2023

Continue transition from asm to wasmExports. NFC (#19900)

fa2a1f3

I missed a few cases back in #19816. This change completely the transition saving even more on code size.

sbc100 added a commit that referenced this pull request Jul 26, 2023

Rename asm to wasmExports under MINIMAL_RUNTIME

6406beb

This matches the name used by the regualar runtime as of #19816 and removes one of them major differences between the two runtimes.

sbc100 added a commit that referenced this pull request Jul 26, 2023

Rename asm to wasmExports under MINIMAL_RUNTIME (#19901)

0bf0d39

This matches the name used by the regualar runtime as of #19816 and removes one of them major differences between the two runtimes.

srl295 mentioned this pull request Aug 1, 2023

fix(developer): fix breakage from emscripten 3.1.44 🙀 keymanapp/keyman#9375

Merged

sbc100 mentioned this pull request Aug 24, 2023

DOCS Update Module-Splitting code #20118

Merged

ajrcarey mentioned this pull request Dec 19, 2023

"Aborted(Module.asm has been replaced by wasmExports ..." error in WASM bundle example ajrcarey/pdfium-render#128

Closed

radekdoulik added a commit to radekdoulik/runtime that referenced this pull request Mar 27, 2024

Replace Module.asm with Module.wasmExports

a91ec44

Module.asm was removed, use wasmExports instead. Context: emscripten-core/emscripten#19816

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace `Module["asm"]` with `wasmExports` global #19816

Replace `Module["asm"]` with `wasmExports` global #19816

sbc100 commented Jul 8, 2023 •

edited

Loading

sbc100 commented Jul 8, 2023

sbc100 commented Jul 10, 2023

kripken Jul 11, 2023

kripken Jul 11, 2023

sbc100 Jul 12, 2023 •

edited

Loading

kripken Jul 12, 2023

sbc100 Jul 12, 2023

kripken left a comment

Replace Module["asm"] with wasmExports global #19816

Replace Module["asm"] with wasmExports global #19816

Conversation

sbc100 commented Jul 8, 2023 • edited Loading

sbc100 commented Jul 8, 2023

sbc100 commented Jul 10, 2023

kripken Jul 11, 2023

Choose a reason for hiding this comment

kripken Jul 11, 2023

Choose a reason for hiding this comment

sbc100 Jul 12, 2023 • edited Loading

Choose a reason for hiding this comment

kripken Jul 12, 2023

Choose a reason for hiding this comment

sbc100 Jul 12, 2023

Choose a reason for hiding this comment

kripken left a comment

Choose a reason for hiding this comment

Replace `Module["asm"]` with `wasmExports` global #19816

Replace `Module["asm"]` with `wasmExports` global #19816

sbc100 commented Jul 8, 2023 •

edited

Loading

sbc100 Jul 12, 2023 •

edited

Loading