Merge pull request #185 from alexcrichton/update-wasmparser

Update wasmparser and pick up new SIMD instructions

.github/workflows/main.yml

@@ -20,7 +20,7 @@ jobs:
     - uses: actions/checkout@v2
       with:
         repository: WebAssembly/wabt
-        ref: 7c88424c98f157d375458fe6b2cd392959d7d217
+        ref: 8e42376ccd5f05dc1036f91b4262e67b0fc66c2d
         path: wabt
     - name: Build wabt
       run: |

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.18.0' }
-wasmparser = "0.62.0"
+wasmparser = "0.65.0"
 
 [features]
 parallel = ['rayon', 'id-arena/rayon']

crates/tests/tests/round_trip/simd.wat

@@ -289,26 +289,26 @@
     local.get 0
     local.get 1
     i8x16.add)
-   (func $i8x16.add_saturate_u (export "i8x16.add_saturate_u") (param v128 v128) (result v128)
+   (func $i8x16.add_sat_u (export "i8x16.add_sat_u") (param v128 v128) (result v128)
     local.get 0
     local.get 1
-    i8x16.add_saturate_u)
-   (func $i8x16.add_saturate_s (export "i8x16.add_saturate_s") (param v128 v128) (result v128)
+    i8x16.add_sat_u)
+   (func $i8x16.add_sat_s (export "i8x16.add_sat_s") (param v128 v128) (result v128)
     local.get 0
     local.get 1
-    i8x16.add_saturate_s)
+    i8x16.add_sat_s)
    (func $i8x16.sub (export "i8x16.sub") (param v128 v128) (result v128)
     local.get 0
     local.get 1
     i8x16.sub)
-   (func $i8x16.sub_saturate_u (export "i8x16.sub_saturate_u") (param v128 v128) (result v128)
+   (func $i8x16.sub_sat_u (export "i8x16.sub_sat_u") (param v128 v128) (result v128)
     local.get 0
     local.get 1
-    i8x16.sub_saturate_u)
-   (func $i8x16.sub_saturate_s (export "i8x16.sub_saturate_s") (param v128 v128) (result v128)
+    i8x16.sub_sat_u)
+   (func $i8x16.sub_sat_s (export "i8x16.sub_sat_s") (param v128 v128) (result v128)
     local.get 0
     local.get 1
-    i8x16.sub_saturate_s)
+    i8x16.sub_sat_s)
 
    (func $i16x8.neg (export "i16x8.neg") (param v128) (result v128)
     local.get 0
@@ -335,26 +335,26 @@
     local.get 0
     local.get 1
     i16x8.add)
-   (func $i16x8.add_saturate_u (export "i16x8.add_saturate_u") (param v128 v128) (result v128)
+   (func $i16x8.add_sat_u (export "i16x8.add_sat_u") (param v128 v128) (result v128)
     local.get 0
     local.get 1
-    i16x8.add_saturate_u)
-   (func $i16x8.add_saturate_s (export "i16x8.add_saturate_s") (param v128 v128) (result v128)
+    i16x8.add_sat_u)
+   (func $i16x8.add_sat_s (export "i16x8.add_sat_s") (param v128 v128) (result v128)
     local.get 0
     local.get 1
-    i16x8.add_saturate_s)
+    i16x8.add_sat_s)
    (func $i16x8.sub (export "i16x8.sub") (param v128 v128) (result v128)
     local.get 0
     local.get 1
     i16x8.sub)
-   (func $i16x8.sub_saturate_u (export "i16x8.sub_saturate_u") (param v128 v128) (result v128)
+   (func $i16x8.sub_sat_u (export "i16x8.sub_sat_u") (param v128 v128) (result v128)
     local.get 0
     local.get 1
-    i16x8.sub_saturate_u)
-   (func $i16x8.sub_saturate_s (export "i16x8.sub_saturate_s") (param v128 v128) (result v128)
+    i16x8.sub_sat_u)
+   (func $i16x8.sub_sat_s (export "i16x8.sub_sat_s") (param v128 v128) (result v128)
     local.get 0
     local.get 1
-    i16x8.sub_saturate_s)
+    i16x8.sub_sat_s)
    (func $i16x8.mul (export "i16x8.mul") (param v128 v128) (result v128)
     local.get 0
     local.get 1
@@ -729,26 +729,26 @@
       local.get 0
       local.get 1
       i8x16.add)
-    (func $i8x16.add_saturate_u (type 15) (param v128 v128) (result v128)
+    (func $i8x16.add_sat_u (type 15) (param v128 v128) (result v128)
       local.get 0
       local.get 1
-      i8x16.add_saturate_u)
-    (func $i8x16.add_saturate_s (type 15) (param v128 v128) (result v128)
+      i8x16.add_sat_u)
+    (func $i8x16.add_sat_s (type 15) (param v128 v128) (result v128)
       local.get 0
       local.get 1
-      i8x16.add_saturate_s)
+      i8x16.add_sat_s)
     (func $i8x16.sub (type 15) (param v128 v128) (result v128)
       local.get 0
       local.get 1
       i8x16.sub)
-    (func $i8x16.sub_saturate_u (type 15) (param v128 v128) (result v128)
+    (func $i8x16.sub_sat_u (type 15) (param v128 v128) (result v128)
       local.get 0
       local.get 1
-      i8x16.sub_saturate_u)
-    (func $i8x16.sub_saturate_s (type 15) (param v128 v128) (result v128)
+      i8x16.sub_sat_u)
+    (func $i8x16.sub_sat_s (type 15) (param v128 v128) (result v128)
       local.get 0
       local.get 1
-      i8x16.sub_saturate_s)
+      i8x16.sub_sat_s)
     (func $i16x8.shl (type 11) (param v128 i32) (result v128)
       local.get 0
       local.get 1
@@ -765,26 +765,26 @@
       local.get 0
       local.get 1
       i16x8.add)
-    (func $i16x8.add_saturate_u (type 15) (param v128 v128) (result v128)
+    (func $i16x8.add_sat_u (type 15) (param v128 v128) (result v128)
       local.get 0
       local.get 1
-      i16x8.add_saturate_u)
-    (func $i16x8.add_saturate_s (type 15) (param v128 v128) (result v128)
+      i16x8.add_sat_u)
+    (func $i16x8.add_sat_s (type 15) (param v128 v128) (result v128)
       local.get 0
       local.get 1
-      i16x8.add_saturate_s)
+      i16x8.add_sat_s)
     (func $i16x8.sub (type 15) (param v128 v128) (result v128)
       local.get 0
       local.get 1
       i16x8.sub)
-    (func $i16x8.sub_saturate_u (type 15) (param v128 v128) (result v128)
+    (func $i16x8.sub_sat_u (type 15) (param v128 v128) (result v128)
       local.get 0
       local.get 1
-      i16x8.sub_saturate_u)
-    (func $i16x8.sub_saturate_s (type 15) (param v128 v128) (result v128)
+      i16x8.sub_sat_u)
+    (func $i16x8.sub_sat_s (type 15) (param v128 v128) (result v128)
       local.get 0
       local.get 1
-      i16x8.sub_saturate_s)
+      i16x8.sub_sat_s)
     (func $i16x8.mul (type 15) (param v128 v128) (result v128)
       local.get 0
       local.get 1
@@ -1064,23 +1064,23 @@
     (export "i8x16.shr_s" (func $i8x16.shr_s))
     (export "i8x16.shr_u" (func $i8x16.shr_u))
     (export "i8x16.add" (func $i8x16.add))
-    (export "i8x16.add_saturate_u" (func $i8x16.add_saturate_u))
-    (export "i8x16.add_saturate_s" (func $i8x16.add_saturate_s))
+    (export "i8x16.add_sat_u" (func $i8x16.add_sat_u))
+    (export "i8x16.add_sat_s" (func $i8x16.add_sat_s))
     (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.sub_sat_u" (func $i8x16.sub_sat_u))
+    (export "i8x16.sub_sat_s" (func $i8x16.sub_sat_s))
     (export "i16x8.neg" (func $i16x8.neg))
     (export "i16x8.any_true" (func $i16x8.any_true))
     (export "i16x8.all_true" (func $i16x8.all_true))
     (export "i16x8.shl" (func $i16x8.shl))
     (export "i16x8.shr_s" (func $i16x8.shr_s))
     (export "i16x8.shr_u" (func $i16x8.shr_u))
     (export "i16x8.add" (func $i16x8.add))
-    (export "i16x8.add_saturate_u" (func $i16x8.add_saturate_u))
-    (export "i16x8.add_saturate_s" (func $i16x8.add_saturate_s))
+    (export "i16x8.add_sat_u" (func $i16x8.add_sat_u))
+    (export "i16x8.add_sat_s" (func $i16x8.add_sat_s))
     (export "i16x8.sub" (func $i16x8.sub))
-    (export "i16x8.sub_saturate_u" (func $i16x8.sub_saturate_u))
-    (export "i16x8.sub_saturate_s" (func $i16x8.sub_saturate_s))
+    (export "i16x8.sub_sat_u" (func $i16x8.sub_sat_u))
+    (export "i16x8.sub_sat_s" (func $i16x8.sub_sat_s))
     (export "i16x8.mul" (func $i16x8.mul))
     (export "i32x4.neg" (func $i32x4.neg))
     (export "i32x4.any_true" (func $i32x4.any_true))

crates/tests/tests/spec-tests.rs

@@ -33,10 +33,7 @@ fn run(wast: &Path) -> Result<(), anyhow::Error> {
         Some("simd") => &["--enable-simd"],
         Some("bulk-memory-operations") => &["--enable-bulk-memory"],
 
-        // Some("reference-types") => &["--enable-reference-types", "--enable-bulk-memory"],
-        // TODO: waiting for wabt to update its implementation of reference
-        // types.
-        Some("reference-types") => return Ok(()),
+        Some("reference-types") => &["--enable-reference-types", "--enable-bulk-memory"],
 
         // TODO: should get threads working
         Some("threads") => return Ok(()),
@@ -49,6 +46,7 @@ fn run(wast: &Path) -> Result<(), anyhow::Error> {
         // not implemented in walrus yet
         Some("function-references") => return Ok(()),
         Some("exception-handling") => return Ok(()),
+        Some("memory64") => return Ok(()),
 
         // Some("threads") => &["--enable-threads"],
         Some(other) => panic!("unknown wasm proposal: {}", other),

src/ir/mod.rs

@@ -539,11 +539,11 @@ pub enum Instr {
     /// `v128.bitselect`
     V128Bitselect {},
 
-    /// `v128.swizzle`
-    V128Swizzle {},
+    /// `i8x16.swizzle`
+    I8x16Swizzle {},
 
-    /// `v128.shuffle`
-    V128Shuffle {
+    /// `i8x16.shuffle`
+    I8x16Shuffle {
         /// The indices that are used to create the final vector of this
         /// instruction
         #[walrus(skip_visit)]
@@ -795,20 +795,20 @@ pub enum BinaryOp {
     I8x16ShrS,
     I8x16ShrU,
     I8x16Add,
-    I8x16AddSaturateS,
-    I8x16AddSaturateU,
+    I8x16AddSatS,
+    I8x16AddSatU,
     I8x16Sub,
-    I8x16SubSaturateS,
-    I8x16SubSaturateU,
+    I8x16SubSatS,
+    I8x16SubSatU,
     I16x8Shl,
     I16x8ShrS,
     I16x8ShrU,
     I16x8Add,
-    I16x8AddSaturateS,
-    I16x8AddSaturateU,
+    I16x8AddSatS,
+    I16x8AddSatU,
     I16x8Sub,
-    I16x8SubSaturateS,
-    I16x8SubSaturateU,
+    I16x8SubSatS,
+    I16x8SubSatU,
     I16x8Mul,
     I32x4Shl,
     I32x4ShrS,
@@ -829,12 +829,16 @@ pub enum BinaryOp {
     F32x4Div,
     F32x4Min,
     F32x4Max,
+    F32x4PMin,
+    F32x4PMax,
     F64x2Add,
     F64x2Sub,
     F64x2Mul,
     F64x2Div,
     F64x2Min,
     F64x2Max,
+    F64x2PMin,
+    F64x2PMax,
 
     I8x16NarrowI16x8S,
     I8x16NarrowI16x8U,
@@ -855,6 +859,8 @@ pub enum BinaryOp {
     I32x4MinU,
     I32x4MaxS,
     I32x4MaxU,
+
+    I32x4DotI16x8S,
 }
 
 /// Possible unary operations in wasm
@@ -958,9 +964,17 @@ pub enum UnaryOp {
     F32x4Abs,
     F32x4Neg,
     F32x4Sqrt,
+    F32x4Ceil,
+    F32x4Floor,
+    F32x4Trunc,
+    F32x4Nearest,
     F64x2Abs,
     F64x2Neg,
     F64x2Sqrt,
+    F64x2Ceil,
+    F64x2Floor,
+    F64x2Trunc,
+    F64x2Nearest,
 
     I32x4TruncSatF32x4S,
     I32x4TruncSatF32x4U,
@@ -1014,12 +1028,15 @@ pub enum LoadSimdKind {
     Splat16,
     Splat32,
     Splat64,
-    I16x8Load8x8S,
-    I16x8Load8x8U,
-    I32x4Load16x4S,
-    I32x4Load16x4U,
-    I64x2Load32x2S,
-    I64x2Load32x2U,
+
+    V128Load8x8S,
+    V128Load8x8U,
+    V128Load16x4S,
+    V128Load16x4U,
+    V128Load32x2S,
+    V128Load32x2U,
+    V128Load32Zero,
+    V128Load64Zero,
 }
 
 /// The kinds of extended loads which can happen
@@ -1212,8 +1229,8 @@ impl Instr {
             | Instr::RefIsNull(..)
             | Instr::RefFunc(..)
             | Instr::V128Bitselect(..)
-            | Instr::V128Swizzle(..)
-            | Instr::V128Shuffle(..)
+            | Instr::I8x16Swizzle(..)
+            | Instr::I8x16Shuffle(..)
             | Instr::LoadSimd(..)
             | Instr::AtomicFence(..)
             | Instr::TableInit(..)