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

runtime/vm/flow_graph_compiler_arm.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_ARM.
 #if defined(TARGET_ARCH_ARM)
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/ast_printer.h"
 #include "vm/compiler.h"
 #include "vm/cpu.h"
 #include "vm/dart_entry.h"
 #include "vm/deopt_instructions.h"
 #include "vm/il_printer.h"
 #include "vm/locations.h"
 #include "vm/object_store.h"
 #include "vm/parser.h"
 #include "vm/stack_frame.h"
 #include "vm/stub_code.h"
 #include "vm/symbols.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, trap_on_deoptimization, false, "Trap on deoptimization.");
 DEFINE_FLAG(bool, unbox_mints, true, "Optimize 64-bit integer arithmetic.");
 DEFINE_FLAG(bool, unbox_doubles, true, "Optimize double arithmetic.");
-DECLARE_FLAG(int, optimization_counter_threshold);
-DECLARE_FLAG(int, reoptimization_counter_threshold);
 DECLARE_FLAG(bool, enable_type_checks);
 DECLARE_FLAG(bool, enable_simd_inline);
 
 
 FlowGraphCompiler::~FlowGraphCompiler() {
   // BlockInfos are zone-allocated, so their destructors are not called.
   // Verify the labels explicitly here.
   for (int i = 0; i < block_info_.length(); ++i) {
     ASSERT(!block_info_[i]->jump_label()->IsLinked());
   }
@@ skipping 932 matching lines @@
     // Temporarily setup pool pointer for this dart function.
     __ LoadPoolPointer();
     // Load function object from object pool.
     __ LoadObject(function_reg, function);  // Uses PP.
     // Restore PP of caller.
     __ mov(PP, Operand(R7));
 
     // Patch point is after the eventually inlined function object.
     entry_patch_pc_offset_ = assembler()->CodeSize();
 
-    intptr_t threshold = FLAG_optimization_counter_threshold;
+    const intptr_t threshold = GetOptimizationThreshold();;
     __ ldr(R7, FieldAddress(function_reg,
                             Function::usage_counter_offset()));
     if (is_optimizing()) {
       // Reoptimization of an optimized function is triggered by counting in
       // IC stubs, but not at the entry of the function.
-      threshold = FLAG_reoptimization_counter_threshold;
     } else {

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

else -> if (!is_optimizing()) move comment above it.

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

Done.

       __ add(R7, R7, Operand(1));
       __ str(R7, FieldAddress(function_reg,
                               Function::usage_counter_offset()));
     }
     __ CompareImmediate(R7, threshold);
     ASSERT(function_reg == R6);
     __ Branch(&stub_code->OptimizeFunctionLabel(), GE);
   } else if (!flow_graph().IsCompiledForOsr()) {
     entry_patch_pc_offset_ = assembler()->CodeSize();
   }
@@ skipping 785 matching lines @@
   DRegister dreg = EvenDRegisterOf(reg);
   __ vldrd(dreg, Address(SP, kDoubleSize, Address::PostIndex));
 }
 
 
 #undef __
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM