From 972e659bf59740c3ee44129812f95bec143d01a6 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Tue, 16 May 2023 11:03:45 -0700 Subject: Reintroduce wasm-merge (#5709) We used to have a wasm-merge tool but removed it for a lack of use cases. Recently use cases have been showing up in the wasm GC space and elsewhere, as people are using more diverse toolchains together, for example a project might build some C++ code alongside some wasm GC code. Merging those wasm files together can allow for nice optimizations like inlining and better DCE etc., so it makes sense to have a tool for merging. Background: * Removal: #1969 * Requests: * wasm-merge - why it has been deleted #2174 * Compiling and linking wat files #2276 * wasm-link? #2767 This PR is a compete rewrite of wasm-merge, not a restoration of the original codebase. The original code was quite messy (my fault), and also, since then we've added multi-memory and multi-table which makes things a lot simpler. The linking semantics are as described in the "wasm-link" issue #2767 : all we do is merge normal wasm files together and connect imports and export. That is, we have a graph of modules and their names, and each import to a module name can be resolved to that module. Basically, like a JS bundler would do for JS, or, in other words, we do the same operations as JS code would do to glue wasm modules together at runtime, but at compile time. See the README update in this PR for a concrete example. There are no plans to do more than that simple bundling, so this should not really overlap with wasm-ld's use cases. This should be fairly fast as it works in linear time on the total input code. However, it won't be as fast as wasm-ld, of course, as it does build Binaryen IR for each module. An advantage to working on Binaryen IR is that we can easily do some global DCE after merging, and further optimizations are possible later. --- test/lit/merge/fusing.wat.second | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 test/lit/merge/fusing.wat.second (limited to 'test/lit/merge/fusing.wat.second') diff --git a/test/lit/merge/fusing.wat.second b/test/lit/merge/fusing.wat.second new file mode 100644 index 000000000..387e57bb4 --- /dev/null +++ b/test/lit/merge/fusing.wat.second @@ -0,0 +1,28 @@ +(module + ;; Use the same internal name as in first, so $other.foo will need to be + ;; deduplicated. + (import "first" "foo" (func $other.foo)) + + ;; Use a different prefix than in first ($main instead of $other). + (import "first" "bar" (func $main.bar)) + + (memory $second.mem 2) + + (export "mem" (memory $second.mem)) + + (func $second.foo (export "foo") + (call $other.foo) + (drop + (i32.const 3) + ) + ) + + ;; Use the same internal name as in first, so this will need to be + ;; deduplicated. + (func $bar (export "bar") + (call $main.bar) + (drop + (i32.const 4) + ) + ) +) -- cgit v1.2.3