Add a deoptimization count to each function to limit number of re-compilations.

src/compiler.cc

 // Copyright 2011 the V8 project authors. All rights reserved.

[Jakob Kummerow, 2012/01/16 11:41:25]

nit: 2012

[fschneider, 2012/01/19 10:26:11]

Done.

 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
 //       with the distribution.
@@ skipping 123 matching lines @@
 #endif
 }
 
 
 static bool AlwaysFullCompiler() {
   return FLAG_always_full_compiler || is_debugging_active();
 }
 
 
 static void FinishOptimization(Handle<JSFunction> function, int64_t start) {
-  int opt_count = function->shared()->opt_count();
-  function->shared()->set_opt_count(opt_count + 1);
   double ms = static_cast<double>(OS::Ticks() - start) / 1000;
   if (FLAG_trace_opt) {
     PrintF("[optimizing: ");
     function->PrintName();
     PrintF(" / %" V8PRIxPTR, reinterpret_cast<intptr_t>(*function));
     PrintF(" - took %0.3f ms]\n", ms);
   }
   if (FLAG_trace_opt_stats) {
     static double compilation_time = 0.0;
     static int compiled_functions = 0;
@@ skipping 35 matching lines @@
   ASSERT(!info->shared_info()->optimization_disabled());
 
   // Fall back to using the full code generator if it's not possible
   // to use the Hydrogen-based optimizing compiler. We already have
   // generated code for this from the shared function object.
   if (AlwaysFullCompiler() || !FLAG_use_hydrogen) {
     info->SetCode(code);
     return true;
   }
 
-  // Limit the number of times we re-compile a functions with
-  // the optimizing compiler.
-  const int kMaxOptCount =
-      FLAG_deopt_every_n_times == 0 ? Compiler::kDefaultMaxOptCount : 1000;
-  if (info->shared_info()->opt_count() > kMaxOptCount) {
-    info->AbortOptimization();
-    Handle<JSFunction> closure = info->closure();
-    info->shared_info()->DisableOptimization(*closure);
-    // True indicates the compilation pipeline is still going, not
-    // necessarily that we optimized the code.
-    return true;
-  }
-
   // Due to an encoding limit on LUnallocated operands in the Lithium
   // language, we cannot optimize functions with too many formal parameters
   // or perform on-stack replacement for function with too many
   // stack-allocated local variables.
   //
   // The encoding is as a signed value, with parameters and receiver using
   // the negative indices and locals the non-negative ones.
   const int parameter_limit = -LUnallocated::kMinFixedIndex;
   const int locals_limit = LUnallocated::kMaxFixedIndex;
   Scope* scope = info->scope();
   if ((scope->num_parameters() + 1) > parameter_limit ||
       (info->osr_ast_id() != AstNode::kNoNumber &&
        scope->num_parameters() + 1 + scope->num_stack_slots() > locals_limit)) {
     info->AbortOptimization();
-    Handle<JSFunction> closure = info->closure();
-    info->shared_info()->DisableOptimization(*closure);
+    info->shared_info()->DisableOptimization();
     // True indicates the compilation pipeline is still going, not
     // necessarily that we optimized the code.
     return true;
   }
 
   // Take --hydrogen-filter into account.
   Vector<const char> filter = CStrVector(FLAG_hydrogen_filter);
   Handle<String> name = info->function()->debug_name();
   bool match = filter.is_empty() || name->IsEqualTo(filter);
   if (!match) {
@@ skipping 57 matching lines @@
       FinishOptimization(info->closure(), start);
       return true;
     }
   }
 
   // Keep using the shared code.
   info->AbortOptimization();
   if (!builder.inline_bailout()) {
     // Mark the shared code as unoptimizable unless it was an inlined
     // function that bailed out.
-    Handle<JSFunction> closure = info->closure();
-    info->shared_info()->DisableOptimization(*closure);
+    info->shared_info()->DisableOptimization();
   }
   // True indicates the compilation pipeline is still going, not necessarily
   // that we optimized the code.
   return true;
 }
 
 
 static bool GenerateCode(CompilationInfo* info) {
   return info->IsCompilingForDebugging() || !V8::UseCrankshaft() ?
       FullCodeGenerator::MakeCode(info) :
@@ skipping 466 matching lines @@
     }
   }
 
   GDBJIT(AddCode(Handle<String>(shared->DebugName()),
                  Handle<Script>(info->script()),
                  Handle<Code>(info->code()),
                  info));
 }
 
 } }  // namespace v8::internal