Inline remaining Float32x4 operations.

runtime/vm/flow_graph_optimizer.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/flow_graph_optimizer.h"
 
 #include "vm/bit_vector.h"
 #include "vm/cha.h"
 #include "vm/flow_graph_builder.h"
 #include "vm/flow_graph_compiler.h"
@@ skipping 1720 matching lines @@
       case MethodRecognizer::kByteArrayBaseSetFloat32x4:
         return BuildByteArrayViewStore(
             call, class_ids[0], kTypedDataFloat32x4ArrayCid);
       default:
         // Unsupported method.
         return false;
     }
   }
 
   if ((class_ids[0] == kFloat32x4Cid) && (ic_data.NumberOfChecks() == 1)) {
-    switch (recognized_kind) {
-      case MethodRecognizer::kFloat32x4Equal:
-      case MethodRecognizer::kFloat32x4GreaterThan:
-      case MethodRecognizer::kFloat32x4GreaterThanOrEqual:
-      case MethodRecognizer::kFloat32x4LessThan:
-      case MethodRecognizer::kFloat32x4LessThanOrEqual:
-      case MethodRecognizer::kFloat32x4NotEqual: {
-        Definition* left = call->ArgumentAt(0);
-        Definition* right = call->ArgumentAt(1);
-        // Type check left.
-        AddCheckClass(left,
-                      ICData::ZoneHandle(
-                          call->ic_data()->AsUnaryClassChecksForArgNr(0)),
-                      call->deopt_id(),
-                      call->env(),
-                      call);
-        // Replace call.
-        Float32x4ComparisonInstr* cmp =
-            new Float32x4ComparisonInstr(recognized_kind, new Value(left),
-                                         new Value(right), call);
-        ReplaceCall(call, cmp);
-        return true;
-      }
-      case MethodRecognizer::kFloat32x4Min:
-      case MethodRecognizer::kFloat32x4Max: {
-        Definition* left = call->ArgumentAt(0);
-        Definition* right = call->ArgumentAt(1);
-        // Type check left.
-        AddCheckClass(left,
-                      ICData::ZoneHandle(
-                          call->ic_data()->AsUnaryClassChecksForArgNr(0)),
-                      call->deopt_id(),
-                      call->env(),
-                      call);
-        Float32x4MinMaxInstr* minmax =
-            new Float32x4MinMaxInstr(recognized_kind, new Value(left),
-                                     new Value(right), call);
-        ReplaceCall(call, minmax);
-        return true;
-      }
-      case MethodRecognizer::kFloat32x4Scale: {
-        Definition* left = call->ArgumentAt(0);
-        Definition* right = call->ArgumentAt(1);
-        // Type check left.
-        AddCheckClass(left,
-                      ICData::ZoneHandle(
-                          call->ic_data()->AsUnaryClassChecksForArgNr(0)),
-                      call->deopt_id(),
-                      call->env(),
-                      call);
-        // Left and right values are swapped when handed to the instruction,
-        // this is done so that the double value is loaded into the output
-        // register and can be destroyed.
-        Float32x4ScaleInstr* scale =
-            new Float32x4ScaleInstr(recognized_kind, new Value(right),
-                                    new Value(left), call);
-        ReplaceCall(call, scale);
-        return true;
-      }
-      case MethodRecognizer::kFloat32x4Sqrt:
-      case MethodRecognizer::kFloat32x4ReciprocalSqrt:
-      case MethodRecognizer::kFloat32x4Reciprocal: {
-        Definition* left = call->ArgumentAt(0);
-        AddCheckClass(left,
-              ICData::ZoneHandle(
-                  call->ic_data()->AsUnaryClassChecksForArgNr(0)),
-              call->deopt_id(),
-              call->env(),
-              call);
-        Float32x4SqrtInstr* sqrt =
-            new Float32x4SqrtInstr(recognized_kind, new Value(left), call);
-        ReplaceCall(call, sqrt);
-        return true;
-      }
-      default:
-        return false;
-    }
+    return TryInlineFloat32x4Method(call, recognized_kind);
   }
   return false;
 }
 
 
+bool FlowGraphOptimizer::TryInlineFloat32x4Method(
+    InstanceCallInstr* call,

[srdjan, 2013/05/01 20:02:24]

can call be const &?

[Cutch, 2013/05/01 20:11:18]

Not simply. ReplaceCall takes a non-const pointer to the call.

[srdjan, 2013/05/01 20:18:41]

I see.

+    MethodRecognizer::Kind recognized_kind) {
+  ASSERT(call->HasICData());
+  switch (recognized_kind) {
+    case MethodRecognizer::kFloat32x4Equal:
+    case MethodRecognizer::kFloat32x4GreaterThan:
+    case MethodRecognizer::kFloat32x4GreaterThanOrEqual:
+    case MethodRecognizer::kFloat32x4LessThan:
+    case MethodRecognizer::kFloat32x4LessThanOrEqual:
+    case MethodRecognizer::kFloat32x4NotEqual: {
+      Definition* left = call->ArgumentAt(0);
+      Definition* right = call->ArgumentAt(1);
+      // Type check left.
+      AddCheckClass(left,
+                    ICData::ZoneHandle(
+                        call->ic_data()->AsUnaryClassChecksForArgNr(0)),
+                    call->deopt_id(),
+                    call->env(),
+                    call);
+      // Replace call.
+      Float32x4ComparisonInstr* cmp =
+          new Float32x4ComparisonInstr(recognized_kind, new Value(left),
+                                       new Value(right), call);
+      ReplaceCall(call, cmp);
+      return true;
+    }
+    case MethodRecognizer::kFloat32x4Min:
+    case MethodRecognizer::kFloat32x4Max: {
+      Definition* left = call->ArgumentAt(0);
+      Definition* right = call->ArgumentAt(1);
+      // Type check left.
+      AddCheckClass(left,
+                    ICData::ZoneHandle(
+                        call->ic_data()->AsUnaryClassChecksForArgNr(0)),
+                    call->deopt_id(),
+                    call->env(),
+                    call);
+      Float32x4MinMaxInstr* minmax =
+          new Float32x4MinMaxInstr(recognized_kind, new Value(left),
+                                   new Value(right), call);
+      ReplaceCall(call, minmax);
+      return true;
+    }
+    case MethodRecognizer::kFloat32x4Scale: {
+      Definition* left = call->ArgumentAt(0);
+      Definition* right = call->ArgumentAt(1);
+      // Type check left.
+      AddCheckClass(left,
+                    ICData::ZoneHandle(
+                        call->ic_data()->AsUnaryClassChecksForArgNr(0)),
+                    call->deopt_id(),
+                    call->env(),
+                    call);
+      // Left and right values are swapped when handed to the instruction,
+      // this is done so that the double value is loaded into the output
+      // register and can be destroyed.
+      Float32x4ScaleInstr* scale =
+          new Float32x4ScaleInstr(recognized_kind, new Value(right),
+                                  new Value(left), call);
+      ReplaceCall(call, scale);
+      return true;
+    }
+    case MethodRecognizer::kFloat32x4Sqrt:
+    case MethodRecognizer::kFloat32x4ReciprocalSqrt:
+    case MethodRecognizer::kFloat32x4Reciprocal: {
+      Definition* left = call->ArgumentAt(0);
+      AddCheckClass(left,
+                    ICData::ZoneHandle(
+                        call->ic_data()->AsUnaryClassChecksForArgNr(0)),
+                    call->deopt_id(),
+                    call->env(),
+                    call);
+      Float32x4SqrtInstr* sqrt =
+          new Float32x4SqrtInstr(recognized_kind, new Value(left), call);
+      ReplaceCall(call, sqrt);
+      return true;
+    }
+    case MethodRecognizer::kFloat32x4WithX:
+    case MethodRecognizer::kFloat32x4WithY:
+    case MethodRecognizer::kFloat32x4WithZ:
+    case MethodRecognizer::kFloat32x4WithW: {
+      Definition* left = call->ArgumentAt(0);
+      Definition* right = call->ArgumentAt(1);
+      // Type check left.
+      AddCheckClass(left,
+                    ICData::ZoneHandle(
+                        call->ic_data()->AsUnaryClassChecksForArgNr(0)),
+                    call->deopt_id(),
+                    call->env(),
+                    call);
+      Float32x4WithInstr* with = new Float32x4WithInstr(recognized_kind,
+                                                        new Value(left),
+                                                        new Value(right),
+                                                        call);
+      ReplaceCall(call, with);
+      return true;
+    }
+    case MethodRecognizer::kFloat32x4Absolute:
+    case MethodRecognizer::kFloat32x4Negate: {
+      Definition* left = call->ArgumentAt(0);
+      // Type check left.
+      AddCheckClass(left,
+                    ICData::ZoneHandle(
+                        call->ic_data()->AsUnaryClassChecksForArgNr(0)),
+                    call->deopt_id(),
+                    call->env(),
+                    call);
+      Float32x4ZeroArgInstr* zeroArg =
+          new Float32x4ZeroArgInstr(recognized_kind, new Value(left), call);
+      ReplaceCall(call, zeroArg);
+      return true;
+    }
+    case MethodRecognizer::kFloat32x4Clamp: {
+      Definition* left = call->ArgumentAt(0);
+      Definition* lower = call->ArgumentAt(1);
+      Definition* upper = call->ArgumentAt(2);
+      // Type check left.
+      AddCheckClass(left,
+                    ICData::ZoneHandle(
+                        call->ic_data()->AsUnaryClassChecksForArgNr(0)),
+                    call->deopt_id(),
+                    call->env(),
+                    call);
+      Float32x4ClampInstr* clamp = new Float32x4ClampInstr(new Value(left),
+                                                           new Value(lower),
+                                                           new Value(upper),
+                                                           call);
+      ReplaceCall(call, clamp);
+      return true;
+    }
+    case MethodRecognizer::kFloat32x4ToUint32x4: {
+      Definition* left = call->ArgumentAt(0);
+      // Type check left.
+      AddCheckClass(left,
+                    ICData::ZoneHandle(
+                        call->ic_data()->AsUnaryClassChecksForArgNr(0)),
+                    call->deopt_id(),
+                    call->env(),
+                    call);
+      Float32x4ToUint32x4Instr* cast =
+          new Float32x4ToUint32x4Instr(new Value(left), call);
+      ReplaceCall(call, cast);
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+
+
 bool FlowGraphOptimizer::BuildByteArrayViewLoad(
     InstanceCallInstr* call,
     intptr_t receiver_cid,
     intptr_t view_cid) {
   Definition* array = call->ArgumentAt(0);
   PrepareByteArrayViewOp(call, receiver_cid, view_cid, &array);
 
   // Optimistically build a smi-checked load for Int32 and Uint32
   // loads on ia32 like we do for normal array loads, and only revert to
   // mint case after deoptimizing here.
@@ skipping 3097 matching lines @@
 void ConstantPropagator::VisitFloat32x4Scale(Float32x4ScaleInstr* instr) {
   SetValue(instr, non_constant_);
 }
 
 
 void ConstantPropagator::VisitFloat32x4Sqrt(Float32x4SqrtInstr* instr) {
   SetValue(instr, non_constant_);
 }
 
 
+void ConstantPropagator::VisitFloat32x4ZeroArg(Float32x4ZeroArgInstr* instr) {
+  SetValue(instr, non_constant_);
+}
+
+
+void ConstantPropagator::VisitFloat32x4Clamp(Float32x4ClampInstr* instr) {
+  SetValue(instr, non_constant_);
+}
+
+
+void ConstantPropagator::VisitFloat32x4With(Float32x4WithInstr* instr) {
+  SetValue(instr, non_constant_);
+}
+
+
+void ConstantPropagator::VisitFloat32x4ToUint32x4(
+    Float32x4ToUint32x4Instr* instr) {
+  SetValue(instr, non_constant_);
+}
+
+
 void ConstantPropagator::VisitMathSqrt(MathSqrtInstr* instr) {
   const Object& value = instr->value()->definition()->constant_value();
   if (IsNonConstant(value)) {
     SetValue(instr, non_constant_);
   } else if (IsConstant(value)) {
     // TODO(kmillikin): Handle sqrt.
     SetValue(instr, non_constant_);
   }
 }
 
@@ skipping 626 matching lines @@
   if (changed) {
     // We may have changed the block order and the dominator tree.
     flow_graph->DiscoverBlocks();
     GrowableArray<BitVector*> dominance_frontier;
     flow_graph->ComputeDominators(&dominance_frontier);
   }
 }
 
 
 }  // namespace dart