[WASM] Implement remaining F32x4 operations for ARM.

src/compiler/wasm-compiler.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/compiler/wasm-compiler.h"
 
 #include <memory>
 
 #include "src/assembler-inl.h"
 #include "src/base/platform/elapsed-timer.h"
@@ skipping 3366 matching lines @@
                               inputs[0]);
     case wasm::kExprF32x4UConvertI32x4:
       return graph()->NewNode(jsgraph()->machine()->Float32x4FromUint32x4(),
                               inputs[0]);
     case wasm::kExprF32x4Abs:
       return graph()->NewNode(jsgraph()->machine()->Float32x4Abs(), inputs[0]);
     case wasm::kExprF32x4Neg:
       return graph()->NewNode(jsgraph()->machine()->Float32x4Neg(), inputs[0]);
     case wasm::kExprF32x4Sqrt:
       return graph()->NewNode(jsgraph()->machine()->Float32x4Sqrt(), inputs[0]);
+    case wasm::kExprF32x4RecipApprox:
+      return graph()->NewNode(jsgraph()->machine()->Float32x4RecipApprox(),
+                              inputs[0]);
+    case wasm::kExprF32x4RecipSqrtApprox:
+      return graph()->NewNode(jsgraph()->machine()->Float32x4RecipSqrtApprox(),
+                              inputs[0]);
     case wasm::kExprF32x4Add:
       return graph()->NewNode(jsgraph()->machine()->Float32x4Add(), inputs[0],
                               inputs[1]);
     case wasm::kExprF32x4Sub:
       return graph()->NewNode(jsgraph()->machine()->Float32x4Sub(), inputs[0],
                               inputs[1]);
     case wasm::kExprF32x4Mul:
       return graph()->NewNode(jsgraph()->machine()->Float32x4Mul(), inputs[0],
                               inputs[1]);
     case wasm::kExprF32x4Div:
       return graph()->NewNode(jsgraph()->machine()->Float32x4Div(), inputs[0],
                               inputs[1]);
     case wasm::kExprF32x4Min:
       return graph()->NewNode(jsgraph()->machine()->Float32x4Min(), inputs[0],
                               inputs[1]);
     case wasm::kExprF32x4Max:
       return graph()->NewNode(jsgraph()->machine()->Float32x4Max(), inputs[0],
                               inputs[1]);
+    case wasm::kExprF32x4RecipRefine:
+      return graph()->NewNode(jsgraph()->machine()->Float32x4RecipRefine(),
+                              inputs[0], inputs[1]);
+    case wasm::kExprF32x4RecipSqrtRefine:
+      return graph()->NewNode(jsgraph()->machine()->Float32x4RecipSqrtRefine(),
+                              inputs[0], inputs[1]);
     case wasm::kExprF32x4Eq:
       return graph()->NewNode(jsgraph()->machine()->Float32x4Equal(), inputs[0],
                               inputs[1]);
     case wasm::kExprF32x4Ne:
       return graph()->NewNode(jsgraph()->machine()->Float32x4NotEqual(),
                               inputs[0], inputs[1]);
-    // TODO(aseemgarg): Get rid of GreaterThan and GreaterThanEquals machine ops
-    // for all SIMD types.
-    case wasm::kExprF32x4Gt:
-      return graph()->NewNode(jsgraph()->machine()->Float32x4GreaterThan(),
-                              inputs[0], inputs[1]);
-    case wasm::kExprF32x4Ge:
-      return graph()->NewNode(
-          jsgraph()->machine()->Float32x4GreaterThanOrEqual(), inputs[0],
-          inputs[1]);
     case wasm::kExprF32x4Lt:
       return graph()->NewNode(jsgraph()->machine()->Float32x4LessThan(),
                               inputs[0], inputs[1]);
     case wasm::kExprF32x4Le:
       return graph()->NewNode(jsgraph()->machine()->Float32x4LessThanOrEqual(),
                               inputs[0], inputs[1]);
+    case wasm::kExprF32x4Gt:
+      return graph()->NewNode(jsgraph()->machine()->Float32x4LessThan(),
+                              inputs[1], inputs[0]);
+    case wasm::kExprF32x4Ge:
+      return graph()->NewNode(jsgraph()->machine()->Float32x4LessThanOrEqual(),
+                              inputs[1], inputs[0]);
     case wasm::kExprI32x4Splat:
       return graph()->NewNode(jsgraph()->machine()->Int32x4Splat(), inputs[0]);
     case wasm::kExprI32x4SConvertF32x4:
       return graph()->NewNode(jsgraph()->machine()->Int32x4FromFloat32x4(),
                               inputs[0]);
     case wasm::kExprI32x4UConvertF32x4:
       return graph()->NewNode(jsgraph()->machine()->Uint32x4FromFloat32x4(),
                               inputs[0]);
     case wasm::kExprI32x4Neg:
       return graph()->NewNode(jsgraph()->machine()->Int32x4Neg(), inputs[0]);
@@ skipping 12 matching lines @@
     case wasm::kExprI32x4MaxS:
       return graph()->NewNode(jsgraph()->machine()->Int32x4Max(), inputs[0],
                               inputs[1]);
     case wasm::kExprI32x4Eq:
       return graph()->NewNode(jsgraph()->machine()->Int32x4Equal(), inputs[0],
                               inputs[1]);
     case wasm::kExprI32x4Ne:
       return graph()->NewNode(jsgraph()->machine()->Int32x4NotEqual(),
                               inputs[0], inputs[1]);
     case wasm::kExprI32x4LtS:
-      return graph()->NewNode(jsgraph()->machine()->Int32x4GreaterThan(),
+      return graph()->NewNode(jsgraph()->machine()->Int32x4LessThan(),
+                              inputs[0], inputs[1]);
+    case wasm::kExprI32x4LeS:
+      return graph()->NewNode(jsgraph()->machine()->Int32x4LessThanOrEqual(),
+                              inputs[0], inputs[1]);
+    case wasm::kExprI32x4GtS:
+      return graph()->NewNode(jsgraph()->machine()->Int32x4LessThan(),
                               inputs[1], inputs[0]);
-    case wasm::kExprI32x4LeS:
-      return graph()->NewNode(jsgraph()->machine()->Int32x4GreaterThanOrEqual(),
+    case wasm::kExprI32x4GeS:
+      return graph()->NewNode(jsgraph()->machine()->Int32x4LessThanOrEqual(),
                               inputs[1], inputs[0]);
-    case wasm::kExprI32x4GtS:
-      return graph()->NewNode(jsgraph()->machine()->Int32x4GreaterThan(),
-                              inputs[0], inputs[1]);
-    case wasm::kExprI32x4GeS:
-      return graph()->NewNode(jsgraph()->machine()->Int32x4GreaterThanOrEqual(),
-                              inputs[0], inputs[1]);
     case wasm::kExprI32x4MinU:
       return graph()->NewNode(jsgraph()->machine()->Uint32x4Min(), inputs[0],
                               inputs[1]);
     case wasm::kExprI32x4MaxU:
       return graph()->NewNode(jsgraph()->machine()->Uint32x4Max(), inputs[0],
                               inputs[1]);
     case wasm::kExprI32x4LtU:
-      return graph()->NewNode(jsgraph()->machine()->Uint32x4GreaterThan(),
+      return graph()->NewNode(jsgraph()->machine()->Uint32x4LessThan(),
+                              inputs[0], inputs[1]);
+    case wasm::kExprI32x4LeU:
+      return graph()->NewNode(jsgraph()->machine()->Uint32x4LessThanOrEqual(),
+                              inputs[0], inputs[1]);
+    case wasm::kExprI32x4GtU:
+      return graph()->NewNode(jsgraph()->machine()->Uint32x4LessThan(),
                               inputs[1], inputs[0]);
-    case wasm::kExprI32x4LeU:
-      return graph()->NewNode(
-          jsgraph()->machine()->Uint32x4GreaterThanOrEqual(), inputs[1],
-          inputs[0]);
-    case wasm::kExprI32x4GtU:
-      return graph()->NewNode(jsgraph()->machine()->Uint32x4GreaterThan(),
-                              inputs[0], inputs[1]);
     case wasm::kExprI32x4GeU:
-      return graph()->NewNode(
-          jsgraph()->machine()->Uint32x4GreaterThanOrEqual(), inputs[0],
-          inputs[1]);
+      return graph()->NewNode(jsgraph()->machine()->Uint32x4LessThanOrEqual(),
+                              inputs[1], inputs[0]);
     case wasm::kExprI16x8Splat:
       return graph()->NewNode(jsgraph()->machine()->Int16x8Splat(), inputs[0]);
     case wasm::kExprI16x8Neg:
       return graph()->NewNode(jsgraph()->machine()->Int16x8Neg(), inputs[0]);
     case wasm::kExprI16x8Add:
       return graph()->NewNode(jsgraph()->machine()->Int16x8Add(), inputs[0],
                               inputs[1]);
     case wasm::kExprI16x8AddSaturateS:
       return graph()->NewNode(jsgraph()->machine()->Int16x8AddSaturate(),
                               inputs[0], inputs[1]);
@@ skipping 12 matching lines @@
     case wasm::kExprI16x8MaxS:
       return graph()->NewNode(jsgraph()->machine()->Int16x8Max(), inputs[0],
                               inputs[1]);
     case wasm::kExprI16x8Eq:
       return graph()->NewNode(jsgraph()->machine()->Int16x8Equal(), inputs[0],
                               inputs[1]);
     case wasm::kExprI16x8Ne:
       return graph()->NewNode(jsgraph()->machine()->Int16x8NotEqual(),
                               inputs[0], inputs[1]);
     case wasm::kExprI16x8LtS:
-      return graph()->NewNode(jsgraph()->machine()->Int16x8GreaterThan(),
+      return graph()->NewNode(jsgraph()->machine()->Int16x8LessThan(),
+                              inputs[0], inputs[1]);
+    case wasm::kExprI16x8LeS:
+      return graph()->NewNode(jsgraph()->machine()->Int16x8LessThanOrEqual(),
+                              inputs[0], inputs[1]);
+    case wasm::kExprI16x8GtS:
+      return graph()->NewNode(jsgraph()->machine()->Int16x8LessThan(),
                               inputs[1], inputs[0]);
-    case wasm::kExprI16x8LeS:
-      return graph()->NewNode(jsgraph()->machine()->Int16x8GreaterThanOrEqual(),
+    case wasm::kExprI16x8GeS:
+      return graph()->NewNode(jsgraph()->machine()->Int16x8LessThanOrEqual(),
                               inputs[1], inputs[0]);
-    case wasm::kExprI16x8GtS:
-      return graph()->NewNode(jsgraph()->machine()->Int16x8GreaterThan(),
-                              inputs[0], inputs[1]);
-    case wasm::kExprI16x8GeS:
-      return graph()->NewNode(jsgraph()->machine()->Int16x8GreaterThanOrEqual(),
-                              inputs[0], inputs[1]);
     case wasm::kExprI16x8AddSaturateU:
       return graph()->NewNode(jsgraph()->machine()->Uint16x8AddSaturate(),
                               inputs[0], inputs[1]);
     case wasm::kExprI16x8SubSaturateU:
       return graph()->NewNode(jsgraph()->machine()->Uint16x8SubSaturate(),
                               inputs[0], inputs[1]);
     case wasm::kExprI16x8MinU:
       return graph()->NewNode(jsgraph()->machine()->Uint16x8Min(), inputs[0],
                               inputs[1]);
     case wasm::kExprI16x8MaxU:
       return graph()->NewNode(jsgraph()->machine()->Uint16x8Max(), inputs[0],
                               inputs[1]);
     case wasm::kExprI16x8LtU:
-      return graph()->NewNode(jsgraph()->machine()->Uint16x8GreaterThan(),
+      return graph()->NewNode(jsgraph()->machine()->Uint16x8LessThan(),
+                              inputs[0], inputs[1]);
+    case wasm::kExprI16x8LeU:
+      return graph()->NewNode(jsgraph()->machine()->Uint16x8LessThanOrEqual(),
+                              inputs[0], inputs[1]);
+    case wasm::kExprI16x8GtU:
+      return graph()->NewNode(jsgraph()->machine()->Uint16x8LessThan(),
                               inputs[1], inputs[0]);
-    case wasm::kExprI16x8LeU:
-      return graph()->NewNode(
-          jsgraph()->machine()->Uint16x8GreaterThanOrEqual(), inputs[1],
-          inputs[0]);
-    case wasm::kExprI16x8GtU:
-      return graph()->NewNode(jsgraph()->machine()->Uint16x8GreaterThan(),
-                              inputs[0], inputs[1]);
     case wasm::kExprI16x8GeU:
-      return graph()->NewNode(
-          jsgraph()->machine()->Uint16x8GreaterThanOrEqual(), inputs[0],
-          inputs[1]);
+      return graph()->NewNode(jsgraph()->machine()->Uint16x8LessThanOrEqual(),
+                              inputs[1], inputs[0]);
     case wasm::kExprI8x16Splat:
       return graph()->NewNode(jsgraph()->machine()->Int8x16Splat(), inputs[0]);
     case wasm::kExprI8x16Neg:
       return graph()->NewNode(jsgraph()->machine()->Int8x16Neg(), inputs[0]);
     case wasm::kExprI8x16Add:
       return graph()->NewNode(jsgraph()->machine()->Int8x16Add(), inputs[0],
                               inputs[1]);
     case wasm::kExprI8x16AddSaturateS:
       return graph()->NewNode(jsgraph()->machine()->Int8x16AddSaturate(),
                               inputs[0], inputs[1]);
@@ skipping 12 matching lines @@
     case wasm::kExprI8x16MaxS:
       return graph()->NewNode(jsgraph()->machine()->Int8x16Max(), inputs[0],
                               inputs[1]);
     case wasm::kExprI8x16Eq:
       return graph()->NewNode(jsgraph()->machine()->Int8x16Equal(), inputs[0],
                               inputs[1]);
     case wasm::kExprI8x16Ne:
       return graph()->NewNode(jsgraph()->machine()->Int8x16NotEqual(),
                               inputs[0], inputs[1]);
     case wasm::kExprI8x16LtS:
-      return graph()->NewNode(jsgraph()->machine()->Int8x16GreaterThan(),
+      return graph()->NewNode(jsgraph()->machine()->Int8x16LessThan(),
+                              inputs[0], inputs[1]);
+    case wasm::kExprI8x16LeS:
+      return graph()->NewNode(jsgraph()->machine()->Int8x16LessThanOrEqual(),
+                              inputs[0], inputs[1]);
+    case wasm::kExprI8x16GtS:
+      return graph()->NewNode(jsgraph()->machine()->Int8x16LessThan(),
                               inputs[1], inputs[0]);
-    case wasm::kExprI8x16LeS:
-      return graph()->NewNode(jsgraph()->machine()->Int8x16GreaterThanOrEqual(),
+    case wasm::kExprI8x16GeS:
+      return graph()->NewNode(jsgraph()->machine()->Int8x16LessThanOrEqual(),
                               inputs[1], inputs[0]);
-    case wasm::kExprI8x16GtS:
-      return graph()->NewNode(jsgraph()->machine()->Int8x16GreaterThan(),
-                              inputs[0], inputs[1]);
-    case wasm::kExprI8x16GeS:
-      return graph()->NewNode(jsgraph()->machine()->Int8x16GreaterThanOrEqual(),
-                              inputs[0], inputs[1]);
     case wasm::kExprI8x16AddSaturateU:
       return graph()->NewNode(jsgraph()->machine()->Uint8x16AddSaturate(),
                               inputs[0], inputs[1]);
     case wasm::kExprI8x16SubSaturateU:
       return graph()->NewNode(jsgraph()->machine()->Uint8x16SubSaturate(),
                               inputs[0], inputs[1]);
     case wasm::kExprI8x16MinU:
       return graph()->NewNode(jsgraph()->machine()->Uint8x16Min(), inputs[0],
                               inputs[1]);
     case wasm::kExprI8x16MaxU:
       return graph()->NewNode(jsgraph()->machine()->Uint8x16Max(), inputs[0],
                               inputs[1]);
     case wasm::kExprI8x16LtU:
-      return graph()->NewNode(jsgraph()->machine()->Uint8x16GreaterThan(),
+      return graph()->NewNode(jsgraph()->machine()->Uint8x16LessThan(),
+                              inputs[0], inputs[1]);
+    case wasm::kExprI8x16LeU:
+      return graph()->NewNode(jsgraph()->machine()->Uint8x16LessThanOrEqual(),
+                              inputs[0], inputs[1]);
+    case wasm::kExprI8x16GtU:
+      return graph()->NewNode(jsgraph()->machine()->Uint8x16LessThan(),
                               inputs[1], inputs[0]);
-    case wasm::kExprI8x16LeU:
-      return graph()->NewNode(
-          jsgraph()->machine()->Uint8x16GreaterThanOrEqual(), inputs[1],
-          inputs[0]);
-    case wasm::kExprI8x16GtU:
-      return graph()->NewNode(jsgraph()->machine()->Uint8x16GreaterThan(),
-                              inputs[0], inputs[1]);
     case wasm::kExprI8x16GeU:

[Mircea Trofin, 2017/03/07 22:09:30]

Do you think we could do some preprocessor magic with these opcodes?

[bbudge, 2017/03/07 23:35:20]

Yes, very likely, though it would require a "Great Renaming." It's probably
better that we do this sooner rather than later, as we're likely to be adding
opcodes.

The general idea would be that the wasm opcodes are the canonical names, and we
would change internal opcodes and machine ops to match. I'll take an action-item
to do this soon.

-      return graph()->NewNode(
-          jsgraph()->machine()->Uint8x16GreaterThanOrEqual(), inputs[0],
-          inputs[1]);
+      return graph()->NewNode(jsgraph()->machine()->Uint8x16LessThanOrEqual(),
+                              inputs[1], inputs[0]);
     case wasm::kExprS128And:
       return graph()->NewNode(jsgraph()->machine()->Simd128And(), inputs[0],
                               inputs[1]);
     case wasm::kExprS128Or:
       return graph()->NewNode(jsgraph()->machine()->Simd128Or(), inputs[0],
                               inputs[1]);
     case wasm::kExprS128Xor:
       return graph()->NewNode(jsgraph()->machine()->Simd128Xor(), inputs[0],
                               inputs[1]);
     case wasm::kExprS128Not:
@@ skipping 600 matching lines @@
     wasm::ErrorThrower* thrower, Isolate* isolate,
     wasm::ModuleBytesEnv* module_env, const wasm::WasmFunction* function) {
   WasmCompilationUnit unit(isolate, module_env, function);
   unit.ExecuteCompilation();
   return unit.FinishCompilation(thrower);
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8