binary/wat: Implement EHv4 #2470

SoniEx2 · 2024-09-22T17:31:06Z

This pull request implements EHv4. Binary is mostly untested until interp is working.

SoniEx2 · 2024-10-01T02:13:20Z

marking this as ready for review even if it's not fully complete, would love to hear feedback.

SoniEx2 · 2024-10-01T10:16:43Z

@sbc100

sbc100 · 2024-10-01T15:37:40Z

Adding @aheejin too

sbc100 · 2024-10-01T17:55:58Z

include/wabt/type.h

@@ -87,6 +88,8 @@ class Type {
      case Type::V128:      return "v128";
      case Type::I8:        return "i8";
      case Type::I16:       return "i16";
+      case Type::ExnRef:
+        return "exnref";


Use a single line like the surrounding code here and below?

src/binary-reader-ir.cc

sbc100 · 2024-10-01T18:02:17Z

src/binary-reader-objdump.cc

+  if (!buffer.empty()) {
+    // remove trailing space
+    buffer.pop_back();
+  }


I wonder if there is some way to refactor this such to avoid adding and removing the trailing whitespace like this?

sbc100 · 2024-10-01T18:04:52Z

src/interp/binary-reader-interp.cc

+                                        {},
+                                        {Istream::kInvalidOffset},
+                                        static_cast<u32>(local_decl_count_),
+                                        0});


Why did this code move?

fix for #2476 (you may want us to split this out, along with the fix for #2469 ?). we implemented the fix while trying to figure out how to work the interpreter (unfortunately we still don't know how to implement EHv4 in the interpreter)

Yup, lets split out whatever we can.

sbc100

Wow, thanks for all the work on this. Very impressive!

Looks good so far.

Fixes the value stack size of the catch handler. There were two (related) issues here: - The previous code used `func_->locals.size()` as soon as the function was available, but it hadn't processed the function's locals yet, so it was always empty. (This might not matter in practice, as it's only used by the "function-wide catch handler", which just rethrows.) - The previous code didn't take the function's locals into account when computing the value stack height (relative to the function frame) for a try-catch block. So, it would drop the locals when catching an exception. Closes #2476 (Split from #2470 )

SoniEx2 · 2024-10-03T19:17:05Z

@sbc100 how do you fix the lint task?

sbc100 · 2024-10-03T21:34:47Z

I think you want to add // clang-format off`` / // clang-format on` around those switch statements.

SoniEx2 · 2024-10-03T21:52:56Z

there we go. good enough. smh.

sigh...

SoniEx2 · 2024-10-03T22:01:30Z

we can bump the testsuite later, so we're splitting that out as well...

SoniEx2 · 2024-10-04T11:36:52Z

there are a lot of TODOs related to reftypes in the interpreter...

SoniEx2 · 2024-10-05T22:11:23Z

we think we figured it out, just need to get #2483 and #2484 merged and then we can get all tests to pass (not that we have enough tests for EHv4 but anyway)

SoniEx2 · 2024-10-08T21:52:47Z

we believe that's all we really need for EHv4, @sbc100 let us know if there's something we missed (or if you have any ideas for how to split this up, because we don't...)

SoniEx2 · 2024-10-14T13:06:38Z

@sbc100 when do you think you can get around to reviewing this?

sbc100 · 2024-10-30T02:48:05Z

Do you want to rebase this change and we can see how much of it remains after the split out changes.

sbc100

Thanks!

This PR is still pretty huge. I manged to glance over it and it looks good, but I didn't dive into the interp stuff or the wasm2c stuff.

@keithw @aheejin do either of you have time to help review this?

I think maybe landing the wasm2c change after everything else might be one more logical place to split this?

sbc100 · 2024-10-30T17:39:39Z

include/wabt/binary-reader.h

+  Index tag;
+  Index depth;
+};
+using RawCatchVector = std::vector<RawCatch>;


Why is "Raw" in the name here?

they match what's in the binary, vs the representation used in the wabt IR.

src/c-writer.cc

src/interp/binary-reader-interp.cc

sbc100 · 2024-10-30T17:49:38Z

src/interp/binary-reader-interp.cc

+    // TryTable blocks need a try_end_offset
+    Label* local_label = TopLabel();
+    HandlerDesc& desc = func_->handlers[local_label->handler_desc_index];
+    desc.try_end_offset = istream_.end();


Is this different to above block? Looks like maybe only in the assertion?

should we merge them? what do we do about the assert?

wasm2c/wasm-rt-impl.c

aheejin · 2024-10-31T06:00:09Z

Thanks for the work! I'll be OOO for a week from tomorrow; I'm not an expert of Wabt but I can take a look once I come back. (You don't need to wait for me in case others think the PR is good to land, for sure)

But first I'd also like to suggest to split the PR. Smaller PRs are easier to review. I think this can probably be splitted into text parsing / binary parsing / type checking / interpreter / wasm2c.

SoniEx2 · 2024-11-09T19:46:20Z

split out the wasm2c stuff

aheejin · 2024-11-10T00:07:29Z

It looks this still contains many stuff other than the interpreter. I think parsing and printing can go first before the interpreter and split to another PR.

SoniEx2 · 2024-11-10T01:09:46Z

parsing and printing are tricky because we don't run roundtrip against spec 🙃

SoniEx2 · 2024-11-10T18:45:17Z

yeeted interp, why not

SoniEx2 · 2024-11-14T14:18:05Z

@sbc100 ptal

SoniEx2 force-pushed the ehv4 branch from 7482f4a to a2b8ad7 Compare September 26, 2024 02:59

SoniEx2 marked this pull request as ready for review October 1, 2024 02:12

sbc100 reviewed Oct 1, 2024

View reviewed changes

src/binary-reader-ir.cc Outdated Show resolved Hide resolved

sbc100 reviewed Oct 1, 2024

View reviewed changes

SoniEx2 mentioned this pull request Oct 1, 2024

wasm-interp: Fix catch handlers' value stack sizes #2478

Merged

This was referenced Oct 2, 2024

wasm2c EH: Move away from alloca #2480

Closed

wasm2c: Fix handling of locals in setjmp targets #2479

Merged

SoniEx2 marked this pull request as draft October 3, 2024 10:35

SoniEx2 force-pushed the ehv4 branch from eb741af to 2d78c00 Compare October 3, 2024 16:42

SoniEx2 force-pushed the ehv4 branch from aab6433 to ad9a8a6 Compare October 8, 2024 21:36

SoniEx2 changed the title ~~Add partial support for EHv4~~ Implement EHv4 Oct 8, 2024

SoniEx2 marked this pull request as ready for review October 8, 2024 21:51

keithw mentioned this pull request Oct 29, 2024

binary-reader-ir: Track usage of exception handling in features_used #2496

Merged

SoniEx2 force-pushed the ehv4 branch from 8576230 to 0875c47 Compare October 30, 2024 12:55

sbc100 reviewed Oct 30, 2024

View reviewed changes

SoniEx2 force-pushed the ehv4 branch 2 times, most recently from e634e83 to f92fff4 Compare November 9, 2024 18:51

SoniEx2 changed the title ~~Implement EHv4~~ interp: Implement EHv4 Nov 9, 2024

SoniEx2 added 11 commits November 10, 2024 12:55

Add partial support for EHv4

7c807e7

Lint

264b269

wasm2c: Implement EHv4

b1314b4

Small clean up

8618001

wasm-interp: Implement EHv4

bdd19cf

Lint

ea37ec4

wasm2c: unimplemented

e28bb21

These aren't supposed to be here

8240f25

These shouldn't exist either...

0224956

interp: unimplemented

24b6fdb

Fold throw_ref too

42fcd67

SoniEx2 force-pushed the ehv4 branch from 6688068 to 42fcd67 Compare November 10, 2024 16:08

SoniEx2 changed the title ~~interp: Implement EHv4~~ binary/wat: Implement EHv4 Nov 10, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

binary/wat: Implement EHv4 #2470

binary/wat: Implement EHv4 #2470

SoniEx2 commented Sep 22, 2024 •

edited

Loading

SoniEx2 commented Oct 1, 2024

SoniEx2 commented Oct 1, 2024

sbc100 commented Oct 1, 2024

sbc100 Oct 1, 2024

sbc100 Oct 1, 2024

sbc100 Oct 1, 2024

SoniEx2 Oct 1, 2024

sbc100 Oct 1, 2024

sbc100 left a comment

SoniEx2 commented Oct 3, 2024

sbc100 commented Oct 3, 2024

SoniEx2 commented Oct 3, 2024

SoniEx2 commented Oct 3, 2024

SoniEx2 commented Oct 4, 2024

SoniEx2 commented Oct 5, 2024 •

edited

Loading

SoniEx2 commented Oct 8, 2024

SoniEx2 commented Oct 14, 2024

sbc100 commented Oct 30, 2024

sbc100 left a comment

sbc100 Oct 30, 2024

SoniEx2 Oct 30, 2024

sbc100 Oct 30, 2024

SoniEx2 Oct 30, 2024

aheejin commented Oct 31, 2024

SoniEx2 commented Nov 9, 2024

aheejin commented Nov 10, 2024

SoniEx2 commented Nov 10, 2024

SoniEx2 commented Nov 10, 2024

SoniEx2 commented Nov 14, 2024

binary/wat: Implement EHv4 #2470

Are you sure you want to change the base?

binary/wat: Implement EHv4 #2470

Conversation

SoniEx2 commented Sep 22, 2024 • edited Loading

SoniEx2 commented Oct 1, 2024

SoniEx2 commented Oct 1, 2024

sbc100 commented Oct 1, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sbc100 left a comment

Choose a reason for hiding this comment

SoniEx2 commented Oct 3, 2024

sbc100 commented Oct 3, 2024

SoniEx2 commented Oct 3, 2024

SoniEx2 commented Oct 3, 2024

SoniEx2 commented Oct 4, 2024

SoniEx2 commented Oct 5, 2024 • edited Loading

SoniEx2 commented Oct 8, 2024

SoniEx2 commented Oct 14, 2024

sbc100 commented Oct 30, 2024

sbc100 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aheejin commented Oct 31, 2024

SoniEx2 commented Nov 9, 2024

aheejin commented Nov 10, 2024

SoniEx2 commented Nov 10, 2024

SoniEx2 commented Nov 10, 2024

SoniEx2 commented Nov 14, 2024

SoniEx2 commented Sep 22, 2024 •

edited

Loading

SoniEx2 commented Oct 5, 2024 •

edited

Loading