[wasm] Implement I32x4ReplaceLane, I32x4Add, I32x4Sub.

test/cctest/wasm/test-run-wasm-simd.cc

Index: test/cctest/wasm/test-run-wasm-simd.cc
diff --git a/test/cctest/wasm/test-run-wasm-simd.cc b/test/cctest/wasm/test-run-wasm-simd.cc
index 76eac5e793e77c43a1f1041619813576828f4868..406fb9eb6082db6d4323f9e49e1c0e6dbb00e093 100644
--- a/test/cctest/wasm/test-run-wasm-simd.cc
+++ b/test/cctest/wasm/test-run-wasm-simd.cc
@@ -13,7 +13,27 @@ using namespace v8::internal;
 using namespace v8::internal::compiler;
 using namespace v8::internal::wasm;
 
-WASM_EXEC_TEST(Splat) {
+// TODO(gdeepti): These are tests using sample values to verify functional
+// correctness of opcodes, add more tests for a range of values and macroize
+// tests.
+
+#define WASM_SIMD_CHECK_LANE(TYPE, value, LANE_TYPE, lane_value, lane_index) \
+  WASM_IF(WASM_##LANE_TYPE##_NE(WASM_GET_LOCAL(lane_value),                  \
+                                WASM_SIMD_##TYPE##_EXTRACT_LANE(             \
+                                    lane_index, WASM_GET_LOCAL(value))),     \
+          WASM_RETURN1(WASM_ZERO))
+
+#define WASM_SIMD_CHECK4(TYPE, value, LANE_TYPE, lv0, lv1, lv2, lv3) \
+  WASM_SIMD_CHECK_LANE(TYPE, value, LANE_TYPE, lv0, 0)               \
+  , WASM_SIMD_CHECK_LANE(TYPE, value, LANE_TYPE, lv1, 1),            \
+      WASM_SIMD_CHECK_LANE(TYPE, value, LANE_TYPE, lv2, 2),          \
+      WASM_SIMD_CHECK_LANE(TYPE, value, LANE_TYPE, lv3, 3),          \
+      WASM_RETURN1(WASM_ONE)

[bbudge, 2016/11/22 18:06:42]

This is my fault, but if we return 1 here, then we can't have multiple checks in
a function. So move this out and add it at the end of the test functions. I
discovered this while examining the code. All but the first check are removed by
the compiler as dead code. At least we know that works!

[gdeepti, 2016/11/22 22:30:33]

Sorry I did not catch this, fixed now to return in test functions instead of
here. 

+
+#define WASM_SIMD_CHECK_SPLAT4(TYPE, value, LANE_TYPE, lv) \
+  WASM_SIMD_CHECK4(TYPE, value, LANE_TYPE, lv, lv, lv, lv)
+
+WASM_EXEC_TEST(I32x4Splat) {
   FLAG_wasm_simd_prototype = true;
 
   // Store SIMD value in a local variable, use extract lane to check lane values
@@ -27,23 +47,88 @@ WASM_EXEC_TEST(Splat) {
   //
   // return 1
   WasmRunner<int32_t> r(kExecuteCompiled, MachineType::Int32());
-  r.AllocateLocal(kAstS128);
+  byte lane_val = 0;
+  byte simd = r.AllocateLocal(kAstS128);
+  BUILD(r, WASM_BLOCK(WASM_SET_LOCAL(simd, WASM_SIMD_I32x4_SPLAT(
+                                               WASM_GET_LOCAL(lane_val))),
+                      WASM_SIMD_CHECK_SPLAT4(I32x4, simd, I32, lane_val)));
+
+  FOR_INT32_INPUTS(i) { CHECK_EQ(1, r.Call(*i)); }
+}
+
+WASM_EXEC_TEST(I32x4ReplaceLane) {
+  FLAG_wasm_simd_prototype = true;
+  WasmRunner<int32_t> r(kExecuteCompiled, MachineType::Int32(),
+                        MachineType::Int32());
+  byte old_val = 0;
+  byte new_val = 1;
+  byte simd = r.AllocateLocal(kAstS128);
+  BUILD(r, WASM_BLOCK(
+               WASM_SET_LOCAL(simd,
+                              WASM_SIMD_I32x4_SPLAT(WASM_GET_LOCAL(old_val))),
+               WASM_SET_LOCAL(
+                   simd, WASM_SIMD_I32x4_REPLACE_LANE(0, WASM_GET_LOCAL(simd),
+                                                      WASM_GET_LOCAL(new_val))),
+               WASM_SIMD_CHECK4(I32x4, simd, I32, new_val, old_val, old_val,
+                                old_val),
+               WASM_SET_LOCAL(
+                   simd, WASM_SIMD_I32x4_REPLACE_LANE(1, WASM_GET_LOCAL(simd),
+                                                      WASM_GET_LOCAL(new_val))),
+               WASM_SIMD_CHECK4(I32x4, simd, I32, new_val, new_val, old_val,
+                                old_val),
+               WASM_SET_LOCAL(
+                   simd, WASM_SIMD_I32x4_REPLACE_LANE(2, WASM_GET_LOCAL(simd),
+                                                      WASM_GET_LOCAL(new_val))),
+               WASM_SIMD_CHECK4(I32x4, simd, I32, new_val, new_val, new_val,
+                                old_val),
+               WASM_SET_LOCAL(
+                   simd, WASM_SIMD_I32x4_REPLACE_LANE(3, WASM_GET_LOCAL(simd),
+                                                      WASM_GET_LOCAL(new_val))),
+               WASM_SIMD_CHECK_SPLAT4(I32x4, simd, I32, new_val)));
+
+  CHECK_EQ(1, r.Call(1, 2));
+}
+
+WASM_EXEC_TEST(I32x4Add) {
+  FLAG_wasm_simd_prototype = true;
+  WasmRunner<int32_t> r(kExecuteCompiled, MachineType::Int32(),
+                        MachineType::Int32(), MachineType::Int32());
+  byte a = 0;
+  byte b = 1;
+  byte expected = 2;
+  byte simd0 = r.AllocateLocal(kAstS128);
+  byte simd1 = r.AllocateLocal(kAstS128);
   BUILD(r,
         WASM_BLOCK(
-            WASM_SET_LOCAL(1, WASM_SIMD_I32x4_SPLAT(WASM_GET_LOCAL(0))),
-            WASM_IF(WASM_I32_NE(WASM_GET_LOCAL(0), WASM_SIMD_I32x4_EXTRACT_LANE(
-                                                       0, WASM_GET_LOCAL(1))),
-                    WASM_RETURN1(WASM_ZERO)),
-            WASM_IF(WASM_I32_NE(WASM_GET_LOCAL(0), WASM_SIMD_I32x4_EXTRACT_LANE(
-                                                       1, WASM_GET_LOCAL(1))),
-                    WASM_RETURN1(WASM_ZERO)),
-            WASM_IF(WASM_I32_NE(WASM_GET_LOCAL(0), WASM_SIMD_I32x4_EXTRACT_LANE(
-                                                       2, WASM_GET_LOCAL(1))),
-                    WASM_RETURN1(WASM_ZERO)),
-            WASM_IF(WASM_I32_NE(WASM_GET_LOCAL(0), WASM_SIMD_I32x4_EXTRACT_LANE(
-                                                       3, WASM_GET_LOCAL(1))),
-                    WASM_RETURN1(WASM_ZERO)),
-            WASM_RETURN1(WASM_ONE)));
+            WASM_SET_LOCAL(simd0, WASM_SIMD_I32x4_SPLAT(WASM_GET_LOCAL(a))),
+            WASM_SET_LOCAL(simd1, WASM_SIMD_I32x4_SPLAT(WASM_GET_LOCAL(b))),
+            WASM_SET_LOCAL(simd1, WASM_SIMD_I32x4_ADD(WASM_GET_LOCAL(simd0),
+                                                      WASM_GET_LOCAL(simd1))),
+            WASM_SIMD_CHECK_SPLAT4(I32x4, simd1, I32, expected)));
 
-  FOR_INT32_INPUTS(i) { CHECK_EQ(1, r.Call(*i)); }
+  FOR_INT32_INPUTS(i) {
+    FOR_INT32_INPUTS(j) { CHECK_EQ(1, r.Call(*i, *j, *i + *j)); }
+  }
+}
+
+WASM_EXEC_TEST(I32x4Sub) {
+  FLAG_wasm_simd_prototype = true;
+  WasmRunner<int32_t> r(kExecuteCompiled, MachineType::Int32(),
+                        MachineType::Int32(), MachineType::Int32());
+  byte a = 0;
+  byte b = 1;
+  byte expected = 2;
+  byte simd0 = r.AllocateLocal(kAstS128);
+  byte simd1 = r.AllocateLocal(kAstS128);
+  BUILD(r,
+        WASM_BLOCK(
+            WASM_SET_LOCAL(simd0, WASM_SIMD_I32x4_SPLAT(WASM_GET_LOCAL(a))),
+            WASM_SET_LOCAL(simd1, WASM_SIMD_I32x4_SPLAT(WASM_GET_LOCAL(b))),
+            WASM_SET_LOCAL(simd1, WASM_SIMD_I32x4_SUB(WASM_GET_LOCAL(simd0),
+                                                      WASM_GET_LOCAL(simd1))),
+            WASM_SIMD_CHECK_SPLAT4(I32x4, simd1, I32, expected)));
+
+  FOR_INT32_INPUTS(i) {
+    FOR_INT32_INPUTS(j) { CHECK_EQ(1, r.Call(*i, *j, *i - *j)); }
+  }
 }