v128.andnot instruction (#2355)

As specified at WebAssembly/simd#102.

Also fixes bugs in the JS API for other SIMD bitwise operators.

Author: tlively

build-js.sh

@@ -477,6 +477,7 @@ export_function "_BinaryenNotVec128"
 export_function "_BinaryenAndVec128"
 export_function "_BinaryenOrVec128"
 export_function "_BinaryenXorVec128"
+export_function "_BinaryenAndNotVec128"
 export_function "_BinaryenBitselectVec128"
 export_function "_BinaryenNegVecI8x16"
 export_function "_BinaryenAnyTrueVecI8x16"

scripts/gen-s-parser.py

@@ -355,6 +355,7 @@
     ("v128.and",             "makeBinary(s, BinaryOp::AndVec128)"),
     ("v128.or",              "makeBinary(s, BinaryOp::OrVec128)"),
     ("v128.xor",             "makeBinary(s, BinaryOp::XorVec128)"),
+    ("v128.andnot",          "makeBinary(s, BinaryOp::AndNotVec128)"),
     ("v128.bitselect",       "makeSIMDTernary(s, SIMDTernaryOp::Bitselect)"),
     ("i8x16.neg",            "makeUnary(s, UnaryOp::NegVecI8x16)"),
     ("i8x16.any_true",       "makeUnary(s, UnaryOp::AnyTrueVecI8x16)"),

src/binaryen-c.cpp

@@ -793,6 +793,7 @@ BinaryenOp BinaryenNotVec128(void) { return NotVec128; }
 BinaryenOp BinaryenAndVec128(void) { return AndVec128; }
 BinaryenOp BinaryenOrVec128(void) { return OrVec128; }
 BinaryenOp BinaryenXorVec128(void) { return XorVec128; }
+BinaryenOp BinaryenAndNotVec128(void) { return AndNotVec128; }
 BinaryenOp BinaryenBitselectVec128(void) { return Bitselect; }
 BinaryenOp BinaryenNegVecI8x16(void) { return NegVecI8x16; }
 BinaryenOp BinaryenAnyTrueVecI8x16(void) { return AnyTrueVecI8x16; }

src/binaryen-c.h

@@ -449,6 +449,7 @@ BINARYEN_API BinaryenOp BinaryenNotVec128(void);
 BINARYEN_API BinaryenOp BinaryenAndVec128(void);
 BINARYEN_API BinaryenOp BinaryenOrVec128(void);
 BINARYEN_API BinaryenOp BinaryenXorVec128(void);
+BINARYEN_API BinaryenOp BinaryenAndNotVec128(void);
 BINARYEN_API BinaryenOp BinaryenBitselectVec128(void);
 BINARYEN_API BinaryenOp BinaryenNegVecI8x16(void);
 BINARYEN_API BinaryenOp BinaryenAnyTrueVecI8x16(void);

src/gen-s-parser.inc

@@ -2421,9 +2421,17 @@ switch (op[0]) {
         switch (op[2]) {
           case '2': {
             switch (op[5]) {
-              case 'a':
-                if (strcmp(op, "v128.and") == 0) { return makeBinary(s, BinaryOp::AndVec128); }
-                goto parse_error;
+              case 'a': {
+                switch (op[8]) {
+                  case '\0':
+                    if (strcmp(op, "v128.and") == 0) { return makeBinary(s, BinaryOp::AndVec128); }
+                    goto parse_error;
+                  case 'n':
+                    if (strcmp(op, "v128.andnot") == 0) { return makeBinary(s, BinaryOp::AndNotVec128); }
+                    goto parse_error;
+                  default: goto parse_error;
+                }
+              }
               case 'b':
                 if (strcmp(op, "v128.bitselect") == 0) { return makeSIMDTernary(s, SIMDTernaryOp::Bitselect); }
                 goto parse_error;

src/ir/cost.h

@@ -558,6 +558,9 @@ struct CostAnalyzer : public Visitor<CostAnalyzer, Index> {
       case XorVec128:
         ret = 1;
         break;
+      case AndNotVec128:
+        ret = 1;
+        break;
       case AddVecI8x16:
         ret = 1;
         break;

src/js/binaryen.js-post.js

@@ -321,6 +321,7 @@ Module['NotVec128'] = Module['_BinaryenNotVec128']();
 Module['AndVec128'] = Module['_BinaryenAndVec128']();
 Module['OrVec128'] = Module['_BinaryenOrVec128']();
 Module['XorVec128'] = Module['_BinaryenXorVec128']();
+Module['AndNotVec128'] = Module['_BinaryenAndNotVec128']();
 Module['BitselectVec128'] = Module['_BinaryenBitselectVec128']();
 Module['NegVecI8x16'] = Module['_BinaryenNegVecI8x16']();
 Module['AnyTrueVecI8x16'] = Module['_BinaryenAnyTrueVecI8x16']();
@@ -1335,14 +1336,17 @@ function wrapModule(module, self) {
     'not': function(value) {
       return Module['_BinaryenUnary'](module, Module['NotVec128'], value);
     },
-    'and': function(value) {
-      return Module['_BinaryenUnary'](module, Module['AndVec128'], value);
+    'and': function(left, right) {
+      return Module['_BinaryenBinary'](module, Module['AndVec128'], left, right);
+    },
+    'or': function(left, right) {
+      return Module['_BinaryenBinary'](module, Module['OrVec128'], left, right);
     },
-    'or': function(value) {
-      return Module['_BinaryenUnary'](module, Module['OrVec128'], value);
+    'xor': function(left, right) {
+      return Module['_BinaryenBinary'](module, Module['XorVec128'], left, right);
     },
-    'xor': function(value) {
-      return Module['_BinaryenUnary'](module, Module['XorVec128'], value);
+    'andnot': function(left, right) {
+      return Module['_BinaryenBinary'](module, Module['AndNotVec128'], left, right);
     },
     'bitselect': function(left, right, cond) {
       return Module['_BinaryenSIMDTernary'](module, Module['BitselectVec128'], left, right, cond);

src/passes/Print.cpp

@@ -1113,6 +1113,9 @@ struct PrintExpressionContents
       case XorVec128:
         o << "v128.xor";
         break;
+      case AndNotVec128:
+        o << "v128.andnot";
+        break;
 
       case AddVecI8x16:
         o << "i8x16.add";

src/tools/fuzzing.h

@@ -2139,6 +2139,7 @@ class TranslateToFuzzReader {
                                  AndVec128,
                                  OrVec128,
                                  XorVec128,
+                                 AndNotVec128,
                                  AddVecI8x16,
                                  AddSatSVecI8x16,
                                  AddSatUVecI8x16,

src/wasm-binary.h

@@ -782,6 +782,7 @@ enum ASTNodes {
   V128And = 0x4d,
   V128Or = 0x4e,
   V128Xor = 0x4f,
+  V128AndNot = 0xd8,
   V128Bitselect = 0x50,
   I8x16Neg = 0x51,
   I8x16AnyTrue = 0x52,