Add i32x4.dot_i16x8_s

tlively · tlively · commit 6cbfc8c05ed3 · 2019-11-04T12:34:48.000-08:00
This experimental instruction is specified in WebAssembly/simd#127 and is being implemented to enable further investigation of its performance impact.
diff --git a/build-js.sh b/build-js.sh
@@ -526,6 +526,7 @@ export_function "_BinaryenMinSVecI32x4"
 export_function "_BinaryenMinUVecI32x4"
 export_function "_BinaryenMaxSVecI32x4"
 export_function "_BinaryenMaxUVecI32x4"
+export_function "_BinaryenDotSVecI16x8ToVecI32x4"
 export_function "_BinaryenNegVecI64x2"
 export_function "_BinaryenAnyTrueVecI64x2"
 export_function "_BinaryenAllTrueVecI64x2"
diff --git a/scripts/gen-s-parser.py b/scripts/gen-s-parser.py
@@ -405,6 +405,7 @@
     ("i32x4.min_u",          "makeBinary(s, BinaryOp::MinUVecI32x4)"),
     ("i32x4.max_s",          "makeBinary(s, BinaryOp::MaxSVecI32x4)"),
     ("i32x4.max_u",          "makeBinary(s, BinaryOp::MaxUVecI32x4)"),
+    ("i32x4.dot_i16x8_s",    "makeBinary(s, BinaryOp::DotSVecI16x8ToVecI32x4)"),
     ("i64x2.neg",            "makeUnary(s, UnaryOp::NegVecI64x2)"),
     ("i64x2.any_true",       "makeUnary(s, UnaryOp::AnyTrueVecI64x2)"),
     ("i64x2.all_true",       "makeUnary(s, UnaryOp::AllTrueVecI64x2)"),
diff --git a/src/binaryen-c.cpp b/src/binaryen-c.cpp
@@ -842,6 +842,9 @@ BinaryenOp BinaryenMinSVecI32x4(void) { return MinSVecI32x4; }
 BinaryenOp BinaryenMinUVecI32x4(void) { return MinUVecI32x4; }
 BinaryenOp BinaryenMaxSVecI32x4(void) { return MaxSVecI32x4; }
 BinaryenOp BinaryenMaxUVecI32x4(void) { return MaxUVecI32x4; }
+BinaryenOp BinaryenDotSVecI16x8ToVecI32x4(void) {
+  return DotSVecI16x8ToVecI32x4;
+}
 BinaryenOp BinaryenNegVecI64x2(void) { return NegVecI64x2; }
 BinaryenOp BinaryenAnyTrueVecI64x2(void) { return AnyTrueVecI64x2; }
 BinaryenOp BinaryenAllTrueVecI64x2(void) { return AllTrueVecI64x2; }
diff --git a/src/binaryen-c.h b/src/binaryen-c.h
@@ -504,6 +504,7 @@ BINARYEN_API BinaryenOp BinaryenMinSVecI32x4(void);
 BINARYEN_API BinaryenOp BinaryenMinUVecI32x4(void);
 BINARYEN_API BinaryenOp BinaryenMaxSVecI32x4(void);
 BINARYEN_API BinaryenOp BinaryenMaxUVecI32x4(void);
+BINARYEN_API BinaryenOp BinaryenDotSVecI16x8ToVecI32x4(void);
 BINARYEN_API BinaryenOp BinaryenNegVecI64x2(void);
 BINARYEN_API BinaryenOp BinaryenAnyTrueVecI64x2(void);
 BINARYEN_API BinaryenOp BinaryenAllTrueVecI64x2(void);
diff --git a/src/gen-s-parser.inc b/src/gen-s-parser.inc
@@ -1409,6 +1409,9 @@ switch (op[0]) {
                   default: goto parse_error;
                 }
               }
+              case 'd':
+                if (strcmp(op, "i32x4.dot_i16x8_s") == 0) { return makeBinary(s, BinaryOp::DotSVecI16x8ToVecI32x4); }
+                goto parse_error;
               case 'e': {
                 switch (op[7]) {
                   case 'q':
diff --git a/src/ir/cost.h b/src/ir/cost.h
@@ -648,6 +648,9 @@ struct CostAnalyzer : public Visitor<CostAnalyzer, Index> {
       case MaxUVecI32x4:
         ret = 1;
         break;
+      case DotSVecI16x8ToVecI32x4:
+        ret = 1;
+        break;
       case AddVecI64x2:
         ret = 1;
         break;
diff --git a/src/js/binaryen.js-post.js b/src/js/binaryen.js-post.js
@@ -357,6 +357,7 @@ Module['MinSVecI16x8'] = Module['_BinaryenMinSVecI16x8']();
 Module['MinUVecI16x8'] = Module['_BinaryenMinUVecI16x8']();
 Module['MaxSVecI16x8'] = Module['_BinaryenMaxSVecI16x8']();
 Module['MaxUVecI16x8'] = Module['_BinaryenMaxUVecI16x8']();
+Module['DotSVecI16x8ToVecI32x4'] = Module['_BinaryenDotSVecI16x8ToVecI32x4']();
 Module['NegVecI32x4'] = Module['_BinaryenNegVecI32x4']();
 Module['AnyTrueVecI32x4'] = Module['_BinaryenAnyTrueVecI32x4']();
 Module['AllTrueVecI32x4'] = Module['_BinaryenAllTrueVecI32x4']();
@@ -1676,6 +1677,9 @@ function wrapModule(module, self) {
     'max_u': function(left, right) {
       return Module['_BinaryenBinary'](module, Module['MaxUVecI32x4'], left, right);
     },
+    'dot_i16x8_s': function(left, right) {
+      return Module['_BinaryenBinary'](module, Module['DotSVecI16x8ToVecI32x4'], left, right);
+    },
     'trunc_sat_f32x4_s': function(value) {
       return Module['_BinaryenUnary'](module, Module['TruncSatSVecF32x4ToVecI32x4'], value);
     },
diff --git a/src/literal.h b/src/literal.h
@@ -364,6 +364,7 @@ class Literal {
   Literal minUI32x4(const Literal& other) const;
   Literal maxSI32x4(const Literal& other) const;
   Literal maxUI32x4(const Literal& other) const;
+  Literal dotSI16x8toI32x4(const Literal& other) const;
   Literal negI64x2() const;
   Literal anyTrueI64x2() const;
   Literal allTrueI64x2() const;
diff --git a/src/passes/Print.cpp b/src/passes/Print.cpp
@@ -1222,6 +1222,9 @@ struct PrintExpressionContents
       case MaxUVecI32x4:
         o << "i32x4.max_u";
         break;
+      case DotSVecI16x8ToVecI32x4:
+        o << "i32x4.dot_i16x8_s";
+        break;
       case AddVecI64x2:
         o << "i64x2.add";
         break;
diff --git a/src/tools/fuzzing.h b/src/tools/fuzzing.h
@@ -2169,6 +2169,7 @@ class TranslateToFuzzReader {
                                  MinUVecI32x4,
                                  MaxSVecI32x4,
                                  MaxUVecI32x4,
+                                 DotSVecI16x8ToVecI32x4,
                                  AddVecI64x2,
                                  SubVecI64x2,
                                  AddVecF32x4,
diff --git a/src/wasm-binary.h b/src/wasm-binary.h
@@ -831,6 +831,7 @@ enum ASTNodes {
   I32x4MinU = 0x81,
   I32x4MaxS = 0x82,
   I32x4MaxU = 0x83,
+  I32x4DotSVecI16x8 = 0xd9,
   I64x2Neg = 0x84,
   I64x2AnyTrue = 0x85,
   I64x2AllTrue = 0x86,
diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h
@@ -801,6 +801,8 @@ class ExpressionRunner : public OverriddenVisitor<SubType, Flow> {
         return left.maxSI32x4(right);
       case MaxUVecI32x4:
         return left.maxUI32x4(right);
+      case DotSVecI16x8ToVecI32x4:
+        return left.dotSI16x8toI32x4(right);
       case AddVecI64x2:
         return left.addI64x2(right);
       case SubVecI64x2:
diff --git a/src/wasm.h b/src/wasm.h
@@ -383,6 +383,7 @@ enum BinaryOp {
   MinUVecI32x4,
   MaxSVecI32x4,
   MaxUVecI32x4,
+  DotSVecI16x8ToVecI32x4,
   AddVecI64x2,
   SubVecI64x2,
   AddVecF32x4,
diff --git a/src/wasm/literal.cpp b/src/wasm/literal.cpp
@@ -1829,6 +1829,17 @@ Literal Literal::maxF64x2(const Literal& other) const {
   return binary<2, &Literal::getLanesF64x2, &Literal::max>(*this, other);
 }
 
+Literal Literal::dotSI16x8toI32x4(const Literal& other) const {
+  LaneArray<8> lhs = getLanesSI16x8();
+  LaneArray<8> rhs = other.getLanesSI16x8();
+  LaneArray<4> result;
+  for (size_t i = 0; i < 4; ++i) {
+    result[i] = Literal(lhs[i * 2].geti32() * rhs[i * 2].geti32() +
+                        lhs[i * 2 + 1].geti32() * rhs[i * 2 + 1].geti32());
+  }
+  return Literal(result);
+}
+
 Literal Literal::bitselectV128(const Literal& left,
                                const Literal& right) const {
   return andV128(left).orV128(notV128().andV128(right));
diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp
@@ -3939,6 +3939,10 @@ bool WasmBinaryBuilder::maybeVisitSIMDBinary(Expression*& out, uint32_t code) {
       curr = allocator.alloc<Binary>();
       curr->op = MaxUVecI32x4;
       break;
+    case BinaryConsts::I32x4DotSVecI16x8:
+      curr = allocator.alloc<Binary>();
+      curr->op = DotSVecI16x8ToVecI32x4;
+      break;
     case BinaryConsts::I64x2Add:
       curr = allocator.alloc<Binary>();
       curr->op = AddVecI64x2;
diff --git a/src/wasm/wasm-stack.cpp b/src/wasm/wasm-stack.cpp
@@ -1459,6 +1459,10 @@ void BinaryInstWriter::visitBinary(Binary* curr) {
     case MaxUVecI32x4:
       o << int8_t(BinaryConsts::SIMDPrefix) << U32LEB(BinaryConsts::I32x4MaxU);
       break;
+    case DotSVecI16x8ToVecI32x4:
+      o << int8_t(BinaryConsts::SIMDPrefix)
+        << U32LEB(BinaryConsts::I32x4DotSVecI16x8);
+      break;
     case AddVecI64x2:
       o << int8_t(BinaryConsts::SIMDPrefix) << U32LEB(BinaryConsts::I64x2Add);
       break;
diff --git a/src/wasm/wasm-validator.cpp b/src/wasm/wasm-validator.cpp
@@ -1361,6 +1361,7 @@ void FunctionValidator::visitBinary(Binary* curr) {
     case MinUVecI32x4:
     case MaxSVecI32x4:
     case MaxUVecI32x4:
+    case DotSVecI16x8ToVecI32x4:
     case AddVecI64x2:
     case SubVecI64x2:
     case AddVecF32x4:
diff --git a/test/binaryen.js/kitchen-sink.js b/test/binaryen.js/kitchen-sink.js
@@ -347,6 +347,7 @@ function test_core() {
     module.i32x4.min_u(module.v128.const(v128_bytes), module.v128.const(v128_bytes)),
     module.i32x4.max_s(module.v128.const(v128_bytes), module.v128.const(v128_bytes)),
     module.i32x4.max_u(module.v128.const(v128_bytes), module.v128.const(v128_bytes)),
+    module.i32x4.dot_i16x8_s(module.v128.const(v128_bytes), module.v128.const(v128_bytes)),
     module.i64x2.add(module.v128.const(v128_bytes), module.v128.const(v128_bytes)),
     module.i64x2.sub(module.v128.const(v128_bytes), module.v128.const(v128_bytes)),
     module.f32x4.add(module.v128.const(v128_bytes), module.v128.const(v128_bytes)),
diff --git a/test/binaryen.js/kitchen-sink.js.txt b/test/binaryen.js/kitchen-sink.js.txt
diff --git a/test/example/c-api-kitchen-sink.c b/test/example/c-api-kitchen-sink.c
diff --git a/test/example/c-api-kitchen-sink.txt b/test/example/c-api-kitchen-sink.txt
diff --git a/test/example/c-api-kitchen-sink.txt.txt b/test/example/c-api-kitchen-sink.txt.txt
diff --git a/test/simd.wast b/test/simd.wast
diff --git a/test/simd.wast.from-wast b/test/simd.wast.from-wast
diff --git a/test/simd.wast.fromBinary b/test/simd.wast.fromBinary
diff --git a/test/simd.wast.fromBinary.noDebugInfo b/test/simd.wast.fromBinary.noDebugInfo
diff --git a/test/spec/simd.wast b/test/spec/simd.wast

Original file line number	Diff line number	Diff line change
`@@ -1409,6 +1409,9 @@ switch (op[0]) {`
`1409`	`1409`	`default: goto parse_error;`
`1410`	`1410`	`}`
`1411`	`1411`	`}`
	`1412`	`+ case 'd':`
	`1413`	`+ if (strcmp(op, "i32x4.dot_i16x8_s") == 0) { return makeBinary(s, BinaryOp::DotSVecI16x8ToVecI32x4); }`
	`1414`	`+ goto parse_error;`
`1412`	`1415`	`case 'e': {`
`1413`	`1416`	`switch (op[7]) {`
`1414`	`1417`	`case 'q':`