Skip to content

Commit e88bc66

Browse files
authored
Enabled merged proposals by default (#1405)
This enables three proposals by default since they've been merged into the upstream specification: * `saturating-float-to-int` - WebAssembly/spec#1143 * `sign-extension` - WebAssembly/spec#1144 * `multi-value` - WebAssembly/spec#1145 Most of the fallout from this is in the test suite with lots of `--enable` flags getting removed and some tests which now unconditionally pass also getting removed. Two spec tests explicitly pass `--disable` until the spec test submodule is updated.
1 parent 9068d39 commit e88bc66

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+207
-477
lines changed

src/feature.def

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424

2525
WABT_FEATURE(exceptions, "exceptions", false, "Experimental exception handling")
2626
WABT_FEATURE(mutable_globals, "mutable-globals", true, "Import/export mutable globals")
27-
WABT_FEATURE(sat_float_to_int, "saturating-float-to-int", false, "Saturating float-to-int operators")
28-
WABT_FEATURE(sign_extension, "sign-extension", false, "Sign-extension operators")
27+
WABT_FEATURE(sat_float_to_int, "saturating-float-to-int", true, "Saturating float-to-int operators")
28+
WABT_FEATURE(sign_extension, "sign-extension", true, "Sign-extension operators")
2929
WABT_FEATURE(simd, "simd", false, "SIMD support")
3030
WABT_FEATURE(threads, "threads", false, "Threading support")
31-
WABT_FEATURE(multi_value, "multi-value", false, "Multi-value")
31+
WABT_FEATURE(multi_value, "multi-value", true, "Multi-value")
3232
WABT_FEATURE(tail_call, "tail-call", false, "Tail-call support")
3333
WABT_FEATURE(bulk_memory, "bulk-memory", false, "Bulk-memory operations")
3434
WABT_FEATURE(reference_types, "reference-types", false, "Reference types (anyref)")

test/binary/bad-function-too-many-results.txt

Lines changed: 0 additions & 8 deletions
This file was deleted.

test/dump/block-multi.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
;;; TOOL: run-objdump
2-
;;; ARGS0: -v --enable-multi-value
2+
;;; ARGS0: -v
33
(module
44
(func
55
block (result i32 i32)

test/dump/convert-sat.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
;;; TOOL: run-objdump
2-
;;; ARGS0: -v --enable-saturating-float-to-int
2+
;;; ARGS0: -v
33
(module
44
(func
55
f32.const 0

test/dump/func-result-multi.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
;;; TOOL: run-objdump
2-
;;; ARGS0: -v --enable-multi-value
2+
;;; ARGS0: -v
33
;;; ARGS1: -x
44
(module
55
(func (result i32 i64)

test/dump/if-multi.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
;;; TOOL: run-objdump
2-
;;; ARGS0: -v --enable-multi-value
2+
;;; ARGS0: -v
33
(module
44
(func
55
i32.const 0

test/dump/loop-multi.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
;;; TOOL: run-objdump
2-
;;; ARGS0: -v --enable-multi-value
2+
;;; ARGS0: -v
33
(module
44
(func
55
loop (result i32 i32)

test/dump/try-multi.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
;;; TOOL: run-objdump
2-
;;; ARGS0: -v --enable-multi-value --enable-exceptions
2+
;;; ARGS0: -v --enable-exceptions
33
(module
44
(func
55
try (result i32 i32)

test/dump/unary-extend.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
;;; TOOL: run-objdump
2-
;;; ARGS0: -v --enable-sign-extension
2+
;;; ARGS0: -v
33
(module
44
(func
55
i32.const 0

test/help/spectest-interp.txt

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ examples:
1010
$ spectest-interp test.json
1111

1212
options:
13-
--help Print this help message
14-
--version Print version information
15-
-v, --verbose Use multiple times for more info
16-
--enable-exceptions Enable Experimental exception handling
17-
--disable-mutable-globals Disable Import/export mutable globals
18-
--enable-saturating-float-to-int Enable Saturating float-to-int operators
19-
--enable-sign-extension Enable Sign-extension operators
20-
--enable-simd Enable SIMD support
21-
--enable-threads Enable Threading support
22-
--enable-multi-value Enable Multi-value
23-
--enable-tail-call Enable Tail-call support
24-
--enable-bulk-memory Enable Bulk-memory operations
25-
--enable-reference-types Enable Reference types (anyref)
26-
--enable-annotations Enable Custom annotation syntax
27-
--enable-gc Enable Garbage collection
28-
--enable-all Enable all features
29-
-V, --value-stack-size=SIZE Size in elements of the value stack
30-
-C, --call-stack-size=SIZE Size in elements of the call stack
31-
-t, --trace Trace execution
13+
--help Print this help message
14+
--version Print version information
15+
-v, --verbose Use multiple times for more info
16+
--enable-exceptions Enable Experimental exception handling
17+
--disable-mutable-globals Disable Import/export mutable globals
18+
--disable-saturating-float-to-int Disable Saturating float-to-int operators
19+
--disable-sign-extension Disable Sign-extension operators
20+
--enable-simd Enable SIMD support
21+
--enable-threads Enable Threading support
22+
--disable-multi-value Disable Multi-value
23+
--enable-tail-call Enable Tail-call support
24+
--enable-bulk-memory Enable Bulk-memory operations
25+
--enable-reference-types Enable Reference types (anyref)
26+
--enable-annotations Enable Custom annotation syntax
27+
--enable-gc Enable Garbage collection
28+
--enable-all Enable all features
29+
-V, --value-stack-size=SIZE Size in elements of the value stack
30+
-C, --call-stack-size=SIZE Size in elements of the call stack
31+
-t, --trace Trace execution
3232
;;; STDOUT ;;)

test/help/wasm-interp.txt

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,26 @@ examples:
2121
$ wasm-interp test.wasm -V 100 --run-all-exports
2222

2323
options:
24-
--help Print this help message
25-
--version Print version information
26-
-v, --verbose Use multiple times for more info
27-
--enable-exceptions Enable Experimental exception handling
28-
--disable-mutable-globals Disable Import/export mutable globals
29-
--enable-saturating-float-to-int Enable Saturating float-to-int operators
30-
--enable-sign-extension Enable Sign-extension operators
31-
--enable-simd Enable SIMD support
32-
--enable-threads Enable Threading support
33-
--enable-multi-value Enable Multi-value
34-
--enable-tail-call Enable Tail-call support
35-
--enable-bulk-memory Enable Bulk-memory operations
36-
--enable-reference-types Enable Reference types (anyref)
37-
--enable-annotations Enable Custom annotation syntax
38-
--enable-gc Enable Garbage collection
39-
--enable-all Enable all features
40-
-V, --value-stack-size=SIZE Size in elements of the value stack
41-
-C, --call-stack-size=SIZE Size in elements of the call stack
42-
-t, --trace Trace execution
43-
--run-all-exports Run all the exported functions, in order. Useful for testing
44-
--host-print Include an importable function named "host.print" for printing to stdout
45-
--dummy-import-func Provide a dummy implementation of all imported functions. The function will log the call and return an appropriate zero value.
24+
--help Print this help message
25+
--version Print version information
26+
-v, --verbose Use multiple times for more info
27+
--enable-exceptions Enable Experimental exception handling
28+
--disable-mutable-globals Disable Import/export mutable globals
29+
--disable-saturating-float-to-int Disable Saturating float-to-int operators
30+
--disable-sign-extension Disable Sign-extension operators
31+
--enable-simd Enable SIMD support
32+
--enable-threads Enable Threading support
33+
--disable-multi-value Disable Multi-value
34+
--enable-tail-call Enable Tail-call support
35+
--enable-bulk-memory Enable Bulk-memory operations
36+
--enable-reference-types Enable Reference types (anyref)
37+
--enable-annotations Enable Custom annotation syntax
38+
--enable-gc Enable Garbage collection
39+
--enable-all Enable all features
40+
-V, --value-stack-size=SIZE Size in elements of the value stack
41+
-C, --call-stack-size=SIZE Size in elements of the call stack
42+
-t, --trace Trace execution
43+
--run-all-exports Run all the exported functions, in order. Useful for testing
44+
--host-print Include an importable function named "host.print" for printing to stdout
45+
--dummy-import-func Provide a dummy implementation of all imported functions. The function will log the call and return an appropriate zero value.
4646
;;; STDOUT ;;)

test/help/wasm-opcodecnt.txt

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@ examples:
1111
$ wasm-opcodecnt test.wasm -o test.dist
1212

1313
options:
14-
--help Print this help message
15-
--version Print version information
16-
-v, --verbose Use multiple times for more info
17-
--enable-exceptions Enable Experimental exception handling
18-
--disable-mutable-globals Disable Import/export mutable globals
19-
--enable-saturating-float-to-int Enable Saturating float-to-int operators
20-
--enable-sign-extension Enable Sign-extension operators
21-
--enable-simd Enable SIMD support
22-
--enable-threads Enable Threading support
23-
--enable-multi-value Enable Multi-value
24-
--enable-tail-call Enable Tail-call support
25-
--enable-bulk-memory Enable Bulk-memory operations
26-
--enable-reference-types Enable Reference types (anyref)
27-
--enable-annotations Enable Custom annotation syntax
28-
--enable-gc Enable Garbage collection
29-
--enable-all Enable all features
30-
-o, --output=FILENAME Output file for the opcode counts, by default use stdout
31-
-c, --cutoff=N Cutoff for reporting counts less than N
32-
-s, --separator=SEPARATOR Separator text between element and count when reporting counts
14+
--help Print this help message
15+
--version Print version information
16+
-v, --verbose Use multiple times for more info
17+
--enable-exceptions Enable Experimental exception handling
18+
--disable-mutable-globals Disable Import/export mutable globals
19+
--disable-saturating-float-to-int Disable Saturating float-to-int operators
20+
--disable-sign-extension Disable Sign-extension operators
21+
--enable-simd Enable SIMD support
22+
--enable-threads Enable Threading support
23+
--disable-multi-value Disable Multi-value
24+
--enable-tail-call Enable Tail-call support
25+
--enable-bulk-memory Enable Bulk-memory operations
26+
--enable-reference-types Enable Reference types (anyref)
27+
--enable-annotations Enable Custom annotation syntax
28+
--enable-gc Enable Garbage collection
29+
--enable-all Enable all features
30+
-o, --output=FILENAME Output file for the opcode counts, by default use stdout
31+
-c, --cutoff=N Cutoff for reporting counts less than N
32+
-s, --separator=SEPARATOR Separator text between element and count when reporting counts
3333
;;; STDOUT ;;)

test/help/wasm-validate.txt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ examples:
1010
$ wasm-validate test.wasm
1111

1212
options:
13-
--help Print this help message
14-
--version Print version information
15-
-v, --verbose Use multiple times for more info
16-
--enable-exceptions Enable Experimental exception handling
17-
--disable-mutable-globals Disable Import/export mutable globals
18-
--enable-saturating-float-to-int Enable Saturating float-to-int operators
19-
--enable-sign-extension Enable Sign-extension operators
20-
--enable-simd Enable SIMD support
21-
--enable-threads Enable Threading support
22-
--enable-multi-value Enable Multi-value
23-
--enable-tail-call Enable Tail-call support
24-
--enable-bulk-memory Enable Bulk-memory operations
25-
--enable-reference-types Enable Reference types (anyref)
26-
--enable-annotations Enable Custom annotation syntax
27-
--enable-gc Enable Garbage collection
28-
--enable-all Enable all features
29-
--no-debug-names Ignore debug names in the binary file
30-
--ignore-custom-section-errors Ignore errors in custom sections
13+
--help Print this help message
14+
--version Print version information
15+
-v, --verbose Use multiple times for more info
16+
--enable-exceptions Enable Experimental exception handling
17+
--disable-mutable-globals Disable Import/export mutable globals
18+
--disable-saturating-float-to-int Disable Saturating float-to-int operators
19+
--disable-sign-extension Disable Sign-extension operators
20+
--enable-simd Enable SIMD support
21+
--enable-threads Enable Threading support
22+
--disable-multi-value Disable Multi-value
23+
--enable-tail-call Enable Tail-call support
24+
--enable-bulk-memory Enable Bulk-memory operations
25+
--enable-reference-types Enable Reference types (anyref)
26+
--enable-annotations Enable Custom annotation syntax
27+
--enable-gc Enable Garbage collection
28+
--enable-all Enable all features
29+
--no-debug-names Ignore debug names in the binary file
30+
--ignore-custom-section-errors Ignore errors in custom sections
3131
;;; STDOUT ;;)

test/help/wasm2wat.txt

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,28 @@ examples:
1414
$ wasm2wat test.wasm --no-debug-names -o test.wat
1515

1616
options:
17-
--help Print this help message
18-
--version Print version information
19-
-v, --verbose Use multiple times for more info
20-
-o, --output=FILENAME Output file for the generated wast file, by default use stdout
21-
-f, --fold-exprs Write folded expressions where possible
22-
--enable-exceptions Enable Experimental exception handling
23-
--disable-mutable-globals Disable Import/export mutable globals
24-
--enable-saturating-float-to-int Enable Saturating float-to-int operators
25-
--enable-sign-extension Enable Sign-extension operators
26-
--enable-simd Enable SIMD support
27-
--enable-threads Enable Threading support
28-
--enable-multi-value Enable Multi-value
29-
--enable-tail-call Enable Tail-call support
30-
--enable-bulk-memory Enable Bulk-memory operations
31-
--enable-reference-types Enable Reference types (anyref)
32-
--enable-annotations Enable Custom annotation syntax
33-
--enable-gc Enable Garbage collection
34-
--enable-all Enable all features
35-
--inline-exports Write all exports inline
36-
--inline-imports Write all imports inline
37-
--no-debug-names Ignore debug names in the binary file
38-
--ignore-custom-section-errors Ignore errors in custom sections
39-
--generate-names Give auto-generated names to non-named functions, types, etc.
40-
--no-check Don't check for invalid modules
17+
--help Print this help message
18+
--version Print version information
19+
-v, --verbose Use multiple times for more info
20+
-o, --output=FILENAME Output file for the generated wast file, by default use stdout
21+
-f, --fold-exprs Write folded expressions where possible
22+
--enable-exceptions Enable Experimental exception handling
23+
--disable-mutable-globals Disable Import/export mutable globals
24+
--disable-saturating-float-to-int Disable Saturating float-to-int operators
25+
--disable-sign-extension Disable Sign-extension operators
26+
--enable-simd Enable SIMD support
27+
--enable-threads Enable Threading support
28+
--disable-multi-value Disable Multi-value
29+
--enable-tail-call Enable Tail-call support
30+
--enable-bulk-memory Enable Bulk-memory operations
31+
--enable-reference-types Enable Reference types (anyref)
32+
--enable-annotations Enable Custom annotation syntax
33+
--enable-gc Enable Garbage collection
34+
--enable-all Enable all features
35+
--inline-exports Write all exports inline
36+
--inline-imports Write all imports inline
37+
--no-debug-names Ignore debug names in the binary file
38+
--ignore-custom-section-errors Ignore errors in custom sections
39+
--generate-names Give auto-generated names to non-named functions, types, etc.
40+
--no-check Don't check for invalid modules
4141
;;; STDOUT ;;)

0 commit comments

Comments
 (0)