Adding unary op optimizations. missing assembly operations/

runtime/vm/flow_graph_optimizer.cc

Index: runtime/vm/flow_graph_optimizer.cc
===================================================================
--- runtime/vm/flow_graph_optimizer.cc	(revision 8171)
+++ runtime/vm/flow_graph_optimizer.cc	(working copy)
@@ -34,6 +34,21 @@
 }
 
 
+static bool ICDataHasReceiverClass(const ICData& ic_data, const Class& cls) {
+  ASSERT(!cls.IsNull());
+  ASSERT(ic_data.num_args_tested() > 0);
+  Class& test_class = Class::Handle();
+  Function& target = Function::Handle();
+  for (intptr_t i = 0; i < ic_data.NumberOfChecks(); i++) {
+    ic_data.GetOneClassCheckAt(i, &test_class, &target);
+    if (cls.raw() == test_class.raw()) {
+      return true;
+    }
+  }
+  return false;
+}
+
+
 static bool ICDataHasTwoReceiverClasses(const ICData& ic_data,
                                         const Class& cls1,
                                         const Class& cls2) {
@@ -41,9 +56,9 @@
   if (ic_data.num_args_tested() != 2) {
     return false;
   }
+  Function& target = Function::Handle();
   for (intptr_t i = 0; i < ic_data.NumberOfChecks(); i++) {
     GrowableArray<const Class*> classes;
-    Function& target = Function::Handle();
     ic_data.GetCheckAt(i, &classes, &target);
     ASSERT(classes.length() == 2);
     if (classes[0]->raw() == cls1.raw()) {
@@ -56,6 +71,13 @@
 }
 
 
+static bool HasOneSmi(const ICData& ic_data) {
+  const Class& smi_class =
+      Class::Handle(Isolate::Current()->object_store()->smi_class());
+  return ICDataHasReceiverClass(ic_data, smi_class);
+}
+
+
 static bool HasTwoSmi(const ICData& ic_data) {
   const Class& smi_class =
       Class::Handle(Isolate::Current()->object_store()->smi_class());
@@ -63,29 +85,70 @@
 }
 
 
+static bool HasOneDouble(const ICData& ic_data) {
+  const Class& double_class =
+      Class::Handle(Isolate::Current()->object_store()->double_class());
+  return ICDataHasReceiverClass(ic_data, double_class);
+}
+
+
+
+void FlowGraphOptimizer::TryReplaceWithBinaryOp(InstanceCallComp* comp,
+                                                Token::Kind op_kind) {
+  if (comp->ic_data()->NumberOfChecks() != 1) {
+    // TODO(srdjan): Not yet supported.
+    return;
+  }
+  if (!HasTwoSmi(*comp->ic_data())) {
+    // TODO(srdjan): Not yet supported.
+    return;
+  }
+  ASSERT(comp->instr() != NULL);
+  ASSERT(comp->InputCount() == 2);
+  BinaryOpComp* bin_op =
+      new BinaryOpComp(op_kind, comp, comp->InputAt(0), comp->InputAt(1));
+  ASSERT(bin_op->ic_data() == NULL);
+  bin_op->set_ic_data(comp->ic_data());
+  bin_op->set_instr(comp->instr());
+  comp->instr()->replace_computation(bin_op);
+}
+
+
+void FlowGraphOptimizer::TryReplaceWithUnaryOp(InstanceCallComp* comp,
+                                              Token::Kind op_kind) {
+  if (comp->ic_data()->NumberOfChecks() != 1) {
+    // TODO(srdjan): Not yet supported.
+    return;
+  }
+  ASSERT(comp->instr() != NULL);
+  ASSERT(comp->InputCount() == 1);
+  Computation* unary_op = NULL;
+  if (HasOneSmi(*comp->ic_data())) {
+    unary_op = new UnarySmiOpComp(op_kind, comp, comp->InputAt(0));
+  } else if (HasOneDouble(*comp->ic_data()) && (op_kind == Token::kNEGATE)) {
+    unary_op = new NumberNegateComp(comp, comp->InputAt(0));
+  }
+  if (unary_op != NULL) {
+    ASSERT(unary_op->ic_data() == NULL);
+    unary_op->set_ic_data(comp->ic_data());
+    unary_op->set_instr(comp->instr());
+    comp->instr()->replace_computation(unary_op);
+  }
+}
+
+
 void FlowGraphOptimizer::VisitInstanceCall(InstanceCallComp* comp) {
   if ((comp->ic_data() != NULL) && (!comp->ic_data()->IsNull())) {
     Token::Kind op_kind = Token::GetBinaryOp(comp->function_name());
-    if (op_kind == Token::kILLEGAL) {
-      // Not a recognized binary operation.
+    if (op_kind != Token::kILLEGAL) {
+      TryReplaceWithBinaryOp(comp, op_kind);
       return;
     }
-    if (comp->ic_data()->NumberOfChecks() != 1) {
-      // TODO(srdjan): Not yet supported.
+    op_kind = Token::GetUnaryOp(comp->function_name());
+    if (op_kind != Token::kILLEGAL) {
+      TryReplaceWithUnaryOp(comp, op_kind);
       return;
     }
-    if (!HasTwoSmi(*comp->ic_data())) {
-      // TODO(srdjan): Not yet supported.
-      return;
-    }
-    ASSERT(comp->instr() != NULL);
-    ASSERT(comp->InputCount() == 2);
-    BinaryOpComp* bin_op =
-        new BinaryOpComp(op_kind, comp, comp->InputAt(0), comp->InputAt(1));
-    ASSERT(bin_op->ic_data() == NULL);
-    bin_op->set_ic_data(comp->ic_data());
-    bin_op->set_instr(comp->instr());
-    comp->instr()->replace_computation(bin_op);
   }
 }