Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update testsuite #2495

Merged
merged 4 commits into from
Oct 31, 2024
Merged

Update testsuite #2495

merged 4 commits into from
Oct 31, 2024

Conversation

keithw
Copy link
Member

@keithw keithw commented Oct 29, 2024

The memory64 table.wast test has started to depend on function-references and gc (which WABT doesn't support yet), so vendor an older version of the test.

@keithw keithw requested a review from sbc100 October 29, 2024 05:48
@sbc100
Copy link
Member

sbc100 commented Oct 29, 2024

The memory64 table.wast test has started to depend on function-references and gc (which WABT doesn't support yet), so vendor an older version of the test.

BTW, the reason for this is that memory64 is based on the wasm-3.0 branch of the spec repo where those proposals are already merged.

Copy link
Member

@sbc100 sbc100 left a comment

Choose a reason for hiding this comment

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

Great! Thanks @keithw

lgtm % comments

src/binary-reader.cc Show resolved Hide resolved
test/wasm2c/spec/memory64/table.txt Show resolved Hide resolved
@keithw
Copy link
Member Author

keithw commented Oct 29, 2024

The memory64 table.wast test has started to depend on function-references and gc (which WABT doesn't support yet), so vendor an older version of the test.

BTW, the reason for this is that memory64 is based on the wasm-3.0 branch of the spec repo where those proposals are already merged.

Makes sense -- I think this is going to become more painful for WABT over time as more proposals go this direction (at least until WABT implements function-references+gc or is refactored on top of wasm-tools or binaryen).

It's caused some issues in the https://github.com/WebAssembly/testsuite/ repo; e.g. memory64 doesn't change if.wast or br_if.wast or data.wast relative to wasm-3.0., but update-testsuite.sh still created https://github.com/WebAssembly/testsuite/blob/main/proposals/memory64/br_if.wast (etc.) because those files differ from the main branch. So it's a little more difficult for us to know what .txt files to create with this revision; test/update-spec-tests.py wants to make a lot of extra .txt files and we can't run most of them because they depend on wasm-3.0.

@sbc100
Copy link
Member

sbc100 commented Oct 29, 2024

The memory64 table.wast test has started to depend on function-references and gc (which WABT doesn't support yet), so vendor an older version of the test.

BTW, the reason for this is that memory64 is based on the wasm-3.0 branch of the spec repo where those proposals are already merged.

Makes sense -- I think this is going to become more painful for WABT over time as more proposals go this direction (at least until WABT implements function-references+gc or is refactored on top of wasm-tools or binaryen).

It's caused some issues in the https://github.com/WebAssembly/testsuite/ repo; e.g. memory64 doesn't change if.wast or br_if.wast or data.wast relative to wasm-3.0., but update-testsuite.sh still created https://github.com/WebAssembly/testsuite/blob/main/proposals/memory64/br_if.wast (etc.) because those files differ from the main branch. So it's a little more difficult for us to know what .txt files to create with this revision; test/update-spec-tests.py wants to make a lot of extra .txt files and we can't run most of them because they depend on wasm-3.0.

Ah yes, I guess we should modify update-testsuite.sh in the test suite repo so that it is aware that not all proposals forked from main.

sbc100 added a commit to WebAssembly/testsuite that referenced this pull request Oct 29, 2024
This means that the memory64 proposal now only contains that tests
that differe from its upstream branch which is wasm-3.0, instead of
including basically all test files.

See WebAssembly/wabt#2495
@sbc100
Copy link
Member

sbc100 commented Oct 30, 2024

Can we remove test/regress/data-count-without-data-section.txt now that its coverted by the upstream test suite? @SoniEx2 ?

@SoniEx2
Copy link
Collaborator

SoniEx2 commented Oct 30, 2024

sure!

alexcrichton pushed a commit to WebAssembly/testsuite that referenced this pull request Oct 30, 2024
This means that the memory64 proposal now only contains that tests
that differe from its upstream branch which is wasm-3.0, instead of
including basically all test files.

See WebAssembly/wabt#2495
The memory64 `table.wast` test has started to depend on
function-references and gc (which WABT doesn't support yet),
so vendor an older version of the test.
@keithw
Copy link
Member Author

keithw commented Oct 31, 2024

sure!

Done.

@keithw keithw merged commit 6a5cbb9 into main Oct 31, 2024
18 checks passed
@keithw keithw deleted the update-testsuite branch October 31, 2024 03:01
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