Scale invocation count by the number of BBs in the flow-graph of a method.

runtime/vm/flow_graph_compiler.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/globals.h"  // Needed here to get TARGET_ARCH_XXX.
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/bit_vector.h"
 #include "vm/cha.h"
@@ skipping 15 matching lines @@
 namespace dart {
 
 DECLARE_FLAG(bool, code_comments);
 DECLARE_FLAG(bool, disassemble);
 DECLARE_FLAG(bool, disassemble_optimized);
 DECLARE_FLAG(bool, emit_edge_counters);
 DECLARE_FLAG(bool, enable_type_checks);
 DECLARE_FLAG(bool, intrinsify);
 DECLARE_FLAG(bool, propagate_ic_data);
 DECLARE_FLAG(int, optimization_counter_threshold);
+DECLARE_FLAG(int, optimization_counter_scale);
+DECLARE_FLAG(int, min_optimization_counter_threshold);
+DECLARE_FLAG(int, reoptimization_counter_threshold);
 DECLARE_FLAG(bool, use_cha);
 DECLARE_FLAG(bool, use_osr);
 DECLARE_FLAG(int, stacktrace_every);
 DECLARE_FLAG(charp, stacktrace_filter);
 DECLARE_FLAG(int, deoptimize_every);
 DECLARE_FLAG(charp, deoptimize_filter);
 DECLARE_FLAG(bool, warn_on_javascript_compatibility);
 DEFINE_FLAG(bool, enable_simd_inline, true,
     "Enable inlining of SIMD related method calls.");
 DEFINE_FLAG(bool, source_lines, false, "Emit source line as assembly comment.");
@@ skipping 1375 matching lines @@
     ASSERT(res->NumArgsTested() == num_args_tested);
     return res;
   }
   const ICData& ic_data = ICData::ZoneHandle(isolate(), ICData::New(
       parsed_function().function(), String::Handle(isolate(), target.name()),
       arguments_descriptor, deopt_id, num_args_tested));
   ic_data.AddTarget(target);
   (*deopt_id_to_ic_data_)[deopt_id] = &ic_data;
   return &ic_data;
 }
 

[Vyacheslav Egorov (Google), 2014/08/29 11:17:18]

+ empty line

[Anders Johnsen, 2014/08/29 11:56:28]

Done.

+intptr_t FlowGraphCompiler::GetOptimizationThreshold() const {
+  intptr_t threshold;
+  if (is_optimizing()) {
+    threshold = FLAG_reoptimization_counter_threshold;
+  } else {
+    const intptr_t basic_blocks = flow_graph().preorder().length();
+    ASSERT(basic_blocks > 0);
+    threshold = FLAG_optimization_counter_scale * basic_blocks +
+        FLAG_min_optimization_counter_threshold;
+    if (threshold > FLAG_optimization_counter_threshold) {
+      threshold = FLAG_optimization_counter_threshold;
+    }
+  }
+  return threshold;
+}
+
 }  // namespace dart