Removing more IC calls in optimized code.

srdjan@google.com · srdjan@google.com · commit 5f509dc6657e · 2012-06-20T23:19:02.000Z
Review URL: https://chromiumcodereview.appspot.com//10572050 git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@8950 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/runtime/vm/code_generator.h b/runtime/vm/code_generator.h
@@ -61,6 +61,7 @@ DECLARE_RUNTIME_ENTRY(TraceFunctionExit);
   V(DeoptInstanceGetterSameTarget) \
   V(DeoptInstanceGetter) \
   V(DeoptStoreIndexed) \
+  V(DeoptStoreIndexedPolymorphic) \
   V(DeoptPolymorphicInstanceCallSmiOnly) \
   V(DeoptPolymorphicInstanceCallSmiFail) \
   V(DeoptPolymorphicInstanceCallTestFail) \
@@ -80,6 +81,7 @@ DECLARE_RUNTIME_ENTRY(TraceFunctionExit);
   V(DeoptDoubleComparison) \
   V(DeoptLoadIndexedFixedArray) \
   V(DeoptLoadIndexedGrowableArray) \
+  V(DeoptLoadIndexedPolymorphic) \
   V(DeoptNoTypeFeedback) \
   V(DeoptSAR) \
   V(DeoptUnaryOp) \
diff --git a/runtime/vm/flow_graph_compiler.cc b/runtime/vm/flow_graph_compiler.cc
@@ -404,6 +404,37 @@ void FlowGraphCompiler::EmitLoadIndexedGeneric(LoadIndexedComp* comp) {
 }
 
 
+void FlowGraphCompiler::EmitTestAndCall(const ICData& ic_data,
+                                        Register class_id_reg,
+                                        intptr_t arg_count,
+                                        const Array& arg_names,
+                                        Label* deopt,
+                                        Label* done,
+                                        intptr_t cid,
+                                        intptr_t token_index,
+                                        intptr_t try_index) {
+  // TODO(srdjan): better loop please!
+  for (intptr_t i = 0; i < ic_data.NumberOfChecks(); i++) {
+    Label next_test;
+    assembler()->cmpl(class_id_reg, Immediate(ic_data.GetReceiverClassIdAt(i)));
+    assembler()->j(NOT_EQUAL, &next_test);
+    const Function& target = Function::ZoneHandle(ic_data.GetTargetAt(i));
+    GenerateStaticCall(cid,
+                       token_index,
+                       try_index,
+                       target,
+                       arg_count,
+                       arg_names);
+    assembler()->jmp(done);
+    assembler()->Bind(&next_test);
+  }
+  assembler()->jmp(deopt);
+}
+
+
+
+
+
 Register FrameRegisterAllocator::AllocateFreeRegister(bool* blocked_registers) {
   for (intptr_t regno = 0; regno < kNumberOfCpuRegisters; regno++) {
     if (!blocked_registers[regno] && (registers_[regno] == NULL)) {
diff --git a/runtime/vm/flow_graph_compiler_ia32.h b/runtime/vm/flow_graph_compiler_ia32.h
@@ -143,6 +143,15 @@ class FlowGraphCompiler : public ValueObject {
                             Register instance_reg,
                             Register temp_reg,
                             Label* deopt);
+  void EmitTestAndCall(const ICData& ic_data,
+                       Register class_id_reg,
+                       intptr_t arg_count,
+                       const Array& arg_names,
+                       Label* deopt,
+                       Label* done,
+                       intptr_t cid,
+                       intptr_t token_index,
+                       intptr_t try_index);
 
   intptr_t StackSize() const;
 
diff --git a/runtime/vm/flow_graph_compiler_x64.h b/runtime/vm/flow_graph_compiler_x64.h
@@ -134,6 +134,15 @@ class FlowGraphCompiler : public ValueObject {
                             intptr_t argument_count);
 
   void EmitLoadIndexedGeneric(LoadIndexedComp* comp);
+  void EmitTestAndCall(const ICData& ic_data,
+                       Register class_id_reg,
+                       intptr_t arg_count,
+                       const Array& arg_names,
+                       Label* deopt,
+                       Label* done,
+                       intptr_t cid,
+                       intptr_t token_index,
+                       intptr_t try_index);
 
   intptr_t StackSize() const;
 
diff --git a/runtime/vm/flow_graph_optimizer.cc b/runtime/vm/flow_graph_optimizer.cc
@@ -371,13 +371,18 @@ void FlowGraphOptimizer::VisitInstanceCall(InstanceCallComp* comp) {
       return;
     }
     const intptr_t kMaxChecks = 4;
-    if (comp->ic_data()->num_args_tested() <= kMaxChecks) {
+    if (comp->ic_data()->NumberOfChecks() <= kMaxChecks) {
       PolymorphicInstanceCallComp* call = new PolymorphicInstanceCallComp(comp);
       ICData& unary_checks =
-          ICData::Handle(ToUnaryClassChecks(*comp->ic_data()));
+          ICData::ZoneHandle(ToUnaryClassChecks(*comp->ic_data()));
       call->set_ic_data(&unary_checks);
       comp->ReplaceWith(call);
     }
+  } else {
+    // Mark it for deopt.
+    PolymorphicInstanceCallComp* call = new PolymorphicInstanceCallComp(comp);
+    call->set_ic_data(&ICData::ZoneHandle());
+    comp->ReplaceWith(call);
   }
 }
 
@@ -399,7 +404,7 @@ bool FlowGraphOptimizer::TryInlineInstanceSetter(InstanceSetterComp* comp) {
     return false;
   }
   if (!HasOneTarget(ic_data)) {
-    // TODO(srdjan): Implement when not all targets are the sa,e.
+    // TODO(srdjan): Implement when not all targets are the same.
     return false;
   }
   Function& target = Function::Handle();
@@ -426,10 +431,13 @@ bool FlowGraphOptimizer::TryInlineInstanceSetter(InstanceSetterComp* comp) {
 
 
 void FlowGraphOptimizer::VisitInstanceSetter(InstanceSetterComp* comp) {
-  // TODO(srdjan): Add assigneable check node if --enable_type_checks.
+  // TODO(srdjan): Add assignable check node if --enable_type_checks.
   if (comp->HasICData() && !FLAG_enable_type_checks) {
-    TryInlineInstanceSetter(comp);
+    if (TryInlineInstanceSetter(comp)) {
+      return;
+    }
   }
+  // TODO(srdjan): Polymorphic dispatch to setters or deoptimize.
 }
 
 
@@ -542,9 +550,8 @@ void FlowGraphOptimizer::VisitStrictCompareComp(StrictCompareComp* comp) {
 
 
 void FlowGraphOptimizer::VisitEqualityCompare(EqualityCompareComp* comp) {
-  const intptr_t kMaxChecks = 4;
-  if (comp->HasICData() && (comp->ic_data()->num_args_tested() <= kMaxChecks)) {
-    // Replace binary checks with unary ones.
+  if (comp->HasICData()) {
+    // Replace binary checks with unary ones since EmitNative expects it.
     ICData& unary_checks =
         ICData::Handle(ToUnaryClassChecks(*comp->ic_data()));
     comp->set_ic_data(&unary_checks);
diff --git a/runtime/vm/intermediate_language_ia32.cc b/runtime/vm/intermediate_language_ia32.cc
@@ -306,6 +306,7 @@ static void EmitEqualityAsPolymorphicCall(FlowGraphCompiler* compiler,
   ASSERT(comp->HasICData());
   const ICData& ic_data = *comp->ic_data();
   ASSERT(ic_data.NumberOfChecks() > 0);
+  ASSERT(ic_data.num_args_tested() == 1);
   Label* deopt = compiler->AddDeoptStub(comp->cid(),
                                         comp->token_index(),
                                         comp->try_index(),
@@ -637,10 +638,47 @@ LocationSummary* LoadIndexedComp::MakeLocationSummary() const {
 }
 
 
+static void EmitLoadIndexedPolymorphic(FlowGraphCompiler* compiler,
+                                        LoadIndexedComp* comp) {
+  Label* deopt = compiler->AddDeoptStub(comp->cid(),
+                                        comp->token_index(),
+                                        comp->try_index(),
+                                        kDeoptLoadIndexedPolymorphic);
+  if (comp->ic_data()->NumberOfChecks() == 0) {
+    __ jmp(deopt);
+    return;
+  }
+  ASSERT(comp->HasICData());
+  const ICData& ic_data = *comp->ic_data();
+  ASSERT(ic_data.num_args_tested() == 1);
+  // No indexed access on Smi.
+  ASSERT(ic_data.GetReceiverClassIdAt(0) != kSmi);
+  // Load receiver into EAX.
+  const intptr_t kNumArguments = 2;
+  __ movl(EAX, Address(ESP, (kNumArguments - 1) * kWordSize));
+  __ testl(EAX, Immediate(kSmiTagMask));
+  __ j(ZERO, deopt);
+  Label done;
+  __ LoadClassId(EDI, EAX);
+  compiler->EmitTestAndCall(ic_data,
+                            EDI,  // Class id register.
+                            kNumArguments,
+                            Array::Handle(),  // No named arguments.
+                            deopt, &done,  // Labels.
+                            comp->cid(),
+                            comp->token_index(),
+                            comp->try_index());
+  __ Bind(&done);
+}
+
 
 void LoadIndexedComp::EmitNativeCode(FlowGraphCompiler* compiler) {
   if (receiver_type() == kIllegalObjectKind) {
-    compiler->EmitLoadIndexedGeneric(this);
+    if (HasICData()) {
+      EmitLoadIndexedPolymorphic(compiler, this);
+    } else {
+      compiler->EmitLoadIndexedGeneric(this);
+    }
     ASSERT(locs()->out().reg() == EAX);
     return;
   }
@@ -719,7 +757,6 @@ LocationSummary* StoreIndexedComp::MakeLocationSummary() const {
 }
 
 
-
 static void EmitStoreIndexedGeneric(FlowGraphCompiler* compiler,
                                     StoreIndexedComp* comp) {
   const String& function_name =
@@ -737,14 +774,52 @@ static void EmitStoreIndexedGeneric(FlowGraphCompiler* compiler,
                                  comp->try_index(),
                                  function_name,
                                  kNumArguments,
-                                 Array::ZoneHandle(),  // No optional arguments.
+                                 Array::ZoneHandle(),  // No named args.
                                  kNumArgsChecked);
 }
 
 
+static void EmitStoreIndexedPolymorphic(FlowGraphCompiler* compiler,
+                                        StoreIndexedComp* comp) {
+  Label* deopt = compiler->AddDeoptStub(comp->cid(),
+                                        comp->token_index(),
+                                        comp->try_index(),
+                                        kDeoptStoreIndexedPolymorphic);
+  if (comp->ic_data()->NumberOfChecks() == 0) {
+    __ jmp(deopt);
+    return;
+  }
+  ASSERT(comp->HasICData());
+  const ICData& ic_data = *comp->ic_data();
+  ASSERT(ic_data.num_args_tested() == 1);
+  // No indexed access on Smi.
+  ASSERT(ic_data.GetReceiverClassIdAt(0) != kSmi);
+  // Load receiver into EAX.
+  const intptr_t kNumArguments = 3;
+  __ movl(EAX, Address(ESP, (kNumArguments - 1) * kWordSize));
+  __ testl(EAX, Immediate(kSmiTagMask));
+  __ j(ZERO, deopt);
+  Label done;
+  __ LoadClassId(EDI, EAX);
+  compiler->EmitTestAndCall(ic_data,
+                            EDI,  // Class id register.
+                            kNumArguments,
+                            Array::Handle(),  // No named arguments.
+                            deopt, &done,  // Labels.
+                            comp->cid(),
+                            comp->token_index(),
+                            comp->try_index());
+  __ Bind(&done);
+}
+
+
 void StoreIndexedComp::EmitNativeCode(FlowGraphCompiler* compiler) {
   if (receiver_type() == kIllegalObjectKind) {
-    EmitStoreIndexedGeneric(compiler, this);
+    if (HasICData()) {
+      EmitStoreIndexedPolymorphic(compiler, this);
+    } else {
+      EmitStoreIndexedGeneric(compiler, this);
+    }
     return;
   }
 
@@ -1760,12 +1835,16 @@ LocationSummary* PolymorphicInstanceCallComp::MakeLocationSummary() const {
 
 void PolymorphicInstanceCallComp::EmitNativeCode(FlowGraphCompiler* compiler) {
   ASSERT(instance_call()->VerifyComputation());
-  ASSERT(HasICData());
-  ASSERT(ic_data()->num_args_tested() == 1);
   Label* deopt = compiler->AddDeoptStub(instance_call()->cid(),
                                         instance_call()->token_index(),
                                         instance_call()->try_index(),
                                         kDeoptPolymorphicInstanceCallTestFail);
+  if (!HasICData() || (ic_data()->NumberOfChecks() == 0)) {
+    __ jmp(deopt);
+    return;
+  }
+  ASSERT(HasICData());
+  ASSERT(ic_data()->num_args_tested() == 1);
   Label handle_smi;
   Label* is_smi_label =
       ic_data()->GetReceiverClassIdAt(0) == kSmi ?  &handle_smi : deopt;
@@ -1777,21 +1856,14 @@ void PolymorphicInstanceCallComp::EmitNativeCode(FlowGraphCompiler* compiler) {
   __ j(ZERO, is_smi_label);
   Label done;
   __ LoadClassId(EDI, EAX);
-  for (intptr_t i = 0; i < ic_data()->NumberOfChecks(); i++) {
-    Label next_test;
-    __ cmpl(EDI, Immediate(ic_data()->GetReceiverClassIdAt(i)));
-    __ j(NOT_EQUAL, &next_test);
-    const Function& target = Function::ZoneHandle(ic_data()->GetTargetAt(i));
-    compiler->GenerateStaticCall(instance_call()->cid(),
-                                 instance_call()->token_index(),
-                                 instance_call()->try_index(),
-                                 target,
-                                 instance_call()->ArgumentCount(),
-                                 instance_call()->argument_names());
-    __ jmp(&done);
-    __ Bind(&next_test);
-  }
-  __ jmp(deopt);
+  compiler->EmitTestAndCall(*ic_data(),
+                            EDI,  // Class id register.
+                            instance_call()->ArgumentCount(),
+                            instance_call()->argument_names(),
+                            deopt, &done,  // Labels.
+                            instance_call()->cid(),
+                            instance_call()->token_index(),
+                            instance_call()->try_index());
   if (is_smi_label == &handle_smi) {
     __ Bind(&handle_smi);
     ASSERT(ic_data()->GetReceiverClassIdAt(0) == kSmi);
diff --git a/runtime/vm/intermediate_language_x64.cc b/runtime/vm/intermediate_language_x64.cc
