[interpreter] Implement f64x2.convert_low_i32x4_{s,u}

These 2 instructions were merged as part of #383.
WebAssembly · Feb 23, 2021 · a64adb9 · a64adb9
1 parent 64b8775
commit a64adb9
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 0 deletions.
diff --git a/interpreter/binary/decode.ml b/interpreter/binary/decode.ml
@@ -304,6 +304,8 @@ let simd_prefix s =
   | 0x50l -> v128_or
   | 0x51l -> v128_xor
   | 0x52l -> v128_bitselect
+  | 0x53l -> f64x2_convert_low_i32x4_s
+  | 0x54l -> f64x2_convert_low_i32x4_u
   | 0x55l -> i32x4_trunc_sat_f64x2_s_zero
   | 0x56l -> i32x4_trunc_sat_f64x2_u_zero
   | 0x57l -> f32x4_demote_f64x2_zero

diff --git a/interpreter/binary/encode.ml b/interpreter/binary/encode.ml
@@ -388,6 +388,8 @@ let encode m =
       | Unary (V128 V128Op.(F32x4 ConvertI32x4U)) -> simd_op 0xfbl
       | Unary (V128 V128Op.(F32x4 DemoteF64x2Zero)) -> simd_op 0x57l
       | Unary (V128 V128Op.(F64x2 PromoteLowF32x4)) -> simd_op 0x69l
+      | Unary (V128 V128Op.(F64x2 ConvertI32x4S)) -> simd_op 0x53l
+      | Unary (V128 V128Op.(F64x2 ConvertI32x4U)) -> simd_op 0x54l
       | Unary (V128 _) -> failwith "unimplemented V128 Unary op"
 
       | Binary (I32 I32Op.Add) -> op 0x6a

diff --git a/interpreter/exec/eval_simd.ml b/interpreter/exec/eval_simd.ml
@@ -59,6 +59,8 @@ module SimdOp (SXX : Simd.S) (Value : ValueType with type t = SXX.t) = struct
       | F64x2 Trunc -> to_value (SXX.F64x2.trunc (of_value 1 v))
       | F64x2 Nearest -> to_value (SXX.F64x2.nearest (of_value 1 v))
       | F64x2 PromoteLowF32x4 -> to_value (SXX.F64x2_convert.promote_low_f32x4 (of_value 1 v))
+      | F64x2 ConvertI32x4S -> to_value (SXX.F64x2_convert.convert_i32x4_s (of_value 1 v))
+      | F64x2 ConvertI32x4U -> to_value (SXX.F64x2_convert.convert_i32x4_u (of_value 1 v))
       | V128 Not -> to_value (SXX.V128.lognot (of_value 1 v))
       | _ -> assert false
 

diff --git a/interpreter/exec/simd.ml b/interpreter/exec/simd.ml
@@ -217,6 +217,8 @@ sig
 
   module F64x2_convert : sig
     val promote_low_f32x4 : t -> t
+    val convert_i32x4_s : t -> t
+    val convert_i32x4_u : t -> t
   end
 end
 
@@ -509,6 +511,9 @@ struct
   end
 
   module F64x2_convert = struct
+    let convert f v = Rep.of_f64x2 (List.map f (Lib.List.take 2 (Rep.to_i32x4 v)))
+    let convert_i32x4_s = convert F64_convert.convert_i32_s
+    let convert_i32x4_u = convert F64_convert.convert_i32_u
     let promote_low_f32x4 v =
       Rep.(of_f64x2 (List.map F64_convert.promote_f32 (Lib.List.take 2 (to_f32x4 v))))
   end

diff --git a/interpreter/syntax/operators.ml b/interpreter/syntax/operators.ml
@@ -478,3 +478,5 @@ let f64x2_abs = Unary (V128 V128Op.(F64x2 Abs))
 let f64x2_pmin = Binary (V128 V128Op.(F64x2 Pmin))
 let f64x2_pmax = Binary (V128 V128Op.(F64x2 Pmax))
 let f64x2_promote_low_f32x4 = Unary (V128 V128Op.(F64x2 PromoteLowF32x4))
+let f64x2_convert_low_i32x4_s = Unary (V128 V128Op.(F64x2 ConvertI32x4S))
+let f64x2_convert_low_i32x4_u = Unary (V128 V128Op.(F64x2 ConvertI32x4U))
diff --git a/interpreter/text/arrange.ml b/interpreter/text/arrange.ml
@@ -244,6 +244,8 @@ struct
     | F64x2 Neg -> "f64x2.neg"
     | F64x2 Sqrt -> "f64x2.sqrt"
     | F64x2 PromoteLowF32x4  -> "f64x2.promote_low_f32x4"
+    | F64x2 ConvertI32x4S -> "f64x2.convert_low_i32x4_s"
+    | F64x2 ConvertI32x4U -> "f64x2.convert_low_i32x4_u"
     | V128 Not -> "v128.not"
     | _ -> failwith "Unimplemented v128 unop"
 

diff --git a/interpreter/text/lexer.mll b/interpreter/text/lexer.mll
@@ -560,6 +560,8 @@ rule token = parse
     { UNARY f32x4_demote_f64x2_zero }
   | "f32x4.convert_i32x4_"(sign as s)
   { UNARY (ext s f32x4_convert_i32x4_s f32x4_convert_i32x4_u) }
+  | "f64x2.convert_low_i32x4_"(sign as s)
+  { UNARY (ext s f64x2_convert_low_i32x4_s f64x2_convert_low_i32x4_u) }
   | "i8x16.narrow_i16x8_"(sign as s)
   { BINARY (ext s i8x16_narrow_i16x8_s i8x16_narrow_i16x8_u) }
   | "i16x8.narrow_i32x4_"(sign as s)

diff --git a/test/core/simd/simd_conversions.wast b/test/core/simd/simd_conversions.wast
@@ -7,6 +7,11 @@
   (func (export "f32x4.convert_i32x4_u") (param v128) (result v128)
     (f32x4.convert_i32x4_u (local.get 0)))
 
+  (func (export "f64x2.convert_low_i32x4_s") (param v128) (result v128)
+    (f64x2.convert_low_i32x4_s (local.get 0)))
+  (func (export "f64x2.convert_low_i32x4_u") (param v128) (result v128)
+    (f64x2.convert_low_i32x4_u (local.get 0)))
+
   ;; Integer to integer narrowing
   (func (export "i8x16.narrow_i16x8_s") (param v128 v128) (result v128)
     (i8x16.narrow_i16x8_s (local.get 0) (local.get 1)))
@@ -242,6 +247,36 @@
 (assert_return (invoke "f32x4.convert_i32x4_u" (v128.const i32x4 0 -1 0x7fffffff 0x80000000))
                                                (v128.const f32x4 0.0 4294967295.0 2147483647.0 2147483648.0))
 
+;; f64x2.convert_i32x4_s
+;; constants copied from test/core/conversions.wast.
+
+(assert_return (invoke "f64x2.convert_low_i32x4_s" (v128.const i32x4 1 1 0 0))
+                                                   (v128.const f64x2 1.0 1.0))
+(assert_return (invoke "f64x2.convert_low_i32x4_s" (v128.const i32x4 -1 -1 0 0))
+                                                   (v128.const f64x2 -1.0 -1.0))
+(assert_return (invoke "f64x2.convert_low_i32x4_s" (v128.const i32x4 0 0 0 0))
+                                                   (v128.const f64x2 0.0 0.0))
+(assert_return (invoke "f64x2.convert_low_i32x4_s" (v128.const i32x4 2147483647 2147483647 0 0))
+                                                   (v128.const f64x2 2147483647 2147483647))
+(assert_return (invoke "f64x2.convert_low_i32x4_s" (v128.const i32x4 -2147483648 -2147483648 0 0))
+                                                   (v128.const f64x2 -2147483648 -2147483648))
+(assert_return (invoke "f64x2.convert_low_i32x4_s" (v128.const i32x4 987654321 987654321 0 0))
+                                                   (v128.const f64x2 987654321 987654321))
+
+;; f64x2.convert_i32x4_u
+;; constants copied from test/core/conversions.wast.
+
+(assert_return (invoke "f64x2.convert_low_i32x4_u" (v128.const i32x4 1 1 0 0))
+                                                   (v128.const f64x2 1.0 1.0))
+(assert_return (invoke "f64x2.convert_low_i32x4_u" (v128.const i32x4 0 0 0 0))
+                                                   (v128.const f64x2 0.0 0.0))
+(assert_return (invoke "f64x2.convert_low_i32x4_u" (v128.const i32x4 2147483647 2147483647 0 0))
+                                                   (v128.const f64x2 2147483647 2147483647))
+(assert_return (invoke "f64x2.convert_low_i32x4_u" (v128.const i32x4 -2147483648 -2147483648 0 0))
+                                                   (v128.const f64x2 2147483648 2147483648))
+(assert_return (invoke "f64x2.convert_low_i32x4_u" (v128.const i32x4 0xffffffff 0xffffffff 0 0))
+                                                   (v128.const f64x2 4294967295.0 4294967295.0))
+
 ;; Integer to integer narrowing
 ;; i8x16.narrow_i16x8_s