Split experimental profiler flags

src/runtime-profiler.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // 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
@@ skipping 186 matching lines @@
   // (eagerly or lazily).
   JSFunction* samples[kSamplerFrameCount];
   int sample_count = 0;
   int frame_count = 0;
   for (JavaScriptFrameIterator it(isolate_);
        frame_count++ < kSamplerFrameCount && !it.done();
        it.Advance()) {
     JavaScriptFrame* frame = it.frame();
     JSFunction* function = JSFunction::cast(frame->function());
 
-    if (!FLAG_counting_profiler) {
+    if (!FLAG_watch_ic_patching) {
       // Adjust threshold each time we have processed
       // a certain number of ticks.
       if (sampler_ticks_until_threshold_adjustment_ > 0) {
         sampler_ticks_until_threshold_adjustment_--;
         if (sampler_ticks_until_threshold_adjustment_ <= 0) {
           // If the threshold is not already at the minimum
           // modify and reset the ticks until next adjustment.
           if (sampler_threshold_ > kSamplerThresholdMin) {
             sampler_threshold_ -= kSamplerThresholdDelta;
             sampler_ticks_until_threshold_adjustment_ =
                 kSamplerTicksBetweenThresholdAdjustment;
           }
         }
       }
     }
 
     if (function->IsMarkedForLazyRecompilation()) {
       Code* unoptimized = function->shared()->code();
       int nesting = unoptimized->allow_osr_at_loop_nesting_level();
       if (nesting == 0) AttemptOnStackReplacement(function);
       int new_nesting = Min(nesting + 1, Code::kMaxLoopNestingMarker);
       unoptimized->set_allow_osr_at_loop_nesting_level(new_nesting);
     }
 
     // Do not record non-optimizable functions.
     if (!function->IsOptimizable()) continue;
 
-    if (FLAG_counting_profiler) {
+    if (FLAG_watch_ic_patching) {
       int ticks = function->shared()->profiler_ticks();
 
       if (ticks >= kProfilerTicksBeforeOptimization) {
         // If this particular function hasn't had any ICs patched for enough
         // ticks, optimize it now.
         Optimize(function, "hot and stable");
       } else if (!any_ic_changed_ &&
           function->shared()->code()->instruction_size() < kMaxSizeEarlyOpt) {
         // If no IC was patched since the last tick and this function is very
         // small, optimistically optimize it now.
@@ skipping 17 matching lines @@
           ? sampler_threshold_size_factor_
           : 1;
 
       int threshold = sampler_threshold_ * threshold_size_factor;
 
       if (LookupSample(function) >= threshold) {
         Optimize(function, "sampler window lookup");
       }
     }
   }
-  if (FLAG_counting_profiler) {
+  if (FLAG_watch_ic_patching) {
     any_ic_changed_ = false;
     code_generated_ = false;
   } else {  // !FLAG_counting_profiler
     // Add the collected functions as samples. It's important not to do
     // this as part of collecting them because this will interfere with
     // the sample lookup in case of recursive functions.
     for (int i = 0; i < sample_count; i++) {
       AddSample(samples[i], kSamplerFrameWeight[i]);
     }
   }
 }
 
 
 void RuntimeProfiler::NotifyTick() {
   isolate_->stack_guard()->RequestRuntimeProfilerTick();
 }
 
 
 void RuntimeProfiler::SetUp() {
   ASSERT(has_been_globally_set_up_);
-  if (!FLAG_counting_profiler) {
+  if (!FLAG_watch_ic_patching) {
     ClearSampleBuffer();
   }
   // If the ticker hasn't already started, make sure to do so to get
   // the ticks for the runtime profiler.
   if (IsEnabled()) isolate_->logger()->EnsureTickerStarted();
 }
 
 
 void RuntimeProfiler::Reset() {
-  if (FLAG_counting_profiler) {
+  if (FLAG_watch_ic_patching) {
     total_code_generated_ = 0;
   } else {  // !FLAG_counting_profiler
     sampler_threshold_ = kSamplerThresholdInit;
     sampler_threshold_size_factor_ = kSamplerThresholdSizeFactorInit;
     sampler_ticks_until_threshold_adjustment_ =
         kSamplerTicksBetweenThresholdAdjustment;
   }
 }
 
 
@@ skipping 90 matching lines @@
 
 bool RuntimeProfilerRateLimiter::SuspendIfNecessary() {
   if (!RuntimeProfiler::IsSomeIsolateInJS()) {
     return RuntimeProfiler::WaitForSomeIsolateToEnterJS();
   }
   return false;
 }
 
 
 } }  // namespace v8::internal