Fix problem of excessive attempts to optimize, fix excessive deoptimizations for load/store indexed…

runtime/vm/intermediate_language_ia32.cc

 // Copyright (c) 2012, 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/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/intermediate_language.h"
 
 #include "lib/error.h"
@@ skipping 50 matching lines @@
     // TODO(srdjan): Replace the counting code with a type feedback
     // collection and counting stub.
     const Function& function =
           Function::ZoneHandle(compiler->parsed_function().function().raw());
     __ LoadObject(temp, function);
     __ incl(FieldAddress(temp, Function::usage_counter_offset()));
     if (FlowGraphCompiler::CanOptimize()) {
       // Do not optimize if usage count must be reported.
       __ cmpl(FieldAddress(temp, Function::usage_counter_offset()),
           Immediate(FLAG_optimization_counter_threshold));
-      Label not_yet_hot;
-      __ j(LESS_EQUAL, &not_yet_hot, Assembler::kNearJump);
+      Label not_yet_hot, already_optimized;
+      __ j(LESS, &not_yet_hot, Assembler::kNearJump);
+      __ j(GREATER, &already_optimized, Assembler::kNearJump);
       __ pushl(result);  // Preserve result.
       __ pushl(temp);  // Argument for runtime: function to optimize.
       __ CallRuntime(kOptimizeInvokedFunctionRuntimeEntry);
       __ popl(temp);  // Remove argument.
       __ popl(result);  // Restore result.
       __ Bind(&not_yet_hot);
+      __ Bind(&already_optimized);
     }
   }
   if (FLAG_trace_functions) {
     const Function& function =
         Function::ZoneHandle(compiler->parsed_function().function().raw());
     __ LoadObject(temp, function);
     __ pushl(result);  // Preserve result.
     __ pushl(temp);
     compiler->GenerateCallRuntime(AstNode::kNoId,
                                   0,
@@ skipping 472 matching lines @@
 
 void RelationalOpComp::EmitNativeCode(FlowGraphCompiler* compiler) {
   if (operands_class_id() == kSmi) {
     EmitSmiRelationalOp(compiler, this);
     return;
   }
   if (operands_class_id() == kDouble) {
     EmitDoubleRelationalOp(compiler, this);
     return;
   }
+  if (HasICData() && (ic_data()->NumberOfChecks() > 0)) {
+    Label* deopt = compiler->AddDeoptStub(cid(),
+                                          token_pos(),
+                                          try_index(),
+                                          kDeoptRelationalOp);
+    // Load receiver into EAX, class into EDI.
+    Label done;
+    const intptr_t kNumArguments = 2;
+    __ movl(EDI, Immediate(kSmi));
+    __ movl(EAX, Address(ESP, (kNumArguments - 1) * kWordSize));
+    __ testl(EAX, Immediate(kSmiTagMask));
+    __ j(ZERO, &done);
+    __ LoadClassId(EDI, EAX);
+    __ Bind(&done);
+    compiler->EmitTestAndCall(ICData::Handle(ic_data()->AsUnaryClassChecks()),
+                              EDI,  // Class id register.
+                              kNumArguments,
+                              Array::Handle(),  // No named arguments.
+                              deopt,  // Deoptimize target.
+                              NULL,   // Fallthrough when done.
+                              cid(),
+                              token_pos(),
+                              try_index());
+    return;
+  }
   const String& function_name =
       String::ZoneHandle(String::NewSymbol(Token::Str(kind())));
   compiler->AddCurrentDescriptor(PcDescriptors::kDeopt,
                                  cid(),
                                  token_pos(),
                                  try_index());
   const intptr_t kNumArguments = 2;
   const intptr_t kNumArgsChecked = 2;  // Type-feedback.
   compiler->GenerateInstanceCall(cid(),
                                  token_pos(),
@@ skipping 67 matching lines @@
   }
 }
 
 
 static void EmitLoadIndexedPolymorphic(FlowGraphCompiler* compiler,
                                         LoadIndexedComp* comp) {
   Label* deopt = compiler->AddDeoptStub(comp->cid(),
                                         comp->token_pos(),
                                         comp->try_index(),
                                         kDeoptLoadIndexedPolymorphic);
-  if (comp->ic_data()->NumberOfChecks() == 0) {
-    __ jmp(deopt);
-    return;
-  }
+  ASSERT(comp->ic_data()->NumberOfChecks() > 0);
   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);
   __ LoadClassId(EDI, EAX);
   compiler->EmitTestAndCall(ic_data,
                             EDI,  // Class id register.
                             kNumArguments,
                             Array::Handle(),  // No named arguments.
                             deopt,  // Deoptimize target.
                             NULL,   // Fallthrough when done.
                             comp->cid(),
                             comp->token_pos(),
                             comp->try_index());
 }
 
 
 void LoadIndexedComp::EmitNativeCode(FlowGraphCompiler* compiler) {
   if (receiver_type() == kIllegalObjectKind) {
-    if (HasICData()) {
+    if (HasICData() && (ic_data()->NumberOfChecks() > 0)) {
       EmitLoadIndexedPolymorphic(compiler, this);
     } else {
       compiler->EmitLoadIndexedGeneric(this);
     }
     ASSERT(locs()->out().reg() == EAX);
     return;
   }
 
   Register receiver = locs()->in(0).reg();
   Register index = locs()->in(1).reg();
@@ skipping 88 matching lines @@
                                  kNumArgsChecked);
 }
 
 
 static void EmitStoreIndexedPolymorphic(FlowGraphCompiler* compiler,
                                         StoreIndexedComp* comp) {
   Label* deopt = compiler->AddDeoptStub(comp->cid(),
                                         comp->token_pos(),
                                         comp->try_index(),
                                         kDeoptStoreIndexedPolymorphic);
-  if (comp->ic_data()->NumberOfChecks() == 0) {
-    __ jmp(deopt);
-    return;
-  }
+  ASSERT(comp->ic_data()->NumberOfChecks() > 0);
   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);
   __ LoadClassId(EDI, EAX);
   compiler->EmitTestAndCall(ic_data,
                             EDI,  // Class id register.
                             kNumArguments,
                             Array::Handle(),  // No named arguments.
                             deopt,  // Deoptimize target.
                             NULL,   // Fallthrough when done.
                             comp->cid(),
                             comp->token_pos(),
                             comp->try_index());
 }
 
 
 void StoreIndexedComp::EmitNativeCode(FlowGraphCompiler* compiler) {
   if (receiver_type() == kIllegalObjectKind) {
-    if (HasICData()) {
+    if (HasICData() && (ic_data()->NumberOfChecks() > 0)) {
       EmitStoreIndexedPolymorphic(compiler, this);
     } else {
       EmitStoreIndexedGeneric(compiler, this);
     }
     return;
   }
 
   Register receiver = locs()->in(0).reg();
   Register index = locs()->in(1).reg();
   Register value = locs()->in(2).reg();
@@ skipping 46 matching lines @@
   }
 }
 
 
 LocationSummary* InstanceSetterComp::MakeLocationSummary() const {
   return MakeCallSummary();
 }
 
 
 void InstanceSetterComp::EmitNativeCode(FlowGraphCompiler* compiler) {
-  const String& function_name =
-      String::ZoneHandle(Field::SetterSymbol(field_name()));
+  Label* deopt = NULL;
+  if (compiler->is_optimizing()) {
+    deopt = compiler->AddDeoptStub(cid(),
+                                   token_pos(),
+                                   try_index(),
+                                   kDeoptInstanceSetter);
+  }
+  if (HasICData() && (ic_data()->NumberOfChecks() > 0)) {
+    // No index-setter on Smi's.
+    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);
+    __ LoadClassId(EDI, EAX);
+    compiler->EmitTestAndCall(*ic_data(),
+                              EDI,  // Class id register.
+                              kNumArguments,
+                              Array::Handle(),  // No named arguments.
+                              deopt,  // Deoptimize target.
+                              NULL,   // Fallthrough when done.
+                              cid(),
+                              token_pos(),
+                              try_index());
 
-  compiler->AddCurrentDescriptor(PcDescriptors::kDeopt,
-                                 cid(),
-                                 token_pos(),
-                                 try_index());
-  const intptr_t kArgumentCount = 2;
-  const intptr_t kCheckedArgumentCount = 1;
-  compiler->GenerateInstanceCall(cid(),
-                                 token_pos(),
-                                 try_index(),
-                                 function_name,
-                                 kArgumentCount,
-                                 Array::ZoneHandle(),
-                                 kCheckedArgumentCount);
+  } else if (compiler->is_optimizing()) {
+    // Get some IC data then optimize again.
+    __ jmp(deopt);
+  } else {
+    // Unoptimized code.
+    const String& function_name =
+        String::ZoneHandle(Field::SetterSymbol(field_name()));
+
+    compiler->AddCurrentDescriptor(PcDescriptors::kDeopt,
+                                   cid(),
+                                   token_pos(),
+                                   try_index());
+    const intptr_t kArgumentCount = 2;
+    const intptr_t kCheckedArgumentCount = 1;
+    compiler->GenerateInstanceCall(cid(),
+                                   token_pos(),
+                                   try_index(),
+                                   function_name,
+                                   kArgumentCount,
+                                   Array::ZoneHandle(),
+                                   kCheckedArgumentCount);
+  }
 }
 
 
 LocationSummary* StaticSetterComp::MakeLocationSummary() const {
   const intptr_t kNumInputs = 1;
   return LocationSummary::Make(kNumInputs, Location::RequiresRegister());
 }
 
 
 void StaticSetterComp::EmitNativeCode(FlowGraphCompiler* compiler) {
@@ skipping 1055 matching lines @@
                                  instance_call()->argument_names());
   }
   __ Bind(&done);
 }
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_X64