v8x16.swizzle (#2368)

tlively · web-flow · commit 3c7826903207 · 2019-10-03T18:07:02.000-07:00
As specified at https://github.com/WebAssembly/simd/blob/master/proposals/simd/SIMD.md#swizzling-using-variable-indices.
diff --git a/build-js.sh b/build-js.sh
@@ -574,6 +574,7 @@ export_function "_BinaryenWidenLowSVecI16x8ToVecI32x4"
 export_function "_BinaryenWidenHighSVecI16x8ToVecI32x4"
 export_function "_BinaryenWidenLowUVecI16x8ToVecI32x4"
 export_function "_BinaryenWidenHighUVecI16x8ToVecI32x4"
+export_function "_BinaryenSwizzleVec8x16"
 
 # Expression creation
 export_function "_BinaryenBlock"
diff --git a/scripts/gen-s-parser.py b/scripts/gen-s-parser.py
@@ -452,6 +452,7 @@
     ("i32x4.widen_high_i16x8_s", "makeUnary(s, UnaryOp::WidenHighSVecI16x8ToVecI32x4)"),
     ("i32x4.widen_low_i16x8_u",  "makeUnary(s, UnaryOp::WidenLowUVecI16x8ToVecI32x4)"),
     ("i32x4.widen_high_i16x8_u", "makeUnary(s, UnaryOp::WidenHighUVecI16x8ToVecI32x4)"),
+    ("v8x16.swizzle",            "makeBinary(s, BinaryOp::SwizzleVec8x16)"),
     # exception handling instructions
     ("try",                  "makeTry(s)"),
     ("throw",                "makeThrow(s)"),
diff --git a/src/binaryen-c.cpp b/src/binaryen-c.cpp
@@ -942,6 +942,7 @@ BinaryenOp BinaryenWidenLowUVecI16x8ToVecI32x4(void) {
 BinaryenOp BinaryenWidenHighUVecI16x8ToVecI32x4(void) {
   return WidenHighUVecI16x8ToVecI32x4;
 }
+BinaryenOp BinaryenSwizzleVec8x16(void) { return SwizzleVec8x16; }
 
 BinaryenExpressionRef BinaryenBlock(BinaryenModuleRef module,
                                     const char* name,
diff --git a/src/binaryen-c.h b/src/binaryen-c.h
@@ -546,6 +546,7 @@ BINARYEN_API BinaryenOp BinaryenWidenLowSVecI16x8ToVecI32x4(void);
 BINARYEN_API BinaryenOp BinaryenWidenHighSVecI16x8ToVecI32x4(void);
 BINARYEN_API BinaryenOp BinaryenWidenLowUVecI16x8ToVecI32x4(void);
 BINARYEN_API BinaryenOp BinaryenWidenHighUVecI16x8ToVecI32x4(void);
+BINARYEN_API BinaryenOp BinaryenSwizzleVec8x16(void);
 
 typedef void* BinaryenExpressionRef;
 
diff --git a/src/gen-s-parser.inc b/src/gen-s-parser.inc
@@ -2509,9 +2509,17 @@ switch (op[0]) {
           case 'l':
             if (strcmp(op, "v8x16.load_splat") == 0) { return makeSIMDLoad(s, SIMDLoadOp::LoadSplatVec8x16); }
             goto parse_error;
-          case 's':
-            if (strcmp(op, "v8x16.shuffle") == 0) { return makeSIMDShuffle(s); }
-            goto parse_error;
+          case 's': {
+            switch (op[7]) {
+              case 'h':
+                if (strcmp(op, "v8x16.shuffle") == 0) { return makeSIMDShuffle(s); }
+                goto parse_error;
+              case 'w':
+                if (strcmp(op, "v8x16.swizzle") == 0) { return makeBinary(s, BinaryOp::SwizzleVec8x16); }
+                goto parse_error;
+              default: goto parse_error;
+            }
+          }
           default: goto parse_error;
         }
       }
diff --git a/src/ir/cost.h b/src/ir/cost.h
@@ -666,6 +666,9 @@ struct CostAnalyzer : public Visitor<CostAnalyzer, Index> {
       case NarrowUVecI32x4ToVecI16x8:
         ret = 1;
         break;
+      case SwizzleVec8x16:
+        ret = 1;
+        break;
       case InvalidBinary:
         WASM_UNREACHABLE();
     }
diff --git a/src/js/binaryen.js-post.js b/src/js/binaryen.js-post.js
@@ -418,6 +418,7 @@ Module['WidenLowSVecI16x8ToVecI32x4'] = Module['_BinaryenWidenLowSVecI16x8ToVecI
 Module['WidenHighSVecI16x8ToVecI32x4'] = Module['_BinaryenWidenHighSVecI16x8ToVecI32x4']();
 Module['WidenLowUVecI16x8ToVecI32x4'] = Module['_BinaryenWidenLowUVecI16x8ToVecI32x4']();
 Module['WidenHighUVecI16x8ToVecI32x4'] = Module['_BinaryenWidenHighUVecI16x8ToVecI32x4']();
+Module['SwizzleVec8x16'] = Module['_BinaryenSwizzleVec8x16']();
 
 // The size of a single literal in memory as used in Const creation,
 // which is a little different: we don't want users to need to make
@@ -1845,6 +1846,9 @@ function wrapModule(module, self) {
         return Module['_BinaryenSIMDShuffle'](module, left, right, i8sToStack(mask));
       });
     },
+    'swizzle': function(left, right) {
+      return Module['_BinaryenBinary'](module, Module['SwizzleVec8x16'], left, right);
+    },
     'load_splat': function(offset, align, ptr) {
       return Module['_BinaryenSIMDLoad'](module, Module['LoadSplatVec8x16'], offset, align, ptr);
     },
diff --git a/src/literal.h b/src/literal.h
@@ -398,6 +398,7 @@ class Literal {
   Literal widenHighSToVecI32x4() const;
   Literal widenLowUToVecI32x4() const;
   Literal widenHighUToVecI32x4() const;
+  Literal swizzleVec8x16(const Literal& other) const;
 
 private:
   Literal addSatSI8(const Literal& other) const;
diff --git a/src/passes/Print.cpp b/src/passes/Print.cpp
@@ -1243,6 +1243,10 @@ struct PrintExpressionContents
         o << "i16x8.narrow_i32x4_u";
         break;
 
+      case SwizzleVec8x16:
+        o << "v8x16.swizzle";
+        break;
+
       case InvalidBinary:
         WASM_UNREACHABLE();
     }
diff --git a/src/tools/fuzzing.h b/src/tools/fuzzing.h
@@ -2174,7 +2174,8 @@ class TranslateToFuzzReader {
                                  NarrowSVecI16x8ToVecI8x16,
                                  NarrowUVecI16x8ToVecI8x16,
                                  NarrowSVecI32x4ToVecI16x8,
-                                 NarrowUVecI32x4ToVecI16x8),
+                                 NarrowUVecI32x4ToVecI16x8,
+                                 SwizzleVec8x16),
                             make(v128),
                             make(v128)});
       }
diff --git a/src/wasm-binary.h b/src/wasm-binary.h
@@ -879,6 +879,7 @@ enum ASTNodes {
   I32x4LoadExtUVec16x4 = 0xd5,
   I64x2LoadExtSVec32x2 = 0xd6,
   I64x2LoadExtUVec32x2 = 0xd7,
+  V8x16Swizzle = 0xc0,
 
   // bulk memory opcodes
 
diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h
@@ -816,6 +816,9 @@ class ExpressionRunner : public OverriddenVisitor<SubType, Flow> {
       case NarrowUVecI32x4ToVecI16x8:
         return left.narrowUToVecI16x8(right);
 
+      case SwizzleVec8x16:
+        return left.swizzleVec8x16(right);
+
       case InvalidBinary:
         WASM_UNREACHABLE();
     }
diff --git a/src/wasm.h b/src/wasm.h
@@ -392,6 +392,9 @@ enum BinaryOp {
   NarrowSVecI32x4ToVecI16x8,
   NarrowUVecI32x4ToVecI16x8,
 
+  // SIMD Swizzle
+  SwizzleVec8x16,
+
   InvalidBinary
 };
 
diff --git a/src/wasm/literal.cpp b/src/wasm/literal.cpp
@@ -1867,4 +1867,15 @@ Literal Literal::widenHighUToVecI32x4() const {
   return widen<4, &Literal::getLanesUI16x8, LaneOrder::High>(*this);
 }
 
+Literal Literal::swizzleVec8x16(const Literal& other) const {
+  auto lanes = getLanesUI8x16();
+  auto indices = other.getLanesUI8x16();
+  LaneArray<16> result;
+  for (size_t i = 0; i < 16; ++i) {
+    size_t index = indices[i].geti32();
+    result[i] = index >= 16 ? Literal(int32_t(0)) : lanes[index];
+  }
+  return Literal(result);
+}
+
 } // namespace wasm
diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp
@@ -3963,6 +3963,10 @@ bool WasmBinaryBuilder::maybeVisitSIMDBinary(Expression*& out, uint32_t code) {
       curr = allocator.alloc<Binary>();
       curr->op = NarrowUVecI32x4ToVecI16x8;
       break;
+    case BinaryConsts::V8x16Swizzle:
+      curr = allocator.alloc<Binary>();
+      curr->op = SwizzleVec8x16;
+      break;
     default:
       return false;
   }
diff --git a/src/wasm/wasm-stack.cpp b/src/wasm/wasm-stack.cpp
@@ -1484,6 +1484,11 @@ void BinaryInstWriter::visitBinary(Binary* curr) {
         << U32LEB(BinaryConsts::I16x8NarrowUI32x4);
       break;
 
+    case SwizzleVec8x16:
+      o << int8_t(BinaryConsts::SIMDPrefix)
+        << U32LEB(BinaryConsts::V8x16Swizzle);
+      break;
+
     case InvalidBinary:
       WASM_UNREACHABLE();
   }
diff --git a/src/wasm/wasm-validator.cpp b/src/wasm/wasm-validator.cpp
@@ -1366,7 +1366,8 @@ void FunctionValidator::visitBinary(Binary* curr) {
     case NarrowSVecI16x8ToVecI8x16:
     case NarrowUVecI16x8ToVecI8x16:
     case NarrowSVecI32x4ToVecI16x8:
-    case NarrowUVecI32x4ToVecI16x8: {
+    case NarrowUVecI32x4ToVecI16x8:
+    case SwizzleVec8x16: {
       shouldBeEqualOrFirstIsUnreachable(
         curr->left->type, v128, curr, "v128 op");
       shouldBeEqualOrFirstIsUnreachable(
diff --git a/test/binaryen.js/kitchen-sink.js b/test/binaryen.js/kitchen-sink.js
@@ -353,6 +353,7 @@ function test_core() {
     module.i8x16.narrow_i16x8_u(module.v128.const(v128_bytes), module.v128.const(v128_bytes)),
     module.i16x8.narrow_i32x4_s(module.v128.const(v128_bytes), module.v128.const(v128_bytes)),
     module.i16x8.narrow_i32x4_u(module.v128.const(v128_bytes), module.v128.const(v128_bytes)),
+    module.v8x16.swizzle(module.v128.const(v128_bytes), module.v128.const(v128_bytes)),
     // SIMD lane manipulation
     module.i8x16.extract_lane_s(module.v128.const(v128_bytes), 1),
     module.i8x16.extract_lane_u(module.v128.const(v128_bytes), 1),
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
`@@ -942,6 +942,7 @@ BinaryenOp BinaryenWidenLowUVecI16x8ToVecI32x4(void) {`
`942`	`942`	`BinaryenOp BinaryenWidenHighUVecI16x8ToVecI32x4(void) {`
`943`	`943`	`return WidenHighUVecI16x8ToVecI32x4;`
`944`	`944`	`}`
	`945`	`+BinaryenOp BinaryenSwizzleVec8x16(void) { return SwizzleVec8x16; }`
`945`	`946`
`946`	`947`	`BinaryenExpressionRef BinaryenBlock(BinaryenModuleRef module,`
`947`	`948`	`const char* name,`