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.

Sign up for GitHub

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

Jump to bottom

test: Update spectest module definition #695

Merged
merged 2 commits into from
Jan 21, 2021
Merged

test: Update spectest module definition #695

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd6da01
test: Add missing parts to spectest module definition
gumb0 Jan 21, 2021
103f177
test: Reorder spectest module definition according to spec
gumb0 Jan 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions test/spectests/spectests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,32 +24,36 @@ constexpr auto JsonExtension = ".json";
constexpr auto UnnamedModule = "_unnamed";
constexpr unsigned TestMemoryPagesLimit = (4 * 1024 * 1024 * 1024ULL) / fizzy::PageSize; // 4 Gb

// spectest module details:
// https://github.com/WebAssembly/spec/issues/1111
// https://github.com/WebAssembly/spec/blob/e3a3c12f51221daaa901691e674d7ff990029122/interpreter/host/spectest.ml#L33
// https://github.com/WebAssembly/spec/blob/f85f6e6b70fff9ee0f6ba21ebcdad2183bd67874/test/harness/sync_index.js#L79
// spectest module definition:
// https://github.com/WebAssembly/spec/blob/99564b7eaa3452c2633b623c92fc286db2823f39/interpreter/README.md#spectest-host-module
/* wat2wasm
(module
(global (export "global_i32") i32 (i32.const 666))
Copy link
Member

Choose a reason for hiding this comment

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

Do you think this new ordering is dependent on? And if so do you think wabt produced the correct expected output?

If not, is this just to show it is a copy from a spec?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It's just to show correspondence to the spec. Ordering of sections in the module is strict, all members are referred by names only in spectests, and it's not even required for module to be Wasm.

Copy link
Member

Choose a reason for hiding this comment

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

Ordering of sections in the module is strict

The sections are strictly ordered, but the wat->wasm translator could decide how it lays out members within those, e.g. the ordering of functions.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Well many out unit tests assume that wabt puts them in the order as defined in wat.

(global (export "global_i64") i64 (i64.const 666))
(global (export "global_f32") f32 (f32.const 666))
(global (export "global_f64") f64 (f64.const 666))

(table (export "table") 10 20 anyfunc)

(memory (export "memory") 1 2)

(func (export "print"))
(func (export "print_i32") (param i32))
(func (export "print_i64") (param i64))
(func (export "print_i32_f32") (param i32) (param f32))
(func (export "print_f64_f64") (param f64) (param f64))
(func (export "print_f32") (param f32))
(func (export "print_f64") (param f64))
(global (export "global_i32") i32 (i32.const 666))
(global (export "global_f32") f32 (f32.const 666))
(global (export "global_f64") f64 (f64.const 666))
(table (export "table") 10 20 anyfunc)
(memory (export "memory") 1 2)
)
*/
const auto spectest_bin = fizzy::test::from_hex(
"0061736d01000000011a0660000060017f0060027f7d0060027c7c0060017d0060017c000307060001020304050405"
"0170010a14050401010102061b037f00419a050b7d0043008026440b7c00440000000000d084400b0785010b057072"
"696e740000097072696e745f69333200010d7072696e745f6933325f66333200020d7072696e745f6636345f663634"
"0003097072696e745f6633320004097072696e745f66363400050a676c6f62616c5f69333203000a676c6f62616c5f"
"66333203010a676c6f62616c5f6636340302057461626c650100066d656d6f727902000a130602000b02000b02000b"
"02000b02000b02000b");
"0061736d01000000011e0760000060017f0060017e0060027f7d0060027c7c0060017d0060017c0003080700010203"
"04050604050170010a140504010101020621047f00419a050b7e00429a050b7d0043008026440b7c00440000000000"
"d084400b079e010d0a676c6f62616c5f69333203000a676c6f62616c5f69363403010a676c6f62616c5f6633320302"
"0a676c6f62616c5f6636340303057461626c650100066d656d6f72790200057072696e740000097072696e745f6933"
"320001097072696e745f69363400020d7072696e745f6933325f66333200030d7072696e745f6636345f6636340004"
"097072696e745f6633320005097072696e745f66363400060a160702000b02000b02000b02000b02000b02000b0200"
"0b");
const auto spectest_module = fizzy::parse(spectest_bin);
const std::string spectest_name = "spectest";

Expand Down