Skip to content

binary/wat: Implement EHv4#2470

Merged
sbc100 merged 13 commits into
WebAssembly:mainfrom
SoniEx2:ehv4
Nov 20, 2024
Merged

binary/wat: Implement EHv4#2470
sbc100 merged 13 commits into
WebAssembly:mainfrom
SoniEx2:ehv4

Conversation

@SoniEx2

@SoniEx2 SoniEx2 commented Sep 22, 2024

Copy link
Copy Markdown
Collaborator

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

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

SoniEx2 commented Oct 1, 2024

Copy link
Copy Markdown
Collaborator Author

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

@SoniEx2

SoniEx2 commented Oct 1, 2024

Copy link
Copy Markdown
Collaborator Author

@sbc100

@sbc100

sbc100 commented Oct 1, 2024

Copy link
Copy Markdown
Member

Adding @aheejin too

Comment thread include/wabt/type.h Outdated
case Type::I8: return "i8";
case Type::I16: return "i16";
case Type::ExnRef:
return "exnref";

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Comment thread src/binary-reader-ir.cc
if (!buffer.empty()) {
// remove trailing space
buffer.pop_back();
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Comment thread src/interp/binary-reader-interp.cc Outdated
{},
{Istream::kInvalidOffset},
static_cast<u32>(local_decl_count_),
0});

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did this code move?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, lets split out whatever we can.

@sbc100 sbc100 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Looks good so far.

sbc100 pushed a commit that referenced this pull request Oct 1, 2024
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 SoniEx2 marked this pull request as draft October 3, 2024 10:35
@SoniEx2

SoniEx2 commented Oct 3, 2024

Copy link
Copy Markdown
Collaborator Author

@sbc100 how do you fix the lint task?

@sbc100

sbc100 commented Oct 3, 2024

Copy link
Copy Markdown
Member

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

@SoniEx2

SoniEx2 commented Oct 3, 2024

Copy link
Copy Markdown
Collaborator Author

there we go. good enough. smh.

sigh...

@SoniEx2

SoniEx2 commented Oct 3, 2024

Copy link
Copy Markdown
Collaborator Author

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

@SoniEx2

SoniEx2 commented Oct 4, 2024

Copy link
Copy Markdown
Collaborator Author

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

@SoniEx2

SoniEx2 commented Oct 5, 2024

Copy link
Copy Markdown
Collaborator Author

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 SoniEx2 changed the title Add partial support for EHv4 Implement EHv4 Oct 8, 2024
@SoniEx2 SoniEx2 marked this pull request as ready for review October 8, 2024 21:51
@SoniEx2

SoniEx2 commented Oct 8, 2024

Copy link
Copy Markdown
Collaborator Author

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

SoniEx2 commented Oct 14, 2024

Copy link
Copy Markdown
Collaborator Author

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

@sbc100

sbc100 commented Oct 30, 2024

Copy link
Copy Markdown
Member

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

@aheejin

aheejin commented Nov 10, 2024

Copy link
Copy Markdown
Member

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

SoniEx2 commented Nov 10, 2024

Copy link
Copy Markdown
Collaborator Author

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

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

SoniEx2 commented Nov 10, 2024

Copy link
Copy Markdown
Collaborator Author

yeeted interp, why not

@SoniEx2

SoniEx2 commented Nov 14, 2024

Copy link
Copy Markdown
Collaborator Author

@sbc100 ptal

@SoniEx2

SoniEx2 commented Nov 19, 2024

Copy link
Copy Markdown
Collaborator Author

@sbc100 ping?

Comment thread include/wabt/binary-reader.h Outdated
Index tag;
Index depth;
};
using RawCatchVector = std::vector<RawCatch>;

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But we do we the term "Raw" to mean "in the binary" elsewhere in this file? i.e. what do we do for other types that have binary and wabt IR representations?

Comment thread test/roundtrip/fold-unreachable.txt
@SoniEx2

SoniEx2 commented Nov 20, 2024

Copy link
Copy Markdown
Collaborator Author

@sbc100 how is this?

@sbc100 sbc100 merged commit a0b7abe into WebAssembly:main Nov 20, 2024
@SoniEx2 SoniEx2 mentioned this pull request Nov 20, 2024
@SoniEx2 SoniEx2 deleted the ehv4 branch November 20, 2024 20:56
sbc100 pushed a commit that referenced this pull request Nov 20, 2024
@SoniEx2 SoniEx2 mentioned this pull request Nov 20, 2024
sbc100 pushed a commit that referenced this pull request Jan 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants