Merge with WebAssembly/spec branch `wasm-3.0` #90

dhil · 2024-09-25T07:54:43Z

This patch brings in the specification and reference interpreter changes from the wasm-3.0 branch (https://github.com/WebAssembly/spec/tree/wasm-3.0).

An extra 0 byte is added after the function index, to make room for possibible future function-level hints. Also the offset and hint values in the branchint structure are swapped. Again, for flexible forward compatibility. See WebAssembly/branch-hinting#6 for the rationale

…Assembly#12) * Fix binary grammar definition of the branch hints custom section The overall section structure definition wasm missing.

See WebAssembly/branch-hinting#2

This does not change much but it is more compatible with the code metadata format, where the field is not fixed but it represents the size of the payload as a u32.

* [interpreter] Handle custom sections and annotations Co-authored-by: Yuri Iozzelli <[email protected]> * Fix merge conflict * Fix lexer priorities * Fix wast.ml * Oops * Update wast.ml --------- Co-authored-by: Andreas Rossberg <[email protected]>

…format

This was renamed to kWasmVoid in WebAssembly/memory64@2f5a7c5.

rossberg

Rubberstamp.

Exn has been merged into wasm-3.0 a while ago, so you shouldn't need to merge that separately. (Though as long as you didn't get any merge conflicts from the latter, it shouldn't harm either. Did the 2nd merge say anything but "is already included"?)

dhil · 2024-09-25T12:42:23Z

Rubberstamp.

Exn has been merged into wasm-3.0 a while ago, so you shouldn't need to merge that separately. (Though as long as you didn't get any merge conflicts from the latter, it shouldn't harm either. Did the 2nd merge say anything but "is already included"?)

I made the merge using the 'ort' strategy. It didn't say anything about already included. The diff from wasm-3.0+exn and wasm-3.0 seems to be:

180 files changed, 9851 insertions(+), 1143 deletions(-)

If you like, I can redo the merge straight from wasm-3.0.

rossberg · 2024-09-25T12:46:00Z

Hm, to be sure nothing weird has happened, can you diff this branch against upstream/wasm-3.0? AFAICS, the diff should be empty if everything is correct.

dhil · 2024-09-25T12:54:47Z

This is the diff https://gist.github.com/dhil/01e35c5ffaaf1e9513350010a73520d2

TL;DR: explainer documents and code examples.

dhil · 2024-09-25T12:56:52Z

I can just roll back to HEAD and apply the changes from wasm-3.0. It is no problem.

dhil · 2024-09-25T12:59:51Z

OK, I have remerged it now. The additions/deletions seem to be the same. The merge with wasm-3.0+exn is now gone from the commit history.

rossberg · 2024-09-25T13:01:26Z

Perfect, thanks!

slindley · 2024-09-25T13:42:51Z

It looks to me like this PR is entirely uncontroversial and ready to go (it's just a case of bringing the stack-switching repo up-to-date). @fgmccabe please can you confirm that you're happy for it to be merged.

* Rename "index type" to "address type" across the spec * Update "index type" to "address type" in the spec interpreter * Update section underlines It is very important that you have precisely the correct number of dots. It would be too much work for the computer otherwise. * Rename "address type" to "addr type" in the spec interpreter * Revert one stray interpreter update

…bAssembly#94) "index" was renamed to "address". Without this change, all JS tests generated from the core tests will fail.

yuri91 and others added 30 commits February 21, 2022 15:43

Add a file explaining the motivations of the proposal

af5d6c8

Add a link to the motivation in the overview

88586a0

Update benchmark to new format

c2babd6

Fix binary grammar definition of the branch hints custom section (Web…

b0913a9

…Assembly#12) * Fix binary grammar definition of the branch hints custom section The overall section structure definition wasm missing.

Add syntactic requirements to the branchHints section. (WebAssembly#10)

36a0550

See WebAssembly/branch-hinting#2

Update the background with relevant discussions

40ea5f5

Branch Hinting: rewrite spec based on new code annotation approach

5ff3f0a

Branch Hinting: Update benchmarks to new code annotation approach

a4a90d1

Branch Hinting: fix error in formal notation

66609f4

Branch Hinting: update the overview

f199a4b

Branch Hinting: change section name to metadata.code.branch_hint

24d8856

Branch Hinting: Add spec text for the branch hint annotations

20a71a6

Remove custom annotations section from the README

cb74721

Branch Hinting: update Overview

cbb438f

Fix conf for branch hinting proposl

64cb3bd

Branch Hinting: update readme with link to rendered spec

032f458

Branch Hinting: update benchmark with new format

4992a1d

Branch Hinting: change fixed '1' value type from byte to u32

d4f5f82

This does not change much but it is more compatible with the code metadata format, where the field is not fixed but it represents the size of the payload as a u32.

Merge remote-tracking branch 'upstream/main' into main

7014ad6

Merge remote-tracking branch 'upstream/main' into main

9db2465

Merge remote-tracking branch 'upstream/main'

836c9c8

Attempt to downgrade node.js

b2f6894

Rrrh...

e3c0b5d

Try to get output

cff2af9

Another attempt to get output

603d148

Avoid duplicate module name in test and improve diagnostics

09c8953

Merge remote-tracking branch 'annotations/main' into merge_annot

c11c512

rossberg and others added 9 commits September 14, 2024 18:23

Merge remote-tracking branch 'annot/main' into wasm-3.0

5c7c1d3

Fix typos in catch validation

517034e

Fix return result type

7eae1f4

[spec] Add missing i32x4.extadd_pairwise_i16x8_u instruction to text …

04a39c5

…format

Merge branch 'main' into wasm-3.0

3c001a5

[spec] Tweak format of changes list

670ae7e

Merge branch 'main' into wasm-3.0

bb6fc9c

Fix indentation levels

f501994

[test] Fix left-over use of kWasmStmt in wasm-module-builder (#1812)

a315401

This was renamed to kWasmVoid in WebAssembly/memory64@2f5a7c5.

dhil requested review from fgmccabe and rossberg September 25, 2024 07:54

dhil changed the title ~~Merge with WebAssembly/spec branch wasm-3.0-exn~~ Merge with WebAssembly/spec branch wasm-3.0 Sep 25, 2024

rossberg approved these changes Sep 25, 2024

View reviewed changes

Merge branch 'wasm-3.0' of github.com:WebAssembly/spec into wasm-3.0

264d2ad

dhil force-pushed the wasm-3.0 branch from 47761c4 to 264d2ad Compare September 25, 2024 12:58

dhil mentioned this pull request Sep 25, 2024

Reference interpreter #84

Merged

dhil requested a review from tlively September 26, 2024 12:03

slindley removed request for fgmccabe and tlively September 28, 2024 15:47

slindley merged commit a929dc4 into WebAssembly:main Sep 28, 2024
9 checks passed

dhil deleted the wasm-3.0 branch September 29, 2024 07:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge with WebAssembly/spec branch `wasm-3.0` #90

Merge with WebAssembly/spec branch `wasm-3.0` #90

dhil commented Sep 25, 2024 •

edited

Loading

rossberg left a comment

dhil commented Sep 25, 2024 •

edited

Loading

rossberg commented Sep 25, 2024

dhil commented Sep 25, 2024

dhil commented Sep 25, 2024

dhil commented Sep 25, 2024

rossberg commented Sep 25, 2024

slindley commented Sep 25, 2024

Merge with WebAssembly/spec branch wasm-3.0 #90

Merge with WebAssembly/spec branch wasm-3.0 #90

Conversation

dhil commented Sep 25, 2024 • edited Loading

rossberg left a comment

Choose a reason for hiding this comment

dhil commented Sep 25, 2024 • edited Loading

rossberg commented Sep 25, 2024

dhil commented Sep 25, 2024

dhil commented Sep 25, 2024

dhil commented Sep 25, 2024

rossberg commented Sep 25, 2024

slindley commented Sep 25, 2024

Merge with WebAssembly/spec branch `wasm-3.0` #90

Merge with WebAssembly/spec branch `wasm-3.0` #90

dhil commented Sep 25, 2024 •

edited

Loading

dhil commented Sep 25, 2024 •

edited

Loading