summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--man/spectest-interp.14
-rw-r--r--man/wasm-decompile.12
-rw-r--r--man/wasm-interp.12
-rw-r--r--man/wasm-validate.14
-rw-r--r--man/wasm2c.12
-rw-r--r--man/wasm2wat.12
-rw-r--r--man/wast2json.14
-rw-r--r--man/wat-desugar.12
-rw-r--r--man/wat2wasm.12
-rwxr-xr-xscripts/fuzz-wasm2wat.sh2
-rwxr-xr-xscripts/fuzz-wat2wasm.sh2
-rw-r--r--src/feature.def2
-rw-r--r--src/opcode.def2
-rw-r--r--test/binary/bad-simd-type.txt10
-rw-r--r--test/dump/call_ref.txt3
-rw-r--r--test/dump/simd-basic.txt1
-rw-r--r--test/dump/simd-binary.txt1
-rw-r--r--test/dump/simd-bitselect.txt1
-rw-r--r--test/dump/simd-compare.txt1
-rw-r--r--test/dump/simd-lane.txt1
-rw-r--r--test/dump/simd-load-lane.txt1
-rw-r--r--test/dump/simd-load-store.txt1
-rw-r--r--test/dump/simd-shift.txt1
-rw-r--r--test/dump/simd-splat.txt1
-rw-r--r--test/dump/simd-store-lane.txt1
-rw-r--r--test/dump/simd-unary.txt1
-rwxr-xr-xtest/gen-spec-wast.py2
-rw-r--r--test/help/spectest-interp.txt2
-rw-r--r--test/help/wasm-interp.txt2
-rw-r--r--test/help/wasm-opcodecnt.txt2
-rw-r--r--test/help/wasm-validate.txt2
-rw-r--r--test/help/wasm2wat.txt2
-rw-r--r--test/help/wast2json.txt2
-rw-r--r--test/help/wat-desugar.txt2
-rw-r--r--test/help/wat2wasm.txt2
-rw-r--r--test/interp/simd-basic.txt1
-rw-r--r--test/interp/simd-binary.txt1
-rw-r--r--test/interp/simd-bitselect.txt1
-rw-r--r--test/interp/simd-compare.txt1
-rw-r--r--test/interp/simd-lane.txt1
-rw-r--r--test/interp/simd-load-store.txt1
-rw-r--r--test/interp/simd-shift.txt1
-rw-r--r--test/interp/simd-splat.txt1
-rw-r--r--test/interp/simd-unary.txt1
-rw-r--r--test/parse/expr/bad-const-v128-i16x8-overflow.txt5
-rw-r--r--test/parse/expr/bad-const-v128-i32x4-overflow.txt5
-rw-r--r--test/parse/expr/bad-const-v128-i8x16-overflow.txt5
-rw-r--r--test/parse/expr/bad-const-v128-nat-overflow.txt3
-rw-r--r--test/parse/expr/bad-const-v128-type-i32-expected.txt3
-rw-r--r--test/parse/expr/bad-simd-shuffle-lane-index-overflow.txt3
-rw-r--r--test/parse/expr/bad-simd-shuffle-lane-index-overflow2.txt3
-rw-r--r--test/parse/expr/bad-simd-shuffle-nat-expected.txt3
-rw-r--r--test/parse/expr/bad-simd-shuffle-not-enough-indices.txt3
-rw-r--r--test/parse/expr/const.txt1
-rw-r--r--test/parse/expr/simd.txt1
-rw-r--r--test/regress/regress-1674.txt1
-rw-r--r--test/regress/regress-34.txt3
-rw-r--r--test/roundtrip/fold-simd.txt2
-rw-r--r--test/roundtrip/simd.txt2
-rwxr-xr-xtest/run-roundtrip.py3
-rw-r--r--test/spec/simd/simd_address.txt1
-rw-r--r--test/spec/simd/simd_align.txt1
-rw-r--r--test/spec/simd/simd_bit_shift.txt1
-rw-r--r--test/spec/simd/simd_bitwise.txt1
-rw-r--r--test/spec/simd/simd_boolean.txt1
-rw-r--r--test/spec/simd/simd_const.txt1
-rw-r--r--test/spec/simd/simd_conversions.txt1
-rw-r--r--test/spec/simd/simd_f32x4.txt1
-rw-r--r--test/spec/simd/simd_f32x4_arith.txt1
-rw-r--r--test/spec/simd/simd_f32x4_cmp.txt1
-rw-r--r--test/spec/simd/simd_f32x4_pmin_pmax.txt1
-rw-r--r--test/spec/simd/simd_f32x4_rounding.txt1
-rw-r--r--test/spec/simd/simd_f64x2.txt1
-rw-r--r--test/spec/simd/simd_f64x2_arith.txt1
-rw-r--r--test/spec/simd/simd_f64x2_cmp.txt1
-rw-r--r--test/spec/simd/simd_f64x2_pmin_pmax.txt1
-rw-r--r--test/spec/simd/simd_f64x2_rounding.txt1
-rw-r--r--test/spec/simd/simd_i16x8_arith.txt1
-rw-r--r--test/spec/simd/simd_i16x8_arith2.txt1
-rw-r--r--test/spec/simd/simd_i16x8_cmp.txt1
-rw-r--r--test/spec/simd/simd_i16x8_extadd_pairwise_i8x16.txt1
-rw-r--r--test/spec/simd/simd_i16x8_extmul_i8x16.txt1
-rw-r--r--test/spec/simd/simd_i16x8_q15mulr_sat_s.txt1
-rw-r--r--test/spec/simd/simd_i16x8_sat_arith.txt1
-rw-r--r--test/spec/simd/simd_i32x4_arith.txt1
-rw-r--r--test/spec/simd/simd_i32x4_arith2.txt1
-rw-r--r--test/spec/simd/simd_i32x4_cmp.txt1
-rw-r--r--test/spec/simd/simd_i32x4_dot_i16x8.txt1
-rw-r--r--test/spec/simd/simd_i32x4_extadd_pairwise_i16x8.txt1
-rw-r--r--test/spec/simd/simd_i32x4_extmul_i16x8.txt1
-rw-r--r--test/spec/simd/simd_i32x4_trunc_sat_f32x4.txt1
-rw-r--r--test/spec/simd/simd_i32x4_trunc_sat_f64x2.txt1
-rw-r--r--test/spec/simd/simd_i64x2_arith.txt1
-rw-r--r--test/spec/simd/simd_i64x2_arith2.txt1
-rw-r--r--test/spec/simd/simd_i64x2_cmp.txt1
-rw-r--r--test/spec/simd/simd_i64x2_extmul_i32x4.txt1
-rw-r--r--test/spec/simd/simd_i8x16_arith.txt1
-rw-r--r--test/spec/simd/simd_i8x16_arith2.txt1
-rw-r--r--test/spec/simd/simd_i8x16_cmp.txt1
-rw-r--r--test/spec/simd/simd_i8x16_sat_arith.txt1
-rw-r--r--test/spec/simd/simd_int_to_int_extend.txt1
-rw-r--r--test/spec/simd/simd_lane.txt1
-rw-r--r--test/spec/simd/simd_load.txt1
-rw-r--r--test/spec/simd/simd_load16_lane.txt1
-rw-r--r--test/spec/simd/simd_load32_lane.txt1
-rw-r--r--test/spec/simd/simd_load64_lane.txt1
-rw-r--r--test/spec/simd/simd_load8_lane.txt1
-rw-r--r--test/spec/simd/simd_load_extend.txt1
-rw-r--r--test/spec/simd/simd_load_splat.txt1
-rw-r--r--test/spec/simd/simd_load_zero.txt1
-rw-r--r--test/spec/simd/simd_splat.txt1
-rw-r--r--test/spec/simd/simd_store.txt1
-rw-r--r--test/spec/simd/simd_store16_lane.txt1
-rw-r--r--test/spec/simd/simd_store32_lane.txt1
-rw-r--r--test/spec/simd/simd_store64_lane.txt1
-rw-r--r--test/spec/simd/simd_store8_lane.txt1
-rw-r--r--test/typecheck/bad-callref-int32.txt2
-rw-r--r--test/typecheck/bad-simd-lane.txt3
-rwxr-xr-xtest/update-spec-tests.py1
-rw-r--r--test/wasm2c/bad-enable-feature.txt2
121 files changed, 46 insertions, 149 deletions
diff --git a/README.md b/README.md
index abe3efbb..d25fdb66 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ Wabt has been compiled to JavaScript via emscripten. Some of the functionality i
| [mutable globals][] | `--disable-mutable-globals` | ✓ | ✓ | ✓ | ✓ | ✓ |
| [nontrapping float-to-int conversions][] | `--disable-saturating-float-to-int` | ✓ | ✓ | ✓ | ✓ | ✓ |
| [sign extension][] | `--disable-sign-extension` | ✓ | ✓ | ✓ | ✓ | ✓ |
-| [simd][] | `--enable-simd` | | ✓ | ✓ | ✓ | ✓ |
+| [simd][] | `--disable-simd` | ✓ | ✓ | ✓ | ✓ | ✓ |
| [threads][] | `--enable-threads` | | ✓ | ✓ | ✓ | ✓ |
| [multi-value][] | `--disable-multi-value` | ✓ | ✓ | ✓ | ✓ | ✓ |
| [tail-call][] | `--enable-tail-call` | | ✓ | ✓ | ✓ | ✓ |
diff --git a/man/spectest-interp.1 b/man/spectest-interp.1
index aab0c5fa..316d0f11 100644
--- a/man/spectest-interp.1
+++ b/man/spectest-interp.1
@@ -26,8 +26,8 @@ Disable Import/export mutable globals
Enable Saturating float-to-int operators
.It Fl Fl enable-sign-extension
Enable Sign-extension operators
-.It Fl Fl enable-simd
-Enable SIMD support
+.It Fl Fl disable-simd
+Disable SIMD support
.It Fl Fl enable-threads
Enable Threading support
.It Fl Fl enable-multi-value
diff --git a/man/wasm-decompile.1 b/man/wasm-decompile.1
index 178f694d..39437d86 100644
--- a/man/wasm-decompile.1
+++ b/man/wasm-decompile.1
@@ -28,7 +28,7 @@ Import/export mutable globals
Saturating float-to-int operators
.It Fl Fl enable-sign-extension
Sign-extension operators
-.It Fl Fl enable-simd
+.It Fl Fl disable-simd
SIMD support
.It Fl Fl enable-threads
Threading support
diff --git a/man/wasm-interp.1 b/man/wasm-interp.1
index eaba8ee8..4ac0aba3 100644
--- a/man/wasm-interp.1
+++ b/man/wasm-interp.1
@@ -26,7 +26,7 @@ Import/export mutable globals
Saturating float-to-int operators
.It Fl Fl enable-sign-extension
Sign-extension operators
-.It Fl Fl enable-simd
+.It Fl Fl disable-simd
SIMD support
.It Fl Fl enable-threads
Threading support
diff --git a/man/wasm-validate.1 b/man/wasm-validate.1
index ebc7ccfb..a35b2990 100644
--- a/man/wasm-validate.1
+++ b/man/wasm-validate.1
@@ -26,8 +26,8 @@ Disable Import/export mutable globals
Enable Saturating float-to-int operators
.It Fl Fl enable-sign-extension
Enable Sign-extension operators
-.It Fl Fl enable-simd
-Enable SIMD support
+.It Fl Fl disable-simd
+Disable SIMD support
.It Fl Fl enable-threads
Enable Threading support
.It Fl Fl enable-multi-value
diff --git a/man/wasm2c.1 b/man/wasm2c.1
index 1d6c1fb3..537e53fa 100644
--- a/man/wasm2c.1
+++ b/man/wasm2c.1
@@ -28,7 +28,7 @@ Import/export mutable globals
Saturating float-to-int operators
.It Fl Fl enable-sign-extension
Sign-extension operators
-.It Fl Fl enable-simd
+.It Fl Fl disable-simd
SIMD support
.It Fl Fl enable-threads
Threading support
diff --git a/man/wasm2wat.1 b/man/wasm2wat.1
index 6a6eb7a6..3eeaf165 100644
--- a/man/wasm2wat.1
+++ b/man/wasm2wat.1
@@ -30,7 +30,7 @@ Import/export mutable globals
Saturating float-to-int operators
.It Fl Fl enable-sign-extension
Sign-extension operators
-.It Fl Fl enable-simd
+.It Fl Fl disable-simd
SIMD support
.It Fl Fl enable-threads
Threading support
diff --git a/man/wast2json.1 b/man/wast2json.1
index 32f8acc8..e8ea9fd9 100644
--- a/man/wast2json.1
+++ b/man/wast2json.1
@@ -28,8 +28,8 @@ Disable Import/export mutable globals
Enable Saturating float-to-int operators
.It Fl Fl enable-sign-extension
Enable Sign-extension operators
-.It Fl Fl enable-simd
-Enable SIMD support
+.It Fl Fl disable-simd
+Disable SIMD support
.It Fl Fl enable-threads
Enable Threading support
.It Fl Fl enable-multi-value
diff --git a/man/wat-desugar.1 b/man/wat-desugar.1
index 4e826bee..7fd1fbfc 100644
--- a/man/wat-desugar.1
+++ b/man/wat-desugar.1
@@ -30,7 +30,7 @@ Import/export mutable globals
Saturating float-to-int operators
.It Fl Fl enable-sign-extension
Sign-extension operators
-.It Fl Fl enable-simd
+.It Fl Fl disable-simd
SIMD support
.It Fl Fl enable-threads
Threading support
diff --git a/man/wat2wasm.1 b/man/wat2wasm.1
index 3987a465..ec4dcc1b 100644
--- a/man/wat2wasm.1
+++ b/man/wat2wasm.1
@@ -30,7 +30,7 @@ Import/export mutable globals
Saturating float-to-int operators
.It Fl Fl enable-sign-extension
Sign-extension operators
-.It Fl Fl enable-simd
+.It Fl Fl disable-simd
SIMD support
.It Fl Fl enable-threads
Threading support
diff --git a/scripts/fuzz-wasm2wat.sh b/scripts/fuzz-wasm2wat.sh
index 5bf7f7c8..2be2b203 100755
--- a/scripts/fuzz-wasm2wat.sh
+++ b/scripts/fuzz-wasm2wat.sh
@@ -21,6 +21,6 @@ set -o errexit
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
ROOT_DIR="$(dirname "${SCRIPT_DIR}")"
-ENABLE="--enable-except --enable-sat --enable-sign --enable-simd --enable-thread --enable-multi --enable-tail --enable-bulk --enable-ref"
+ENABLE="--enable-except --enable-sat --enable-sign --enable-thread --enable-multi --enable-tail --enable-bulk --enable-ref"
${FUZZ_BIN_DIR}/afl-fuzz -i fuzz-in/wasm/ -o fuzz-out -- out/gcc-fuzz/Debug/wasm2wat @@ ${ENABLE}
diff --git a/scripts/fuzz-wat2wasm.sh b/scripts/fuzz-wat2wasm.sh
index 4c589762..bcd74c82 100755
--- a/scripts/fuzz-wat2wasm.sh
+++ b/scripts/fuzz-wat2wasm.sh
@@ -21,6 +21,6 @@ set -o errexit
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
ROOT_DIR="$(dirname "${SCRIPT_DIR}")"
-ENABLE="--enable-except --enable-sat --enable-sign --enable-simd --enable-thread --enable-multi --enable-tail --enable-bulk --enable-ref"
+ENABLE="--enable-except --enable-sat --enable-sign --enable-thread --enable-multi --enable-tail --enable-bulk --enable-ref"
${FUZZ_BIN_DIR}/afl-fuzz -x fuzz-in/wast.dict -i fuzz-in/wast/ -o fuzz-out -- out/gcc-fuzz/Debug/wat2wasm @@ ${ENABLE}
diff --git a/src/feature.def b/src/feature.def
index 4a85f6f2..f6f90f61 100644
--- a/src/feature.def
+++ b/src/feature.def
@@ -26,7 +26,7 @@ WABT_FEATURE(exceptions, "exceptions", false, "Experimen
WABT_FEATURE(mutable_globals, "mutable-globals", true, "Import/export mutable globals")
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(simd, "simd", true, "SIMD support")
WABT_FEATURE(threads, "threads", false, "Threading support")
WABT_FEATURE(function_references, "function-references", false, "Typed function references")
WABT_FEATURE(multi_value, "multi-value", true, "Multi-value")
diff --git a/src/opcode.def b/src/opcode.def
index e5335d74..ce80f895 100644
--- a/src/opcode.def
+++ b/src/opcode.def
@@ -261,7 +261,7 @@ WABT_OPCODE(___, ___, ___, ___, 0, 0, 0xd0, RefNull, "ref.null", "")
WABT_OPCODE(___, ___, ___, ___, 0, 0, 0xd1, RefIsNull, "ref.is_null", "")
WABT_OPCODE(___, ___, ___, ___, 0, 0, 0xd2, RefFunc, "ref.func", "")
-/* Simd opcodes (--enable-simd) */
+/* Simd opcodes */
WABT_OPCODE(V128, I32, ___, ___, 16, 0xfd, 0x00, V128Load, "v128.load", "")
WABT_OPCODE(V128, I32, ___, ___, 8, 0xfd, 0x01, V128Load8X8S, "v128.load8x8_s", "")
WABT_OPCODE(V128, I32, ___, ___, 8, 0xfd, 0x02, V128Load8X8U, "v128.load8x8_u", "")
diff --git a/test/binary/bad-simd-type.txt b/test/binary/bad-simd-type.txt
deleted file mode 100644
index ce79b76f..00000000
--- a/test/binary/bad-simd-type.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-;;; TOOL: run-gen-wasm-bad
-magic
-version
-section(TYPE) {
- count[1] function params[1] v128 results[0]
-}
-(;; STDERR ;;;
-000000e: error: expected valid param type (got -0x5)
-000000e: error: expected valid param type (got -0x5)
-;;; STDERR ;;)
diff --git a/test/dump/call_ref.txt b/test/dump/call_ref.txt
index 9589cfbf..88b126c6 100644
--- a/test/dump/call_ref.txt
+++ b/test/dump/call_ref.txt
@@ -93,8 +93,11 @@
; truncate to 61 (0x3d)
;;; STDERR ;;)
(;; STDOUT ;;;
+
call_ref.wasm: file format wasm 0x1
+
Code Disassembly:
+
00002e func[0] <main>:
00002f: 41 0a | i32.const 10
000031: d2 01 | ref.func 1
diff --git a/test/dump/simd-basic.txt b/test/dump/simd-basic.txt
index 5d9a46dc..c88fb2e7 100644
--- a/test/dump/simd-basic.txt
+++ b/test/dump/simd-basic.txt
@@ -1,5 +1,4 @@
;;; TOOL: run-objdump
-;;; ARGS0: --enable-simd
(module
(func (export "main") (result v128)
diff --git a/test/dump/simd-binary.txt b/test/dump/simd-binary.txt
index 2e2f03fb..f9698059 100644
--- a/test/dump/simd-binary.txt
+++ b/test/dump/simd-binary.txt
@@ -1,5 +1,4 @@
;;; TOOL: run-objdump
-;;; ARGS0: --enable-simd
(module
;; i8x16 add
diff --git a/test/dump/simd-bitselect.txt b/test/dump/simd-bitselect.txt
index 625ef2ed..49bc9890 100644
--- a/test/dump/simd-bitselect.txt
+++ b/test/dump/simd-bitselect.txt
@@ -1,5 +1,4 @@
;;; TOOL: run-objdump
-;;; ARGS0: --enable-simd
(module
;; v128.bitselect
diff --git a/test/dump/simd-compare.txt b/test/dump/simd-compare.txt
index f15703e6..1c7095f1 100644
--- a/test/dump/simd-compare.txt
+++ b/test/dump/simd-compare.txt
@@ -1,5 +1,4 @@
;;; TOOL: run-objdump
-;;; ARGS0: --enable-simd
(module
;; i8x16 eq
diff --git a/test/dump/simd-lane.txt b/test/dump/simd-lane.txt
index 4c26c39e..1af09704 100644
--- a/test/dump/simd-lane.txt
+++ b/test/dump/simd-lane.txt
@@ -1,5 +1,4 @@
;;; TOOL: run-objdump
-;;; ARGS0: --enable-simd
(module
;; i8x16 extract lane signed/unsigned
diff --git a/test/dump/simd-load-lane.txt b/test/dump/simd-load-lane.txt
index 676988e2..884d759d 100644
--- a/test/dump/simd-load-lane.txt
+++ b/test/dump/simd-load-lane.txt
@@ -1,5 +1,4 @@
;;; TOOL: run-objdump
-;;; ARGS0: --enable-simd
(module
(memory 1)
diff --git a/test/dump/simd-load-store.txt b/test/dump/simd-load-store.txt
index 9eac4308..0eaf4d83 100644
--- a/test/dump/simd-load-store.txt
+++ b/test/dump/simd-load-store.txt
@@ -1,5 +1,4 @@
;;; TOOL: run-objdump
-;;; ARGS0: --enable-simd
(module
(memory 1)
diff --git a/test/dump/simd-shift.txt b/test/dump/simd-shift.txt
index 363094ee..8dd4c421 100644
--- a/test/dump/simd-shift.txt
+++ b/test/dump/simd-shift.txt
@@ -1,5 +1,4 @@
;;; TOOL: run-objdump
-;;; ARGS0: --enable-simd
(module
;; i8x16 shl
diff --git a/test/dump/simd-splat.txt b/test/dump/simd-splat.txt
index 01cbaa93..a3f6a5f2 100644
--- a/test/dump/simd-splat.txt
+++ b/test/dump/simd-splat.txt
@@ -1,5 +1,4 @@
;;; TOOL: run-objdump
-;;; ARGS0: --enable-simd
(module
;; i8x16
diff --git a/test/dump/simd-store-lane.txt b/test/dump/simd-store-lane.txt
index 9d8e18a1..417ac25f 100644
--- a/test/dump/simd-store-lane.txt
+++ b/test/dump/simd-store-lane.txt
@@ -1,5 +1,4 @@
;;; TOOL: run-objdump
-;;; ARGS0: --enable-simd
(module
(memory 1)
diff --git a/test/dump/simd-unary.txt b/test/dump/simd-unary.txt
index 42bbbc1d..bf2f6bbc 100644
--- a/test/dump/simd-unary.txt
+++ b/test/dump/simd-unary.txt
@@ -1,5 +1,4 @@
;;; TOOL: run-objdump
-;;; ARGS0: --enable-simd
(module
;; i8x16 neg
diff --git a/test/gen-spec-wast.py b/test/gen-spec-wast.py
index a36b8e7f..222aac16 100755
--- a/test/gen-spec-wast.py
+++ b/test/gen-spec-wast.py
@@ -243,7 +243,6 @@ def main(args):
parser.add_argument('--enable-exceptions', action='store_true')
parser.add_argument('--enable-saturating-float-to-int', action='store_true')
parser.add_argument('--enable-threads', action='store_true')
- parser.add_argument('--enable-simd', action='store_true')
parser.add_argument('--enable-sign-extension', action='store_true')
parser.add_argument('--enable-multi-value', action='store_true')
parser.add_argument('--enable-bulk-memory', action='store_true')
@@ -262,7 +261,6 @@ def main(args):
'--enable-saturating-float-to-int':
options.enable_saturating_float_to_int,
'--enable-sign-extension': options.enable_sign_extension,
- '--enable-simd': options.enable_simd,
'--enable-threads': options.enable_threads,
'--enable-bulk-memory': options.enable_bulk_memory,
'--enable-tail-call': options.enable_tail_call,
diff --git a/test/help/spectest-interp.txt b/test/help/spectest-interp.txt
index fd11e584..496eaf98 100644
--- a/test/help/spectest-interp.txt
+++ b/test/help/spectest-interp.txt
@@ -17,7 +17,7 @@ options:
--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
+ --disable-simd Disable SIMD support
--enable-threads Enable Threading support
--enable-function-references Enable Typed function references
--disable-multi-value Disable Multi-value
diff --git a/test/help/wasm-interp.txt b/test/help/wasm-interp.txt
index 34ab871b..f9751921 100644
--- a/test/help/wasm-interp.txt
+++ b/test/help/wasm-interp.txt
@@ -28,7 +28,7 @@ options:
--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
+ --disable-simd Disable SIMD support
--enable-threads Enable Threading support
--enable-function-references Enable Typed function references
--disable-multi-value Disable Multi-value
diff --git a/test/help/wasm-opcodecnt.txt b/test/help/wasm-opcodecnt.txt
index 06fc23af..66bbdfd6 100644
--- a/test/help/wasm-opcodecnt.txt
+++ b/test/help/wasm-opcodecnt.txt
@@ -18,7 +18,7 @@ options:
--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
+ --disable-simd Disable SIMD support
--enable-threads Enable Threading support
--enable-function-references Enable Typed function references
--disable-multi-value Disable Multi-value
diff --git a/test/help/wasm-validate.txt b/test/help/wasm-validate.txt
index a2fca640..df0c76d7 100644
--- a/test/help/wasm-validate.txt
+++ b/test/help/wasm-validate.txt
@@ -17,7 +17,7 @@ options:
--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
+ --disable-simd Disable SIMD support
--enable-threads Enable Threading support
--enable-function-references Enable Typed function references
--disable-multi-value Disable Multi-value
diff --git a/test/help/wasm2wat.txt b/test/help/wasm2wat.txt
index 213d68d6..ccb99bac 100644
--- a/test/help/wasm2wat.txt
+++ b/test/help/wasm2wat.txt
@@ -23,7 +23,7 @@ options:
--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
+ --disable-simd Disable SIMD support
--enable-threads Enable Threading support
--enable-function-references Enable Typed function references
--disable-multi-value Disable Multi-value
diff --git a/test/help/wast2json.txt b/test/help/wast2json.txt
index c167b45d..3a5e9e93 100644
--- a/test/help/wast2json.txt
+++ b/test/help/wast2json.txt
@@ -20,7 +20,7 @@ options:
--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
+ --disable-simd Disable SIMD support
--enable-threads Enable Threading support
--enable-function-references Enable Typed function references
--disable-multi-value Disable Multi-value
diff --git a/test/help/wat-desugar.txt b/test/help/wat-desugar.txt
index 92614752..d271ec70 100644
--- a/test/help/wat-desugar.txt
+++ b/test/help/wat-desugar.txt
@@ -27,7 +27,7 @@ options:
--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
+ --disable-simd Disable SIMD support
--enable-threads Enable Threading support
--enable-function-references Enable Typed function references
--disable-multi-value Disable Multi-value
diff --git a/test/help/wat2wasm.txt b/test/help/wat2wasm.txt
index 10e3721d..4a38f599 100644
--- a/test/help/wat2wasm.txt
+++ b/test/help/wat2wasm.txt
@@ -27,7 +27,7 @@ options:
--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
+ --disable-simd Disable SIMD support
--enable-threads Enable Threading support
--enable-function-references Enable Typed function references
--disable-multi-value Disable Multi-value
diff --git a/test/interp/simd-basic.txt b/test/interp/simd-basic.txt
index 09f50831..bcd6f0a3 100644
--- a/test/interp/simd-basic.txt
+++ b/test/interp/simd-basic.txt
@@ -1,5 +1,4 @@
;;; TOOL: run-interp
-;;; ARGS*: --enable-simd
(module
(func (export "v128_const_i8x16") (result v128)
v128.const i8x16 1 0 0 0 2 0 0 0 3 0 0 0 4 0 0 0
diff --git a/test/interp/simd-binary.txt b/test/interp/simd-binary.txt
index d6c58bef..f777e9dc 100644
--- a/test/interp/simd-binary.txt
+++ b/test/interp/simd-binary.txt
@@ -1,5 +1,4 @@
;;; TOOL: run-interp
-;;; ARGS*: --enable-simd
(module
;; i8x16 add
(func (export "i8x16_add_0") (result v128)
diff --git a/test/interp/simd-bitselect.txt b/test/interp/simd-bitselect.txt
index cef7aa83..7b1469f9 100644
--- a/test/interp/simd-bitselect.txt
+++ b/test/interp/simd-bitselect.txt
@@ -1,5 +1,4 @@
;;; TOOL: run-interp
-;;; ARGS*: --enable-simd
(module
;; v128.bitselect
(func (export "func_v128_bitselect_0") (result v128)
diff --git a/test/interp/simd-compare.txt b/test/interp/simd-compare.txt
index 89949838..a488a655 100644
--- a/test/interp/simd-compare.txt
+++ b/test/interp/simd-compare.txt
@@ -1,5 +1,4 @@
;;; TOOL: run-interp
-;;; ARGS*: --enable-simd
(module
;; i8x16 eq
(func (export "i8x16_eq_0") (result v128)
diff --git a/test/interp/simd-lane.txt b/test/interp/simd-lane.txt
index 0911b6a2..14cdb714 100644
--- a/test/interp/simd-lane.txt
+++ b/test/interp/simd-lane.txt
@@ -1,5 +1,4 @@
;;; TOOL: run-interp
-;;; ARGS*: --enable-simd
(module
;; i8x16 extract lane signed/unsigned
(func (export "func_i8x16_extract_lane_s_0") (result i32)
diff --git a/test/interp/simd-load-store.txt b/test/interp/simd-load-store.txt
index a8f07ce1..b47eee49 100644
--- a/test/interp/simd-load-store.txt
+++ b/test/interp/simd-load-store.txt
@@ -1,5 +1,4 @@
;;; TOOL: run-interp
-;;; ARGS*: --enable-simd
(module
(memory 1)
(data (i32.const 0) "\ff\ff\ff\ff")
diff --git a/test/interp/simd-shift.txt b/test/interp/simd-shift.txt
index ec24ba46..b1c1daac 100644
--- a/test/interp/simd-shift.txt
+++ b/test/interp/simd-shift.txt
@@ -1,5 +1,4 @@
;;; TOOL: run-interp
-;;; ARGS*: --enable-simd
(module
;; i8x16 shl
(func (export "i8x16_shl_0") (result v128)
diff --git a/test/interp/simd-splat.txt b/test/interp/simd-splat.txt
index e95d6c97..610ee113 100644
--- a/test/interp/simd-splat.txt
+++ b/test/interp/simd-splat.txt
@@ -1,5 +1,4 @@
;;; TOOL: run-interp
-;;; ARGS*: --enable-simd
(module
;; i8x16
diff --git a/test/interp/simd-unary.txt b/test/interp/simd-unary.txt
index eb4c07c7..ec319fc9 100644
--- a/test/interp/simd-unary.txt
+++ b/test/interp/simd-unary.txt
@@ -1,5 +1,4 @@
;;; TOOL: run-interp
-;;; ARGS*: --enable-simd
(module
;; i8x16 neg
(func (export "i8x16_neg_0") (result v128)
diff --git a/test/parse/expr/bad-const-v128-i16x8-overflow.txt b/test/parse/expr/bad-const-v128-i16x8-overflow.txt
index e0ba0dbc..f0db4a95 100644
--- a/test/parse/expr/bad-const-v128-i16x8-overflow.txt
+++ b/test/parse/expr/bad-const-v128-i16x8-overflow.txt
@@ -1,15 +1,14 @@
;;; TOOL: wat2wasm
-;;; ARGS: --enable-simd
;;; ERROR: 1
(module
(func v128.const i16x8 -32768 -32767 32767 65535 65536 0 0 0)
(func v128.const i16x8 -32768 -32769 32767 65535 65536 0 0 0)
)
(;; STDERR ;;;
-out/test/parse/expr/bad-const-v128-i16x8-overflow.txt:5:52: error: invalid literal "65536"
+out/test/parse/expr/bad-const-v128-i16x8-overflow.txt:4:52: error: invalid literal "65536"
(func v128.const i16x8 -32768 -32767 32767 65535 65536 0 0 0)
^^^^^
-out/test/parse/expr/bad-const-v128-i16x8-overflow.txt:6:33: error: invalid literal "-32769"
+out/test/parse/expr/bad-const-v128-i16x8-overflow.txt:5:33: error: invalid literal "-32769"
(func v128.const i16x8 -32768 -32769 32767 65535 65536 0 0 0)
^^^^^^
;;; STDERR ;;)
diff --git a/test/parse/expr/bad-const-v128-i32x4-overflow.txt b/test/parse/expr/bad-const-v128-i32x4-overflow.txt
index bef182fb..967aecf0 100644
--- a/test/parse/expr/bad-const-v128-i32x4-overflow.txt
+++ b/test/parse/expr/bad-const-v128-i32x4-overflow.txt
@@ -1,15 +1,14 @@
;;; TOOL: wat2wasm
-;;; ARGS: --enable-simd
;;; ERROR: 1
(module
(func v128.const i32x4 -2147483648 2147483648 4294967295 4294967296)
(func v128.const i32x4 -2147483648 -2147483649 4294967295 4294967296)
)
(;; STDERR ;;;
-out/test/parse/expr/bad-const-v128-i32x4-overflow.txt:5:60: error: invalid literal "4294967296"
+out/test/parse/expr/bad-const-v128-i32x4-overflow.txt:4:60: error: invalid literal "4294967296"
(func v128.const i32x4 -2147483648 2147483648 4294967295 4294967296)
^^^^^^^^^^
-out/test/parse/expr/bad-const-v128-i32x4-overflow.txt:6:38: error: invalid literal "-2147483649"
+out/test/parse/expr/bad-const-v128-i32x4-overflow.txt:5:38: error: invalid literal "-2147483649"
(func v128.const i32x4 -2147483648 -2147483649 4294967295 4294967296)
^^^^^^^^^^^
;;; STDERR ;;)
diff --git a/test/parse/expr/bad-const-v128-i8x16-overflow.txt b/test/parse/expr/bad-const-v128-i8x16-overflow.txt
index d50ebd78..d091b7f6 100644
--- a/test/parse/expr/bad-const-v128-i8x16-overflow.txt
+++ b/test/parse/expr/bad-const-v128-i8x16-overflow.txt
@@ -1,15 +1,14 @@
;;; TOOL: wat2wasm
-;;; ARGS: --enable-simd
;;; ERROR: 1
(module
(func v128.const i8x16 -127 -128 128 255 256 0 0 0 0 0 0 0 0 0 0 0)
(func v128.const i8x16 -127 -129 128 255 256 0 0 0 0 0 0 0 0 0 0 0)
)
(;; STDERR ;;;
-out/test/parse/expr/bad-const-v128-i8x16-overflow.txt:5:44: error: invalid literal "256"
+out/test/parse/expr/bad-const-v128-i8x16-overflow.txt:4:44: error: invalid literal "256"
(func v128.const i8x16 -127 -128 128 255 256 0 0 0 0 0 0 0 0 0 0 0)
^^^
-out/test/parse/expr/bad-const-v128-i8x16-overflow.txt:6:31: error: invalid literal "-129"
+out/test/parse/expr/bad-const-v128-i8x16-overflow.txt:5:31: error: invalid literal "-129"
(func v128.const i8x16 -127 -129 128 255 256 0 0 0 0 0 0 0 0 0 0 0)
^^^^
;;; STDERR ;;)
diff --git a/test/parse/expr/bad-const-v128-nat-overflow.txt b/test/parse/expr/bad-const-v128-nat-overflow.txt
index 0c67a5ca..98cd2a56 100644
--- a/test/parse/expr/bad-const-v128-nat-overflow.txt
+++ b/test/parse/expr/bad-const-v128-nat-overflow.txt
@@ -1,10 +1,9 @@
;;; TOOL: wat2wasm
-;;; ARGS: --enable-simd
;;; ERROR: 1
(module
(func v128.const i32x4 0x12345678 0x123 4294967296 0xabcd3478))
(;; STDERR ;;;
-out/test/parse/expr/bad-const-v128-nat-overflow.txt:5:43: error: invalid literal "4294967296"
+out/test/parse/expr/bad-const-v128-nat-overflow.txt:4:43: error: invalid literal "4294967296"
(func v128.const i32x4 0x12345678 0x123 4294967296 0xabcd3478))
^^^^^^^^^^
;;; STDERR ;;)
diff --git a/test/parse/expr/bad-const-v128-type-i32-expected.txt b/test/parse/expr/bad-const-v128-type-i32-expected.txt
index e990f820..15871514 100644
--- a/test/parse/expr/bad-const-v128-type-i32-expected.txt
+++ b/test/parse/expr/bad-const-v128-type-i32-expected.txt
@@ -1,10 +1,9 @@
;;; TOOL: wat2wasm
-;;; ARGS: --enable-simd
;;; ERROR: 1
(module (func v128.const 0x12345678 0x00000000 0x00000000 0xabcd3478))
(module (func v128.const i64 0x12345678 0x00000000 0x00000000 0xabcd3478))
(;; STDERR ;;;
-out/test/parse/expr/bad-const-v128-type-i32-expected.txt:4:26: error: Unexpected type at start of simd constant. Expected one of: i8x16, i16x8, i32x4, i64x2, f32x4, f64x2. Found "NAT".
+out/test/parse/expr/bad-const-v128-type-i32-expected.txt:3:26: error: Unexpected type at start of simd constant. Expected one of: i8x16, i16x8, i32x4, i64x2, f32x4, f64x2. Found "NAT".
(module (func v128.const 0x12345678 0x00000000 0x00000000 0xabcd3478))
^^^^^^^^^^
;;; STDERR ;;)
diff --git a/test/parse/expr/bad-simd-shuffle-lane-index-overflow.txt b/test/parse/expr/bad-simd-shuffle-lane-index-overflow.txt
index 680e048b..5c44cfdb 100644
--- a/test/parse/expr/bad-simd-shuffle-lane-index-overflow.txt
+++ b/test/parse/expr/bad-simd-shuffle-lane-index-overflow.txt
@@ -1,5 +1,4 @@
;;; TOOL: wat2wasm
-;;; ARGS: --enable-simd
;;; ERROR: 1
(module
(func
@@ -9,7 +8,7 @@
))
(;; STDERR ;;;
-out/test/parse/expr/bad-simd-shuffle-lane-index-overflow.txt:8:19: error: lane index "0x01020304" out-of-range [0, 32)
+out/test/parse/expr/bad-simd-shuffle-lane-index-overflow.txt:7:19: error: lane index "0x01020304" out-of-range [0, 32)
i8x16.shuffle 0x01020304 05060708 0x090a0b0c 0x00000000
^^^^^^^^^^
;;; STDERR ;;)
diff --git a/test/parse/expr/bad-simd-shuffle-lane-index-overflow2.txt b/test/parse/expr/bad-simd-shuffle-lane-index-overflow2.txt
index fba077bf..8f4d3f52 100644
--- a/test/parse/expr/bad-simd-shuffle-lane-index-overflow2.txt
+++ b/test/parse/expr/bad-simd-shuffle-lane-index-overflow2.txt
@@ -1,5 +1,4 @@
;;; TOOL: wat2wasm
-;;; ARGS: --enable-simd
;;; ERROR: 1
(module
(func
@@ -10,7 +9,7 @@
))
(;; STDERR ;;;
-out/test/parse/expr/bad-simd-shuffle-lane-index-overflow2.txt:8:5: error: lane index must be less than 32 (got 33)
+out/test/parse/expr/bad-simd-shuffle-lane-index-overflow2.txt:7:5: error: lane index must be less than 32 (got 33)
i8x16.shuffle 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 33
^^^^^^^^^^^^^
;;; STDERR ;;)
diff --git a/test/parse/expr/bad-simd-shuffle-nat-expected.txt b/test/parse/expr/bad-simd-shuffle-nat-expected.txt
index f36165c3..d5375329 100644
--- a/test/parse/expr/bad-simd-shuffle-nat-expected.txt
+++ b/test/parse/expr/bad-simd-shuffle-nat-expected.txt
@@ -1,5 +1,4 @@
;;; TOOL: wat2wasm
-;;; ARGS: --enable-simd
;;; ERROR: 1
(module
(func
@@ -9,7 +8,7 @@
))
(;; STDERR ;;;
-out/test/parse/expr/bad-simd-shuffle-nat-expected.txt:8:19: error: unexpected token "$0x01020304", expected a natural number in range [0, 32).
+out/test/parse/expr/bad-simd-shuffle-nat-expected.txt:7:19: error: unexpected token "$0x01020304", expected a natural number in range [0, 32).
i8x16.shuffle $0x01020304 0x05060708 0x090a0b0c 0x00000000
^^^^^^^^^^^
;;; STDERR ;;)
diff --git a/test/parse/expr/bad-simd-shuffle-not-enough-indices.txt b/test/parse/expr/bad-simd-shuffle-not-enough-indices.txt
index 901fa1e2..b0127cc6 100644
--- a/test/parse/expr/bad-simd-shuffle-not-enough-indices.txt
+++ b/test/parse/expr/bad-simd-shuffle-not-enough-indices.txt
@@ -1,5 +1,4 @@
;;; TOOL: wat2wasm
-;;; ARGS: --enable-simd
;;; ERROR: 1
(module
(func
@@ -9,7 +8,7 @@
))
(;; STDERR ;;;
-out/test/parse/expr/bad-simd-shuffle-not-enough-indices.txt:9:5: error: unexpected token ")", expected a natural number in range [0, 32).
+out/test/parse/expr/bad-simd-shuffle-not-enough-indices.txt:8:5: error: unexpected token ")", expected a natural number in range [0, 32).
))
^
;;; STDERR ;;)
diff --git a/test/parse/expr/const.txt b/test/parse/expr/const.txt
index 7b5d2122..90bfb950 100644
--- a/test/parse/expr/const.txt
+++ b/test/parse/expr/const.txt
@@ -1,5 +1,4 @@
;;; TOOL: wat2wasm
-;;; ARGS: --enable-simd
(module
(func
i32.const 0
diff --git a/test/parse/expr/simd.txt b/test/parse/expr/simd.txt
index 30ea440a..ca1aaadb 100644
--- a/test/parse/expr/simd.txt
+++ b/test/parse/expr/simd.txt
@@ -1,5 +1,4 @@
;;; TOOL: wat2wasm
-;;; ARGS: --enable-simd
(module
(func
v128.const i32x4 0xff00ff01 0xff00ff0f 0xff00ffff 0xff00ff7f
diff --git a/test/regress/regress-1674.txt b/test/regress/regress-1674.txt
index 87642fcd..8cc8edb9 100644
--- a/test/regress/regress-1674.txt
+++ b/test/regress/regress-1674.txt
@@ -1,5 +1,4 @@
;;; TOOL: wat2wasm
-;;; ARGS: --enable-simd
(module
(memory 1)
(func
diff --git a/test/regress/regress-34.txt b/test/regress/regress-34.txt
index 87beb223..b965fdcb 100644
--- a/test/regress/regress-34.txt
+++ b/test/regress/regress-34.txt
@@ -1,5 +1,4 @@
;;; TOOL: run-interp-spec
-;;; ARGS*: --enable-simd
(module (func (v128.const f32x4 340282356779733623858607532500980858880 340282356779733623858607532500980858880
340282356779733623858607532500980858880 340282356779733623858607532500980858880) drop))
(assert_malformed
@@ -7,7 +6,7 @@
"constant out of range"
)
(;; STDOUT ;;;
-out/test/regress/regress-34.txt:6: assert_malformed passed:
+out/test/regress/regress-34.txt:5: assert_malformed passed:
out/test/regress/regress-34/regress-34.1.wat:1:25: error: invalid literal "0x100"
(func (v128.const i8x16 0x100 0x100 0x100 0x100 0x100 0x100 0x100 0x100 0x100...
^^^^^
diff --git a/test/roundtrip/fold-simd.txt b/test/roundtrip/fold-simd.txt
index 96082bad..69d4fd5b 100644
--- a/test/roundtrip/fold-simd.txt
+++ b/test/roundtrip/fold-simd.txt
@@ -1,5 +1,5 @@
;;; TOOL: run-roundtrip
-;;; ARGS: --stdout --fold-exprs --enable-simd
+;;; ARGS: --stdout --fold-exprs
(module
(memory 1)
diff --git a/test/roundtrip/simd.txt b/test/roundtrip/simd.txt
index ac0af268..3d5d1ad2 100644
--- a/test/roundtrip/simd.txt
+++ b/test/roundtrip/simd.txt
@@ -1,5 +1,5 @@
;;; TOOL: run-roundtrip
-;;; ARGS: --stdout --enable-simd
+;;; ARGS: --stdout
(module
(func (param v128) (result v128)
local.get 0
diff --git a/test/run-roundtrip.py b/test/run-roundtrip.py
index 2ee58736..5fa544c6 100755
--- a/test/run-roundtrip.py
+++ b/test/run-roundtrip.py
@@ -118,7 +118,6 @@ def main(args):
parser.add_argument('--enable-saturating-float-to-int', action='store_true')
parser.add_argument('--enable-function-references', action='store_true')
parser.add_argument('--enable-threads', action='store_true')
- parser.add_argument('--enable-simd', action='store_true')
parser.add_argument('--enable-sign-extension', action='store_true')
parser.add_argument('--enable-multi-value', action='store_true')
parser.add_argument('--enable-bulk-memory', action='store_true')
@@ -141,7 +140,6 @@ def main(args):
'--enable-saturating-float-to-int':
options.enable_saturating_float_to_int,
'--enable-sign-extension': options.enable_sign_extension,
- '--enable-simd': options.enable_simd,
'--enable-function-references': options.enable_function_references,
'--enable-threads': options.enable_threads,
'--enable-bulk-memory': options.enable_bulk_memory,
@@ -162,7 +160,6 @@ def main(args):
'--enable-saturating-float-to-int':
options.enable_saturating_float_to_int,
'--enable-sign-extension': options.enable_sign_extension,
- '--enable-simd': options.enable_simd,
'--enable-bulk-memory': options.enable_bulk_memory,
'--enable-tail-call': options.enable_tail_call,
'--enable-function-references': options.enable_function_references,
diff --git a/test/spec/simd/simd_address.txt b/test/spec/simd/simd_address.txt
index c1d51645..1957b12e 100644
--- a/test/spec/simd/simd_address.txt
+++ b/test/spec/simd/simd_address.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_address.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_address.wast:89: assert_trap passed: out of bounds memory access: access at 4294967296+16 >= max value 65536
out/test/spec/simd/simd_address.wast:90: assert_trap passed: out of bounds memory access: access at 65521+16 >= max value 65536
diff --git a/test/spec/simd/simd_align.txt b/test/spec/simd/simd_align.txt
index 55f62832..7a2155e1 100644
--- a/test/spec/simd/simd_align.txt
+++ b/test/spec/simd/simd_align.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_align.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_align.wast:54: assert_invalid passed:
error: alignment must not be larger than natural alignment (16)
diff --git a/test/spec/simd/simd_bit_shift.txt b/test/spec/simd/simd_bit_shift.txt
index dc8dc25c..4057ac6e 100644
--- a/test/spec/simd/simd_bit_shift.txt
+++ b/test/spec/simd/simd_bit_shift.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_bit_shift.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_bit_shift.wast:976: assert_invalid passed:
error: type mismatch in i8x16.shl, expected [v128, i32] but got [i32, i32]
diff --git a/test/spec/simd/simd_bitwise.txt b/test/spec/simd/simd_bitwise.txt
index bcb21078..a7303d10 100644
--- a/test/spec/simd/simd_bitwise.txt
+++ b/test/spec/simd/simd_bitwise.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_bitwise.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_bitwise.wast:405: assert_invalid passed:
error: type mismatch in v128.not, expected [v128] but got [i32]
diff --git a/test/spec/simd/simd_boolean.txt b/test/spec/simd/simd_boolean.txt
index e13fe9b1..af13fc06 100644
--- a/test/spec/simd/simd_boolean.txt
+++ b/test/spec/simd/simd_boolean.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_boolean.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_boolean.wast:995: assert_invalid passed:
error: type mismatch in v128.any_true, expected [v128] but got [i32]
diff --git a/test/spec/simd/simd_const.txt b/test/spec/simd/simd_const.txt
index 17937ff5..391baa32 100644
--- a/test/spec/simd/simd_const.txt
+++ b/test/spec/simd/simd_const.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_const.wast
-;;; ARGS*: --enable-simd --enable-reference-types
;;; NOTE: reference types is only required because the test uses two tables
(;; STDOUT ;;;
out/test/spec/simd/simd_const.wast:130: assert_malformed passed:
diff --git a/test/spec/simd/simd_conversions.txt b/test/spec/simd/simd_conversions.txt
index 66671f99..71232fa3 100644
--- a/test/spec/simd/simd_conversions.txt
+++ b/test/spec/simd/simd_conversions.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_conversions.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_conversions.wast:605: assert_malformed passed:
out/test/spec/simd/simd_conversions/simd_conversions.1.wat:1:22: error: unexpected token "i32x4.trunc_sat_f32x4", expected an instr.
diff --git a/test/spec/simd/simd_f32x4.txt b/test/spec/simd/simd_f32x4.txt
index 5cfc8fd9..a2f28970 100644
--- a/test/spec/simd/simd_f32x4.txt
+++ b/test/spec/simd/simd_f32x4.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_f32x4.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_f32x4.wast:2325: assert_malformed passed:
out/test/spec/simd/simd_f32x4/simd_f32x4.1.wat:1:33: error: unexpected token "i8x16.min", expected an instr.
diff --git a/test/spec/simd/simd_f32x4_arith.txt b/test/spec/simd/simd_f32x4_arith.txt
index f8410a9d..37507b52 100644
--- a/test/spec/simd/simd_f32x4_arith.txt
+++ b/test/spec/simd/simd_f32x4_arith.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_f32x4_arith.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_f32x4_arith.wast:5295: assert_invalid passed:
error: type mismatch in f32x4.neg, expected [v128] but got [i32]
diff --git a/test/spec/simd/simd_f32x4_cmp.txt b/test/spec/simd/simd_f32x4_cmp.txt
index ca71d3b3..db9d667a 100644
--- a/test/spec/simd/simd_f32x4_cmp.txt
+++ b/test/spec/simd/simd_f32x4_cmp.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_f32x4_cmp.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_f32x4_cmp.wast:7779: assert_invalid passed:
error: type mismatch in f32x4.eq, expected [v128, v128] but got [i64, f64]
diff --git a/test/spec/simd/simd_f32x4_pmin_pmax.txt b/test/spec/simd/simd_f32x4_pmin_pmax.txt
index c7c8788c..468b1b2c 100644
--- a/test/spec/simd/simd_f32x4_pmin_pmax.txt
+++ b/test/spec/simd/simd_f32x4_pmin_pmax.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_f32x4_pmin_pmax.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_f32x4_pmin_pmax.wast:11629: assert_malformed passed:
out/test/spec/simd/simd_f32x4_pmin_pmax/simd_f32x4_pmin_pmax.1.wat:1:33: error: unexpected token "i8x16.pmin", expected an instr.
diff --git a/test/spec/simd/simd_f32x4_rounding.txt b/test/spec/simd/simd_f32x4_rounding.txt
index e165a6df..ee75a1f9 100644
--- a/test/spec/simd/simd_f32x4_rounding.txt
+++ b/test/spec/simd/simd_f32x4_rounding.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_f32x4_rounding.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_f32x4_rounding.wast:367: assert_malformed passed:
out/test/spec/simd/simd_f32x4_rounding/simd_f32x4_rounding.1.wat:1:33: error: unexpected token "i8x16.ceil", expected an instr.
diff --git a/test/spec/simd/simd_f64x2.txt b/test/spec/simd/simd_f64x2.txt
index 53b86533..c0b599a2 100644
--- a/test/spec/simd/simd_f64x2.txt
+++ b/test/spec/simd/simd_f64x2.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_f64x2.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_f64x2.wast:2387: assert_invalid passed:
error: type mismatch in f64x2.abs, expected [v128] but got [i32]
diff --git a/test/spec/simd/simd_f64x2_arith.txt b/test/spec/simd/simd_f64x2_arith.txt
index 648dfe10..8c884c3d 100644
--- a/test/spec/simd/simd_f64x2_arith.txt
+++ b/test/spec/simd/simd_f64x2_arith.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_f64x2_arith.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_f64x2_arith.wast:5302: assert_invalid passed:
error: type mismatch in f64x2.neg, expected [v128] but got [i64]
diff --git a/test/spec/simd/simd_f64x2_cmp.txt b/test/spec/simd/simd_f64x2_cmp.txt
index e853c2f0..640de684 100644
--- a/test/spec/simd/simd_f64x2_cmp.txt
+++ b/test/spec/simd/simd_f64x2_cmp.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_f64x2_cmp.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_f64x2_cmp.wast:7954: assert_malformed passed:
out/test/spec/simd/simd_f64x2_cmp/simd_f64x2_cmp.1.wat:1:66: error: unexpected token "f2x64.eq", expected an instr.
diff --git a/test/spec/simd/simd_f64x2_pmin_pmax.txt b/test/spec/simd/simd_f64x2_pmin_pmax.txt
index 6ba7b8d6..bfb6397c 100644
--- a/test/spec/simd/simd_f64x2_pmin_pmax.txt
+++ b/test/spec/simd/simd_f64x2_pmin_pmax.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_f64x2_pmin_pmax.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_f64x2_pmin_pmax.wast:11629: assert_malformed passed:
out/test/spec/simd/simd_f64x2_pmin_pmax/simd_f64x2_pmin_pmax.1.wat:1:33: error: unexpected token "i8x16.pmin", expected an instr.
diff --git a/test/spec/simd/simd_f64x2_rounding.txt b/test/spec/simd/simd_f64x2_rounding.txt
index 4ab3895c..0fd545d3 100644
--- a/test/spec/simd/simd_f64x2_rounding.txt
+++ b/test/spec/simd/simd_f64x2_rounding.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_f64x2_rounding.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_f64x2_rounding.wast:367: assert_malformed passed:
out/test/spec/simd/simd_f64x2_rounding/simd_f64x2_rounding.1.wat:1:33: error: unexpected token "i8x16.ceil", expected an instr.
diff --git a/test/spec/simd/simd_i16x8_arith.txt b/test/spec/simd/simd_i16x8_arith.txt
index 768105a1..4cfb6c78 100644
--- a/test/spec/simd/simd_i16x8_arith.txt
+++ b/test/spec/simd/simd_i16x8_arith.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i16x8_arith.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i16x8_arith.wast:528: assert_invalid passed:
error: type mismatch in i16x8.neg, expected [v128] but got [i32]
diff --git a/test/spec/simd/simd_i16x8_arith2.txt b/test/spec/simd/simd_i16x8_arith2.txt
index 58e28d49..e683d5fa 100644
--- a/test/spec/simd/simd_i16x8_arith2.txt
+++ b/test/spec/simd/simd_i16x8_arith2.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i16x8_arith2.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i16x8_arith2.wast:337: assert_malformed passed:
out/test/spec/simd/simd_i16x8_arith2/simd_i16x8_arith2.1.wat:1:33: error: unexpected token "i16x8.avgr", expected an instr.
diff --git a/test/spec/simd/simd_i16x8_cmp.txt b/test/spec/simd/simd_i16x8_cmp.txt
index 83e75681..4b15359c 100644
--- a/test/spec/simd/simd_i16x8_cmp.txt
+++ b/test/spec/simd/simd_i16x8_cmp.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i16x8_cmp.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i16x8_cmp.wast:1455: assert_invalid passed:
error: type mismatch in i16x8.eq, expected [v128, v128] but got [i32, f32]
diff --git a/test/spec/simd/simd_i16x8_extadd_pairwise_i8x16.txt b/test/spec/simd/simd_i16x8_extadd_pairwise_i8x16.txt
index 6b78318c..b87ef707 100644
--- a/test/spec/simd/simd_i16x8_extadd_pairwise_i8x16.txt
+++ b/test/spec/simd/simd_i16x8_extadd_pairwise_i8x16.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i16x8_extadd_pairwise_i8x16.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i16x8_extadd_pairwise_i8x16.wast:47: assert_invalid passed:
error: type mismatch in i16x8.extadd_pairwise_i8x16_s, expected [v128] but got [i32]
diff --git a/test/spec/simd/simd_i16x8_extmul_i8x16.txt b/test/spec/simd/simd_i16x8_extmul_i8x16.txt
index 08ec649c..33178c9a 100644
--- a/test/spec/simd/simd_i16x8_extmul_i8x16.txt
+++ b/test/spec/simd/simd_i16x8_extmul_i8x16.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i16x8_extmul_i8x16.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i16x8_extmul_i8x16.wast:333: assert_invalid passed:
error: type mismatch in i16x8.extmul_low_i8x16_s, expected [v128, v128] but got [i32, f32]
diff --git a/test/spec/simd/simd_i16x8_q15mulr_sat_s.txt b/test/spec/simd/simd_i16x8_q15mulr_sat_s.txt
index 933ae3ac..a1175675 100644
--- a/test/spec/simd/simd_i16x8_q15mulr_sat_s.txt
+++ b/test/spec/simd/simd_i16x8_q15mulr_sat_s.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i16x8_q15mulr_sat_s.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i16x8_q15mulr_sat_s.wast:90: assert_invalid passed:
error: type mismatch in i16x8.q15mulr_sat_s, expected [v128, v128] but got [i32, f32]
diff --git a/test/spec/simd/simd_i16x8_sat_arith.txt b/test/spec/simd/simd_i16x8_sat_arith.txt
index ea126872..ff838b0b 100644
--- a/test/spec/simd/simd_i16x8_sat_arith.txt
+++ b/test/spec/simd/simd_i16x8_sat_arith.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i16x8_sat_arith.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i16x8_sat_arith.wast:609: assert_malformed passed:
out/test/spec/simd/simd_i16x8_sat_arith/simd_i16x8_sat_arith.1.wat:1:22: error: unexpected token "i16x8.add_sat", expected an instr.
diff --git a/test/spec/simd/simd_i32x4_arith.txt b/test/spec/simd/simd_i32x4_arith.txt
index 4fda19f1..77462fa2 100644
--- a/test/spec/simd/simd_i32x4_arith.txt
+++ b/test/spec/simd/simd_i32x4_arith.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i32x4_arith.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i32x4_arith.wast:528: assert_invalid passed:
error: type mismatch in i32x4.neg, expected [v128] but got [i32]
diff --git a/test/spec/simd/simd_i32x4_arith2.txt b/test/spec/simd/simd_i32x4_arith2.txt
index aa645046..e3b2fec0 100644
--- a/test/spec/simd/simd_i32x4_arith2.txt
+++ b/test/spec/simd/simd_i32x4_arith2.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i32x4_arith2.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i32x4_arith2.wast:281: assert_malformed passed:
out/test/spec/simd/simd_i32x4_arith2/simd_i32x4_arith2.1.wat:1:33: error: unexpected token "f32x4.min_s", expected an instr.
diff --git a/test/spec/simd/simd_i32x4_cmp.txt b/test/spec/simd/simd_i32x4_cmp.txt
index 7292e983..586a5f58 100644
--- a/test/spec/simd/simd_i32x4_cmp.txt
+++ b/test/spec/simd/simd_i32x4_cmp.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i32x4_cmp.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i32x4_cmp.wast:1461: assert_invalid passed:
error: type mismatch in i32x4.eq, expected [v128, v128] but got [i32, f32]
diff --git a/test/spec/simd/simd_i32x4_dot_i16x8.txt b/test/spec/simd/simd_i32x4_dot_i16x8.txt
index 8bd064d8..4d036784 100644
--- a/test/spec/simd/simd_i32x4_dot_i16x8.txt
+++ b/test/spec/simd/simd_i32x4_dot_i16x8.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i32x4_dot_i16x8.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i32x4_dot_i16x8.wast:90: assert_invalid passed:
error: type mismatch in i32x4.dot_i16x8_s, expected [v128, v128] but got [i32, f32]
diff --git a/test/spec/simd/simd_i32x4_extadd_pairwise_i16x8.txt b/test/spec/simd/simd_i32x4_extadd_pairwise_i16x8.txt
index 1dfcc60b..797a68b9 100644
--- a/test/spec/simd/simd_i32x4_extadd_pairwise_i16x8.txt
+++ b/test/spec/simd/simd_i32x4_extadd_pairwise_i16x8.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i32x4_extadd_pairwise_i16x8.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i32x4_extadd_pairwise_i16x8.wast:47: assert_invalid passed:
error: type mismatch in i32x4.extadd_pairwise_i16x8_s, expected [v128] but got [i32]
diff --git a/test/spec/simd/simd_i32x4_extmul_i16x8.txt b/test/spec/simd/simd_i32x4_extmul_i16x8.txt
index 78b3a180..42ce7508 100644
--- a/test/spec/simd/simd_i32x4_extmul_i16x8.txt
+++ b/test/spec/simd/simd_i32x4_extmul_i16x8.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i32x4_extmul_i16x8.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i32x4_extmul_i16x8.wast:333: assert_invalid passed:
error: type mismatch in i32x4.extmul_low_i16x8_s, expected [v128, v128] but got [i32, f32]
diff --git a/test/spec/simd/simd_i32x4_trunc_sat_f32x4.txt b/test/spec/simd/simd_i32x4_trunc_sat_f32x4.txt
index 4e2e64a7..b05ae9c2 100644
--- a/test/spec/simd/simd_i32x4_trunc_sat_f32x4.txt
+++ b/test/spec/simd/simd_i32x4_trunc_sat_f32x4.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i32x4_trunc_sat_f32x4.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i32x4_trunc_sat_f32x4.wast:218: assert_invalid passed:
error: type mismatch in i32x4.trunc_sat_f32x4_s, expected [v128] but got [i32]
diff --git a/test/spec/simd/simd_i32x4_trunc_sat_f64x2.txt b/test/spec/simd/simd_i32x4_trunc_sat_f64x2.txt
index d359742b..153c52b7 100644
--- a/test/spec/simd/simd_i32x4_trunc_sat_f64x2.txt
+++ b/test/spec/simd/simd_i32x4_trunc_sat_f64x2.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i32x4_trunc_sat_f64x2.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i32x4_trunc_sat_f64x2.wast:218: assert_invalid passed:
error: type mismatch in i32x4.trunc_sat_f64x2_s_zero, expected [v128] but got [i32]
diff --git a/test/spec/simd/simd_i64x2_arith.txt b/test/spec/simd/simd_i64x2_arith.txt
index d8012fb1..5f67274e 100644
--- a/test/spec/simd/simd_i64x2_arith.txt
+++ b/test/spec/simd/simd_i64x2_arith.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i64x2_arith.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i64x2_arith.wast:546: assert_invalid passed:
error: type mismatch in i64x2.neg, expected [v128] but got [i32]
diff --git a/test/spec/simd/simd_i64x2_arith2.txt b/test/spec/simd/simd_i64x2_arith2.txt
index 15e2b79d..2c7387e3 100644
--- a/test/spec/simd/simd_i64x2_arith2.txt
+++ b/test/spec/simd/simd_i64x2_arith2.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i64x2_arith2.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i64x2_arith2.wast:59: assert_invalid passed:
error: type mismatch in i64x2.abs, expected [v128] but got [f32]
diff --git a/test/spec/simd/simd_i64x2_cmp.txt b/test/spec/simd/simd_i64x2_cmp.txt
index 6008cdfd..15692632 100644
--- a/test/spec/simd/simd_i64x2_cmp.txt
+++ b/test/spec/simd/simd_i64x2_cmp.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i64x2_cmp.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i64x2_cmp.wast:374: assert_invalid passed:
error: type mismatch in i64x2.eq, expected [v128, v128] but got [i32, f32]
diff --git a/test/spec/simd/simd_i64x2_extmul_i32x4.txt b/test/spec/simd/simd_i64x2_extmul_i32x4.txt
index 6d735ec8..5185f724 100644
--- a/test/spec/simd/simd_i64x2_extmul_i32x4.txt
+++ b/test/spec/simd/simd_i64x2_extmul_i32x4.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i64x2_extmul_i32x4.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i64x2_extmul_i32x4.wast:333: assert_invalid passed:
error: type mismatch in i64x2.extmul_low_i32x4_s, expected [v128, v128] but got [i32, f32]
diff --git a/test/spec/simd/simd_i8x16_arith.txt b/test/spec/simd/simd_i8x16_arith.txt
index d93d3a51..1a35bfe3 100644
--- a/test/spec/simd/simd_i8x16_arith.txt
+++ b/test/spec/simd/simd_i8x16_arith.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i8x16_arith.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i8x16_arith.wast:354: assert_invalid passed:
error: type mismatch in i8x16.neg, expected [v128] but got [i32]
diff --git a/test/spec/simd/simd_i8x16_arith2.txt b/test/spec/simd/simd_i8x16_arith2.txt
index 889aa8f1..095518b5 100644
--- a/test/spec/simd/simd_i8x16_arith2.txt
+++ b/test/spec/simd/simd_i8x16_arith2.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i8x16_arith2.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i8x16_arith2.wast:378: assert_malformed passed:
out/test/spec/simd/simd_i8x16_arith2/simd_i8x16_arith2.1.wat:1:33: error: unexpected token "i32x4.avgr_u", expected an instr.
diff --git a/test/spec/simd/simd_i8x16_cmp.txt b/test/spec/simd/simd_i8x16_cmp.txt
index 5179f277..84845949 100644
--- a/test/spec/simd/simd_i8x16_cmp.txt
+++ b/test/spec/simd/simd_i8x16_cmp.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i8x16_cmp.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i8x16_cmp.wast:1401: assert_invalid passed:
error: type mismatch in i8x16.eq, expected [v128, v128] but got [i32, f32]
diff --git a/test/spec/simd/simd_i8x16_sat_arith.txt b/test/spec/simd/simd_i8x16_sat_arith.txt
index 297cec8a..86d2f436 100644
--- a/test/spec/simd/simd_i8x16_sat_arith.txt
+++ b/test/spec/simd/simd_i8x16_sat_arith.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_i8x16_sat_arith.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_i8x16_sat_arith.wast:561: assert_malformed passed:
out/test/spec/simd/simd_i8x16_sat_arith/simd_i8x16_sat_arith.1.wat:1:22: error: unexpected token "i8x16.add_sat", expected an instr.
diff --git a/test/spec/simd/simd_int_to_int_extend.txt b/test/spec/simd/simd_int_to_int_extend.txt
index 80830e9d..66551eb5 100644
--- a/test/spec/simd/simd_int_to_int_extend.txt
+++ b/test/spec/simd/simd_int_to_int_extend.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_int_to_int_extend.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_int_to_int_extend.wast:488: assert_invalid passed:
error: type mismatch in i16x8.extend_high_i8x16_s, expected [v128] but got [i32]
diff --git a/test/spec/simd/simd_lane.txt b/test/spec/simd/simd_lane.txt
index 28febc94..958f8154 100644
--- a/test/spec/simd/simd_lane.txt
+++ b/test/spec/simd/simd_lane.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_lane.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_lane.wast:398: assert_malformed passed:
out/test/spec/simd/simd_lane/simd_lane.1.wat:1:21: error: invalid literal "-1"
diff --git a/test/spec/simd/simd_load.txt b/test/spec/simd/simd_load.txt
index 9d7da89a..3f008a88 100644
--- a/test/spec/simd/simd_load.txt
+++ b/test/spec/simd/simd_load.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_load.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_load.wast:141: assert_malformed passed:
out/test/spec/simd/simd_load/simd_load.14.wat:1:37: error: unexpected token "v128.load8", expected an expr.
diff --git a/test/spec/simd/simd_load16_lane.txt b/test/spec/simd/simd_load16_lane.txt
index d678b54b..9f2fb118 100644
--- a/test/spec/simd/simd_load16_lane.txt
+++ b/test/spec/simd/simd_load16_lane.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_load16_lane.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_load16_lane.wast:195: assert_invalid passed:
error: type mismatch in v128.load16_lane, expected [i32, v128] but got [v128, i32]
diff --git a/test/spec/simd/simd_load32_lane.txt b/test/spec/simd/simd_load32_lane.txt
index ee0efa78..f1b3a1d3 100644
--- a/test/spec/simd/simd_load32_lane.txt
+++ b/test/spec/simd/simd_load32_lane.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_load32_lane.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_load32_lane.wast:127: assert_invalid passed:
error: type mismatch in v128.load32_lane, expected [i32, v128] but got [v128, i32]
diff --git a/test/spec/simd/simd_load64_lane.txt b/test/spec/simd/simd_load64_lane.txt
index 1ed14671..4ed8a73f 100644
--- a/test/spec/simd/simd_load64_lane.txt
+++ b/test/spec/simd/simd_load64_lane.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_load64_lane.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_load64_lane.wast:81: assert_invalid passed:
error: type mismatch in v128.load64_lane, expected [i32, v128] but got [v128, i32]
diff --git a/test/spec/simd/simd_load8_lane.txt b/test/spec/simd/simd_load8_lane.txt
index 96917f3d..995536e4 100644
--- a/test/spec/simd/simd_load8_lane.txt
+++ b/test/spec/simd/simd_load8_lane.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_load8_lane.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_load8_lane.wast:283: assert_invalid passed:
error: type mismatch in v128.load8_lane, expected [i32, v128] but got [v128, i32]
diff --git a/test/spec/simd/simd_load_extend.txt b/test/spec/simd/simd_load_extend.txt
index 9c97f642..64fb2332 100644
--- a/test/spec/simd/simd_load_extend.txt
+++ b/test/spec/simd/simd_load_extend.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_load_extend.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_load_extend.wast:226: assert_trap passed: out of bounds memory access: access at 4294967295+8 >= max value 65536
out/test/spec/simd/simd_load_extend.wast:227: assert_trap passed: out of bounds memory access: access at 4294967295+8 >= max value 65536
diff --git a/test/spec/simd/simd_load_splat.txt b/test/spec/simd/simd_load_splat.txt
index 08f58427..088c3128 100644
--- a/test/spec/simd/simd_load_splat.txt
+++ b/test/spec/simd/simd_load_splat.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_load_splat.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_load_splat.wast:119: assert_trap passed: out of bounds memory access: access at 4294967295+1 >= max value 65536
out/test/spec/simd/simd_load_splat.wast:120: assert_trap passed: out of bounds memory access: access at 4294967295+2 >= max value 65536
diff --git a/test/spec/simd/simd_load_zero.txt b/test/spec/simd/simd_load_zero.txt
index 59748496..0228c816 100644
--- a/test/spec/simd/simd_load_zero.txt
+++ b/test/spec/simd/simd_load_zero.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_load_zero.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_load_zero.wast:88: assert_trap passed: out of bounds memory access: access at 4294967295+4 >= max value 65536
out/test/spec/simd/simd_load_zero.wast:89: assert_trap passed: out of bounds memory access: access at 4294967295+8 >= max value 65536
diff --git a/test/spec/simd/simd_splat.txt b/test/spec/simd/simd_splat.txt
index fa7c1144..07f02d3d 100644
--- a/test/spec/simd/simd_splat.txt
+++ b/test/spec/simd/simd_splat.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_splat.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_splat.wast:122: assert_malformed passed:
out/test/spec/simd/simd_splat/simd_splat.1.wat:1:22: error: unexpected token "v128.splat", expected an instr.
diff --git a/test/spec/simd/simd_store.txt b/test/spec/simd/simd_store.txt
index 078708bd..d0adc41b 100644
--- a/test/spec/simd/simd_store.txt
+++ b/test/spec/simd/simd_store.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_store.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_store.wast:103: assert_malformed passed:
out/test/spec/simd/simd_store/simd_store.2.wat:1:18: error: unexpected token "v128.store8", expected an instr.
diff --git a/test/spec/simd/simd_store16_lane.txt b/test/spec/simd/simd_store16_lane.txt
index ebc59ebb..60cd2687 100644
--- a/test/spec/simd/simd_store16_lane.txt
+++ b/test/spec/simd/simd_store16_lane.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_store16_lane.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_store16_lane.wast:283: assert_invalid passed:
error: type mismatch in v128.store16_lane, expected [i32, v128] but got [v128, i32]
diff --git a/test/spec/simd/simd_store32_lane.txt b/test/spec/simd/simd_store32_lane.txt
index ddfbedbb..6be26ac5 100644
--- a/test/spec/simd/simd_store32_lane.txt
+++ b/test/spec/simd/simd_store32_lane.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_store32_lane.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_store32_lane.wast:183: assert_invalid passed:
error: type mismatch in v128.store32_lane, expected [i32, v128] but got [v128, i32]
diff --git a/test/spec/simd/simd_store64_lane.txt b/test/spec/simd/simd_store64_lane.txt
index 55e88078..8583e10d 100644
--- a/test/spec/simd/simd_store64_lane.txt
+++ b/test/spec/simd/simd_store64_lane.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_store64_lane.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_store64_lane.wast:115: assert_invalid passed:
error: type mismatch in v128.store64_lane, expected [i32, v128] but got [v128, i32]
diff --git a/test/spec/simd/simd_store8_lane.txt b/test/spec/simd/simd_store8_lane.txt
index 9c3397e3..bd098071 100644
--- a/test/spec/simd/simd_store8_lane.txt
+++ b/test/spec/simd/simd_store8_lane.txt
@@ -1,6 +1,5 @@
;;; TOOL: run-interp-spec
;;; STDIN_FILE: third_party/testsuite/proposals/simd/simd_store8_lane.wast
-;;; ARGS*: --enable-simd
(;; STDOUT ;;;
out/test/spec/simd/simd_store8_lane.wast:411: assert_invalid passed:
error: type mismatch in v128.store8_lane, expected [i32, v128] but got [v128, i32]
diff --git a/test/typecheck/bad-callref-int32.txt b/test/typecheck/bad-callref-int32.txt
index 289bd5ae..52f34da1 100644
--- a/test/typecheck/bad-callref-int32.txt
+++ b/test/typecheck/bad-callref-int32.txt
@@ -12,4 +12,4 @@
out/test/typecheck/bad-callref-int32.txt:6:6: error: type mismatch in call_ref, expected reference but got [i32]
(call_ref (i32.const 10)
^^^^^^^^
-;;; STDERR ;;) \ No newline at end of file
+;;; STDERR ;;)
diff --git a/test/typecheck/bad-simd-lane.txt b/test/typecheck/bad-simd-lane.txt
index e6fe4bbc..b96203e9 100644
--- a/test/typecheck/bad-simd-lane.txt
+++ b/test/typecheck/bad-simd-lane.txt
@@ -1,5 +1,4 @@
;;; TOOL: wat2wasm
-;;; ARGS*: --enable-simd
;;; ERROR: 1
(module
(func (result i32) v128.const i32x4 0 0 0 0 i8x16.extract_lane_s 16)
@@ -20,7 +19,7 @@
(func (result i32) v128.const i32x4 0 0 0 0 i8x16.extract_lane_s 0x100000000)
)
(;; STDERR ;;;
-out/test/typecheck/bad-simd-lane.txt:20:47: error: lane index "0x100000000" out-of-range [0, 32)
+out/test/typecheck/bad-simd-lane.txt:19:47: error: lane index "0x100000000" out-of-range [0, 32)
(func (result i32) v128.const i32x4 0 0 0 0 i8x16.extract_lane_s 0x100000000)
^^^^^^^^^^^^^^^^^^^^
;;; STDERR ;;)
diff --git a/test/update-spec-tests.py b/test/update-spec-tests.py
index a34686bf..cf71a763 100755
--- a/test/update-spec-tests.py
+++ b/test/update-spec-tests.py
@@ -92,7 +92,6 @@ def main(args):
ProcessProposalDir('sign-extension-ops', '--enable-sign-extension')
ProcessProposalDir('bulk-memory-operations', '--enable-bulk-memory')
ProcessProposalDir('reference-types', '--enable-reference-types')
- ProcessProposalDir('simd', '--enable-simd')
ProcessProposalDir('memory64', '--enable-memory64')
return 0
diff --git a/test/wasm2c/bad-enable-feature.txt b/test/wasm2c/bad-enable-feature.txt
index 7139aeaa..376138a3 100644
--- a/test/wasm2c/bad-enable-feature.txt
+++ b/test/wasm2c/bad-enable-feature.txt
@@ -1,5 +1,5 @@
;;; RUN: %(wasm2c)s
-;;; ARGS: --enable-simd %(in_file)s
+;;; ARGS: --enable-exceptions %(in_file)s
;;; ERROR: 1
(;; STDERR ;;;
wasm2c currently support only default feature flags.