Sync with the latest version of the upstream spec

.github/workflows/main.yml

@@ -14,11 +14,22 @@ jobs:
         submodules: true
     - name: Install Rust
       run: rustup update ${{ matrix.rust }} && rustup default ${{ matrix.rust }}
-    - name: Install wabt
+
+    # Build an up-to-date version of wabt since the releases don't always have
+    # all the features we want.
+    - uses: actions/checkout@v2
+      with:
+        repository: WebAssembly/wabt
+        ref: 9068d3927b404ce1e9c600473255a90504034eee
+        path: wabt
+    - name: Build wabt
       run: |
         set -e
-        curl -L https://github.com/WebAssembly/wabt/releases/download/1.0.13/wabt-1.0.13-linux.tar.gz | tar xzf -
-        echo "##[add-path]`pwd`/wabt-1.0.13"
+        cd wabt
+        cmake . -DBUILD_TESTS=OFF
+        make -j$(nproc) wast2json spectest-interp wasm-interp
+        echo ::add-path::`pwd`
+
     - name: Install binaryen
       run: |
         set -e

Cargo.toml

@@ -29,7 +29,7 @@ leb128 = "0.2.4"
 log = "0.4.8"
 rayon = { version = "1.1.0", optional = true }
 walrus-macro = { path = './crates/macro', version = '=0.15.0' }
-wasmparser = "0.51.0"
+wasmparser = "0.52.0"
 
 [features]
 parallel = ['rayon', 'id-arena/rayon']

crates/tests/tests/round_trip/simd.wat

@@ -309,10 +309,6 @@
     local.get 0
     local.get 1
     i8x16.sub_saturate_s)
-   (func $i8x16.mul (export "i8x16.mul") (param v128 v128) (result v128)
-    local.get 0
-    local.get 1
-    i8x16.mul)
 
    (func $i16x8.neg (export "i16x8.neg") (param v128) (result v128)
     local.get 0
@@ -401,12 +397,6 @@
    (func $i64x2.neg (export "i64x2.neg") (param v128) (result v128)
     local.get 0
     i64x2.neg)
-   (func $i64x2.any_true (export "i64x2.any_true") (param v128) (result i32)
-    local.get 0
-    i64x2.any_true)
-   (func $i64x2.all_true (export "i64x2.all_true") (param v128) (result i32)
-    local.get 0
-    i64x2.all_true)
    (func $i64x2.shl (export "i64x2.shl") (param v128 i32) (result v128)
     local.get 0
     local.get 1
@@ -759,10 +749,6 @@
       local.get 0
       local.get 1
       i8x16.sub_saturate_s)
-    (func $i8x16.mul (type 15) (param v128 v128) (result v128)
-      local.get 0
-      local.get 1
-      i8x16.mul)
     (func $i16x8.shl (type 11) (param v128 i32) (result v128)
       local.get 0
       local.get 1
@@ -973,12 +959,6 @@
     (func $i64x2.neg (type 10) (param v128) (result v128)
       local.get 0
       i64x2.neg)
-    (func $i64x2.any_true (type 6) (param v128) (result i32)
-      local.get 0
-      i64x2.any_true)
-    (func $i64x2.all_true (type 6) (param v128) (result i32)
-      local.get 0
-      i64x2.all_true)
     (func $f32x4.abs (type 10) (param v128) (result v128)
       local.get 0
       f32x4.abs)
@@ -1089,7 +1069,6 @@
     (export "i8x16.sub" (func $i8x16.sub))
     (export "i8x16.sub_saturate_u" (func $i8x16.sub_saturate_u))
     (export "i8x16.sub_saturate_s" (func $i8x16.sub_saturate_s))
-    (export "i8x16.mul" (func $i8x16.mul))
     (export "i16x8.neg" (func $i16x8.neg))
     (export "i16x8.any_true" (func $i16x8.any_true))
     (export "i16x8.all_true" (func $i16x8.all_true))
@@ -1113,8 +1092,6 @@
     (export "i32x4.sub" (func $i32x4.sub))
     (export "i32x4.mul" (func $i32x4.mul))
     (export "i64x2.neg" (func $i64x2.neg))
-    (export "i64x2.any_true" (func $i64x2.any_true))
-    (export "i64x2.all_true" (func $i64x2.all_true))
     (export "i64x2.shl" (func $i64x2.shl))
     (export "i64x2.shr_s" (func $i64x2.shr_s))
     (export "i64x2.shr_u" (func $i64x2.shr_u))

crates/tests/tests/spec-tests.rs

@@ -1,4 +1,4 @@
-use anyhow::Context;
+use anyhow::{bail, Context};
 use std::fs;
 use std::path::Path;
 use std::process::Command;
@@ -10,6 +10,12 @@ struct Test {
     commands: Vec<serde_json::Value>,
 }
 
+const STABLE_FEATURES: &[&str] = &[
+    "--enable-multi-value",
+    "--enable-saturating-float-to-int",
+    "--enable-sign-extension",
+];
+
 fn run(wast: &Path) -> Result<(), anyhow::Error> {
     static INIT_LOGS: std::sync::Once = std::sync::Once::new();
     INIT_LOGS.call_once(|| {
@@ -23,11 +29,13 @@ fn run(wast: &Path) -> Result<(), anyhow::Error> {
         .next()
         .map(|s| s.to_str().unwrap());
     let extra_args: &[&str] = match proposal {
-        None => &[],
-        Some("mutable-global") => &[],
-        Some("sign-extension-ops") => &["--enable-sign-extension"],
-        Some("multi-value") => &["--enable-multi-value"],
-        Some("nontrapping-float-to-int-conversions") => &["--enable-saturating-float-to-int"],
+        // stable features
+        None
+        | Some("multi-value")
+        | Some("nontrapping-float-to-int-conversions")
+        | Some("sign-extension-ops")
+        | Some("mutable-global") => &[],
+
         Some("reference-types") => &["--enable-reference-types", "--enable-bulk-memory"],
         Some("bulk-memory-operations") => &["--enable-bulk-memory"],
 
@@ -38,6 +46,9 @@ fn run(wast: &Path) -> Result<(), anyhow::Error> {
         // TODO: should get tail-call working
         Some("tail-call") => return Ok(()),
 
+        // not a walrus thing, but not implemented in wabt fully yet anyway
+        Some("annotations") => return Ok(()),
+
         // Some("threads") => &["--enable-threads"],
         Some(other) => panic!("unknown wasm proposal: {}", other),
     };
@@ -48,11 +59,14 @@ fn run(wast: &Path) -> Result<(), anyhow::Error> {
         .arg(wast)
         .arg("-o")
         .arg(&json)
+        .args(STABLE_FEATURES)
         .args(extra_args)
         .status()
         .context("executing `wast2json`")?;
     assert!(status.success());
 
+    let wabt_ok = run_spectest_interp(tempdir.path(), extra_args).is_ok();
+
     let contents = fs::read_to_string(&json).context("failed to read file")?;
     let test: Test = serde_json::from_str(&contents).context("failed to parse file")?;
     let mut files = Vec::new();
@@ -128,6 +142,12 @@ fn run(wast: &Path) -> Result<(), anyhow::Error> {
         }
     }
 
+    // If wabt didn't succeed before we ran walrus there's no hope of it passing
+    // after we run walrus.
+    if !wabt_ok {
+        return Ok(());
+    }
+
     // First up run the spec-tests as-is after we round-tripped through walrus.
     // This should for sure work correctly
     run_spectest_interp(tempdir.path(), extra_args)?;
@@ -159,6 +179,7 @@ fn run_spectest_interp(cwd: &Path, extra_args: &[&str]) -> Result<(), anyhow::Er
     let output = Command::new("spectest-interp")
         .current_dir(cwd)
         .arg("foo.json")
+        .args(STABLE_FEATURES)
         .args(extra_args)
         .output()
         .context("executing `spectest-interp`")?;
@@ -181,7 +202,7 @@ fn run_spectest_interp(cwd: &Path, extra_args: &[&str]) -> Result<(), anyhow::Er
     println!("status: {}", output.status);
     println!("stdout:\n{}", String::from_utf8_lossy(&output.stdout));
     println!("stderr:\n{}", String::from_utf8_lossy(&output.stderr));
-    panic!("failed");
+    bail!("failed");
 }
 
 include!(concat!(env!("OUT_DIR"), "/spec-tests.rs"));

src/ir/mod.rs

@@ -619,7 +619,7 @@ impl Value {
                 encoder.f64(n);
             }
             Value::V128(n) => {
-                encoder.raw(&[0xfd, 0x02]); // v128.const
+                encoder.raw(&[0xfd, 0x0c]); // v128.const
                 for i in 0..16 {
                     encoder.byte((n >> (i * 8)) as u8);
                 }
@@ -796,7 +796,6 @@ pub enum BinaryOp {
     I8x16Sub,
     I8x16SubSaturateS,
     I8x16SubSaturateU,
-    I8x16Mul,
     I16x8Shl,
     I16x8ShrS,
     I16x8ShrU,
@@ -935,18 +934,19 @@ pub enum UnaryOp {
 
     V128Not,
 
+    I8x16Abs,
     I8x16Neg,
     I8x16AnyTrue,
     I8x16AllTrue,
+    I16x8Abs,
     I16x8Neg,
     I16x8AnyTrue,
     I16x8AllTrue,
+    I32x4Abs,
     I32x4Neg,
     I32x4AnyTrue,
     I32x4AllTrue,
     I64x2Neg,
-    I64x2AnyTrue,
-    I64x2AllTrue,
 
     F32x4Abs,
     F32x4Neg,
@@ -955,14 +955,10 @@ pub enum UnaryOp {
     F64x2Neg,
     F64x2Sqrt,
 
-    I32x4TruncSF32x4Sat,
-    I32x4TruncUF32x4Sat,
-    I64x2TruncSF64x2Sat,
-    I64x2TruncUF64x2Sat,
-    F32x4ConvertSI32x4,
-    F32x4ConvertUI32x4,
-    F64x2ConvertSI64x2,
-    F64x2ConvertUI64x2,
+    I32x4TruncSatF32x4S,
+    I32x4TruncSatF32x4U,
+    F32x4ConvertI32x4S,
+    F32x4ConvertI32x4U,
 
     I32TruncSSatF32,
     I32TruncUSatF32,