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.
WebAssembly · May 6, 2020 · e88bc66 · e88bc66
1 parent 9068d39
commit e88bc66
Show file tree

Hide file tree

Showing 67 changed files with 207 additions and 477 deletions.
diff --git a/src/feature.def b/src/feature.def
@@ -24,11 +24,11 @@
 
 WABT_FEATURE(exceptions,       "exceptions",              false,   "Experimental exception handling")
 WABT_FEATURE(mutable_globals,  "mutable-globals",         true,    "Import/export mutable globals")
-WABT_FEATURE(sat_float_to_int, "saturating-float-to-int", false,   "Saturating float-to-int operators")
-WABT_FEATURE(sign_extension,   "sign-extension",          false,   "Sign-extension operators")
+WABT_FEATURE(sat_float_to_int, "saturating-float-to-int", true,    "Saturating float-to-int operators")
+WABT_FEATURE(sign_extension,   "sign-extension",          true,    "Sign-extension operators")
 WABT_FEATURE(simd,             "simd",                    false,   "SIMD support")
 WABT_FEATURE(threads,          "threads",                 false,   "Threading support")
-WABT_FEATURE(multi_value,      "multi-value",             false,   "Multi-value")
+WABT_FEATURE(multi_value,      "multi-value",             true,    "Multi-value")
 WABT_FEATURE(tail_call,        "tail-call",               false,   "Tail-call support")
 WABT_FEATURE(bulk_memory,      "bulk-memory",             false,   "Bulk-memory operations")
 WABT_FEATURE(reference_types,  "reference-types",         false,   "Reference types (anyref)")

diff --git a/test/binary/bad-function-too-many-results.txt b/test/binary/bad-function-too-many-results.txt
diff --git a/test/dump/block-multi.txt b/test/dump/block-multi.txt
@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; ARGS0: -v --enable-multi-value
+;;; ARGS0: -v
 (module
   (func
     block (result i32 i32)

diff --git a/test/dump/convert-sat.txt b/test/dump/convert-sat.txt
@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; ARGS0: -v --enable-saturating-float-to-int
+;;; ARGS0: -v
 (module
   (func
     f32.const 0

diff --git a/test/dump/func-result-multi.txt b/test/dump/func-result-multi.txt
@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; ARGS0: -v --enable-multi-value
+;;; ARGS0: -v
 ;;; ARGS1: -x
 (module
   (func (result i32 i64)

diff --git a/test/dump/if-multi.txt b/test/dump/if-multi.txt
@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; ARGS0: -v --enable-multi-value
+;;; ARGS0: -v
 (module
   (func
     i32.const 0

diff --git a/test/dump/loop-multi.txt b/test/dump/loop-multi.txt
@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; ARGS0: -v --enable-multi-value
+;;; ARGS0: -v
 (module
   (func
     loop (result i32 i32)

diff --git a/test/dump/try-multi.txt b/test/dump/try-multi.txt
@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; ARGS0: -v --enable-multi-value --enable-exceptions
+;;; ARGS0: -v --enable-exceptions
 (module
   (func
     try (result i32 i32)

diff --git a/test/dump/unary-extend.txt b/test/dump/unary-extend.txt
@@ -1,5 +1,5 @@
 ;;; TOOL: run-objdump
-;;; ARGS0: -v --enable-sign-extension
+;;; ARGS0: -v
 (module
   (func
     i32.const 0

diff --git a/test/help/spectest-interp.txt b/test/help/spectest-interp.txt
@@ -10,23 +10,23 @@ examples:
   $ spectest-interp test.json
 
 options:
-      --help                                  Print this help message
-      --version                               Print version information
-  -v, --verbose                               Use multiple times for more info
-      --enable-exceptions                     Enable Experimental exception handling
-      --disable-mutable-globals               Disable Import/export mutable globals
-      --enable-saturating-float-to-int        Enable Saturating float-to-int operators
-      --enable-sign-extension                 Enable Sign-extension operators
-      --enable-simd                           Enable SIMD support
-      --enable-threads                        Enable Threading support
-      --enable-multi-value                    Enable Multi-value
-      --enable-tail-call                      Enable Tail-call support
-      --enable-bulk-memory                    Enable Bulk-memory operations
-      --enable-reference-types                Enable Reference types (anyref)
-      --enable-annotations                    Enable Custom annotation syntax
-      --enable-gc                             Enable Garbage collection
-      --enable-all                            Enable all features
-  -V, --value-stack-size=SIZE                 Size in elements of the value stack
-  -C, --call-stack-size=SIZE                  Size in elements of the call stack
-  -t, --trace                                 Trace execution
+      --help                                   Print this help message
+      --version                                Print version information
+  -v, --verbose                                Use multiple times for more info
+      --enable-exceptions                      Enable Experimental exception handling
+      --disable-mutable-globals                Disable Import/export mutable globals
+      --disable-saturating-float-to-int        Disable Saturating float-to-int operators
+      --disable-sign-extension                 Disable Sign-extension operators
+      --enable-simd                            Enable SIMD support
+      --enable-threads                         Enable Threading support
+      --disable-multi-value                    Disable Multi-value
+      --enable-tail-call                       Enable Tail-call support
+      --enable-bulk-memory                     Enable Bulk-memory operations
+      --enable-reference-types                 Enable Reference types (anyref)
+      --enable-annotations                     Enable Custom annotation syntax
+      --enable-gc                              Enable Garbage collection
+      --enable-all                             Enable all features
+  -V, --value-stack-size=SIZE                  Size in elements of the value stack
+  -C, --call-stack-size=SIZE                   Size in elements of the call stack
+  -t, --trace                                  Trace execution
 ;;; STDOUT ;;)
diff --git a/test/help/wasm-interp.txt b/test/help/wasm-interp.txt
@@ -21,26 +21,26 @@ examples:
   $ wasm-interp test.wasm -V 100 --run-all-exports
 
 options:
-      --help                                  Print this help message
-      --version                               Print version information
-  -v, --verbose                               Use multiple times for more info
-      --enable-exceptions                     Enable Experimental exception handling
-      --disable-mutable-globals               Disable Import/export mutable globals
-      --enable-saturating-float-to-int        Enable Saturating float-to-int operators
-      --enable-sign-extension                 Enable Sign-extension operators
-      --enable-simd                           Enable SIMD support
-      --enable-threads                        Enable Threading support
-      --enable-multi-value                    Enable Multi-value
-      --enable-tail-call                      Enable Tail-call support
-      --enable-bulk-memory                    Enable Bulk-memory operations
-      --enable-reference-types                Enable Reference types (anyref)
-      --enable-annotations                    Enable Custom annotation syntax
-      --enable-gc                             Enable Garbage collection
-      --enable-all                            Enable all features
-  -V, --value-stack-size=SIZE                 Size in elements of the value stack
-  -C, --call-stack-size=SIZE                  Size in elements of the call stack
-  -t, --trace                                 Trace execution
-      --run-all-exports                       Run all the exported functions, in order. Useful for testing
-      --host-print                            Include an importable function named "host.print" for printing to stdout
-      --dummy-import-func                     Provide a dummy implementation of all imported functions. The function will log the call and return an appropriate zero value.
+      --help                                   Print this help message
+      --version                                Print version information
+  -v, --verbose                                Use multiple times for more info
+      --enable-exceptions                      Enable Experimental exception handling
+      --disable-mutable-globals                Disable Import/export mutable globals
+      --disable-saturating-float-to-int        Disable Saturating float-to-int operators
+      --disable-sign-extension                 Disable Sign-extension operators
+      --enable-simd                            Enable SIMD support
+      --enable-threads                         Enable Threading support
+      --disable-multi-value                    Disable Multi-value
+      --enable-tail-call                       Enable Tail-call support
+      --enable-bulk-memory                     Enable Bulk-memory operations
+      --enable-reference-types                 Enable Reference types (anyref)
+      --enable-annotations                     Enable Custom annotation syntax
+      --enable-gc                              Enable Garbage collection
+      --enable-all                             Enable all features
+  -V, --value-stack-size=SIZE                  Size in elements of the value stack
+  -C, --call-stack-size=SIZE                   Size in elements of the call stack
+  -t, --trace                                  Trace execution
+      --run-all-exports                        Run all the exported functions, in order. Useful for testing
+      --host-print                             Include an importable function named "host.print" for printing to stdout
+      --dummy-import-func                      Provide a dummy implementation of all imported functions. The function will log the call and return an appropriate zero value.
 ;;; STDOUT ;;)
diff --git a/test/help/wasm-opcodecnt.txt b/test/help/wasm-opcodecnt.txt
@@ -11,23 +11,23 @@ examples:
   $ wasm-opcodecnt test.wasm -o test.dist
 
 options:
-      --help                                  Print this help message
-      --version                               Print version information
-  -v, --verbose                               Use multiple times for more info
-      --enable-exceptions                     Enable Experimental exception handling
-      --disable-mutable-globals               Disable Import/export mutable globals
-      --enable-saturating-float-to-int        Enable Saturating float-to-int operators
-      --enable-sign-extension                 Enable Sign-extension operators
-      --enable-simd                           Enable SIMD support
-      --enable-threads                        Enable Threading support
-      --enable-multi-value                    Enable Multi-value
-      --enable-tail-call                      Enable Tail-call support
-      --enable-bulk-memory                    Enable Bulk-memory operations
-      --enable-reference-types                Enable Reference types (anyref)
-      --enable-annotations                    Enable Custom annotation syntax
-      --enable-gc                             Enable Garbage collection
-      --enable-all                            Enable all features
-  -o, --output=FILENAME                       Output file for the opcode counts, by default use stdout
-  -c, --cutoff=N                              Cutoff for reporting counts less than N
-  -s, --separator=SEPARATOR                   Separator text between element and count when reporting counts
+      --help                                   Print this help message
+      --version                                Print version information
+  -v, --verbose                                Use multiple times for more info
+      --enable-exceptions                      Enable Experimental exception handling
+      --disable-mutable-globals                Disable Import/export mutable globals
+      --disable-saturating-float-to-int        Disable Saturating float-to-int operators
+      --disable-sign-extension                 Disable Sign-extension operators
+      --enable-simd                            Enable SIMD support
+      --enable-threads                         Enable Threading support
+      --disable-multi-value                    Disable Multi-value
+      --enable-tail-call                       Enable Tail-call support
+      --enable-bulk-memory                     Enable Bulk-memory operations
+      --enable-reference-types                 Enable Reference types (anyref)
+      --enable-annotations                     Enable Custom annotation syntax
+      --enable-gc                              Enable Garbage collection
+      --enable-all                             Enable all features
+  -o, --output=FILENAME                        Output file for the opcode counts, by default use stdout
+  -c, --cutoff=N                               Cutoff for reporting counts less than N
+  -s, --separator=SEPARATOR                    Separator text between element and count when reporting counts
 ;;; STDOUT ;;)
diff --git a/test/help/wasm-validate.txt b/test/help/wasm-validate.txt
@@ -10,22 +10,22 @@ examples:
   $ wasm-validate test.wasm
 
 options:
-      --help                                  Print this help message
-      --version                               Print version information
-  -v, --verbose                               Use multiple times for more info
-      --enable-exceptions                     Enable Experimental exception handling
-      --disable-mutable-globals               Disable Import/export mutable globals
-      --enable-saturating-float-to-int        Enable Saturating float-to-int operators
-      --enable-sign-extension                 Enable Sign-extension operators
-      --enable-simd                           Enable SIMD support
-      --enable-threads                        Enable Threading support
-      --enable-multi-value                    Enable Multi-value
-      --enable-tail-call                      Enable Tail-call support
-      --enable-bulk-memory                    Enable Bulk-memory operations
-      --enable-reference-types                Enable Reference types (anyref)
-      --enable-annotations                    Enable Custom annotation syntax
-      --enable-gc                             Enable Garbage collection
-      --enable-all                            Enable all features
-      --no-debug-names                        Ignore debug names in the binary file
-      --ignore-custom-section-errors          Ignore errors in custom sections
+      --help                                   Print this help message
+      --version                                Print version information
+  -v, --verbose                                Use multiple times for more info
+      --enable-exceptions                      Enable Experimental exception handling
+      --disable-mutable-globals                Disable Import/export mutable globals
+      --disable-saturating-float-to-int        Disable Saturating float-to-int operators
+      --disable-sign-extension                 Disable Sign-extension operators
+      --enable-simd                            Enable SIMD support
+      --enable-threads                         Enable Threading support
+      --disable-multi-value                    Disable Multi-value
+      --enable-tail-call                       Enable Tail-call support
+      --enable-bulk-memory                     Enable Bulk-memory operations
+      --enable-reference-types                 Enable Reference types (anyref)
+      --enable-annotations                     Enable Custom annotation syntax
+      --enable-gc                              Enable Garbage collection
+      --enable-all                             Enable all features
+      --no-debug-names                         Ignore debug names in the binary file
+      --ignore-custom-section-errors           Ignore errors in custom sections
 ;;; STDOUT ;;)
diff --git a/test/help/wasm2wat.txt b/test/help/wasm2wat.txt
@@ -14,28 +14,28 @@ examples:
   $ wasm2wat test.wasm --no-debug-names -o test.wat
 
 options:
-      --help                                  Print this help message
-      --version                               Print version information
-  -v, --verbose                               Use multiple times for more info
-  -o, --output=FILENAME                       Output file for the generated wast file, by default use stdout
-  -f, --fold-exprs                            Write folded expressions where possible
-      --enable-exceptions                     Enable Experimental exception handling
-      --disable-mutable-globals               Disable Import/export mutable globals
-      --enable-saturating-float-to-int        Enable Saturating float-to-int operators
-      --enable-sign-extension                 Enable Sign-extension operators
-      --enable-simd                           Enable SIMD support
-      --enable-threads                        Enable Threading support
-      --enable-multi-value                    Enable Multi-value
-      --enable-tail-call                      Enable Tail-call support
-      --enable-bulk-memory                    Enable Bulk-memory operations
-      --enable-reference-types                Enable Reference types (anyref)
-      --enable-annotations                    Enable Custom annotation syntax
-      --enable-gc                             Enable Garbage collection
-      --enable-all                            Enable all features
-      --inline-exports                        Write all exports inline
-      --inline-imports                        Write all imports inline
-      --no-debug-names                        Ignore debug names in the binary file
-      --ignore-custom-section-errors          Ignore errors in custom sections
-      --generate-names                        Give auto-generated names to non-named functions, types, etc.
-      --no-check                              Don't check for invalid modules
+      --help                                   Print this help message
+      --version                                Print version information
+  -v, --verbose                                Use multiple times for more info
+  -o, --output=FILENAME                        Output file for the generated wast file, by default use stdout
+  -f, --fold-exprs                             Write folded expressions where possible
+      --enable-exceptions                      Enable Experimental exception handling
+      --disable-mutable-globals                Disable Import/export mutable globals
+      --disable-saturating-float-to-int        Disable Saturating float-to-int operators
+      --disable-sign-extension                 Disable Sign-extension operators
+      --enable-simd                            Enable SIMD support
+      --enable-threads                         Enable Threading support
+      --disable-multi-value                    Disable Multi-value
+      --enable-tail-call                       Enable Tail-call support
+      --enable-bulk-memory                     Enable Bulk-memory operations
+      --enable-reference-types                 Enable Reference types (anyref)
+      --enable-annotations                     Enable Custom annotation syntax
+      --enable-gc                              Enable Garbage collection
+      --enable-all                             Enable all features
+      --inline-exports                         Write all exports inline
+      --inline-imports                         Write all imports inline
+      --no-debug-names                         Ignore debug names in the binary file
+      --ignore-custom-section-errors           Ignore errors in custom sections
+      --generate-names                         Give auto-generated names to non-named functions, types, etc.
+      --no-check                               Don't check for invalid modules
 ;;; STDOUT ;;)