Enable EQT metric for v8.browsing* benchmarks.

tools/perf/benchmarks/v8_browsing.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import re
 
 from benchmarks import v8_helper
 from core import perf_benchmark
 from telemetry import benchmark
 from telemetry.timeline import chrome_trace_config
@@ skipping 24 matching lines @@
   This benchmark measures memory usage with periodic memory dumps and v8 times.
   See browsing_stories._BrowsingStory for workload description.
   """
 
   def CreateTimelineBasedMeasurementOptions(self):
     categories = [
       # Disable all categories by default.
       '-*',
       # Memory categories.
       'disabled-by-default-memory-infra',
+      # EQT categories.
+      'blink.user_timing',
+      'loading',
+      'navigation',
+      'toplevel',
       # V8 categories.
       'blink.console',
       'disabled-by-default-v8.gc',
       'renderer.scheduler',
       'v8',
       'webkit.console',
       # TODO(crbug.com/616441, primiano): Remove this temporary workaround,
       # which enables memory-infra V8 code stats in V8 code size benchmarks
       # only (to not slow down detailed memory dumps in other benchmarks).
       'disabled-by-default-memory-infra.v8.code_stats',
     ]
     options = timeline_based_measurement.Options(
         chrome_trace_category_filter.ChromeTraceCategoryFilter(
             ','.join(categories)))
     options.config.enable_android_graphics_memtrack = True
     # Trigger periodic light memory dumps every 1000 ms.
     memory_dump_config = chrome_trace_config.MemoryDumpConfig()
     memory_dump_config.AddTrigger('light', 1000)
     options.config.chrome_trace_config.SetMemoryDumpConfig(memory_dump_config)
-    options.SetTimelineBasedMetrics(['v8AndMemoryMetrics'])
+    options.SetTimelineBasedMetrics([
+      'expectedQueueingTimeMetric', 'v8AndMemoryMetrics'])
     return options
 
   def CreateStorySet(self, options):
     return page_sets.SystemHealthStorySet(platform=self.PLATFORM, case='browse')
 
   @classmethod
   def Name(cls):
     return 'v8.browsing_%s%s' % (cls.PLATFORM, cls.TEST_SUFFIX)
 
   @classmethod
   def ValueCanBeAddedPredicate(cls, value, is_first_result):
     # TODO(crbug.com/610962): Remove this stopgap when the perf dashboard
     # is able to cope with the data load generated by TBMv2 metrics.
     if 'memory:chrome' in value.name:
       return ('renderer_processes' in value.name and
               not _IGNORED_MEMORY_STATS_RE.search(value.name))
     if 'v8-gc' in value.name:
       return (_V8_GC_HIGH_LEVEL_STATS_RE.search(value.name) and
               not _IGNORED_V8_STATS_RE.search(value.name))
-    # Allow all other non-GC metrics.
-    return 'v8' in value.name
+    # Allow all other metrics.
+    return True
 
   @classmethod
   def ShouldTearDownStateAfterEachStoryRun(cls):
     return True
 
 
 class _V8RuntimeStatsBrowsingBenchmark(perf_benchmark.PerfBenchmark):
   """Base class for V8 browsing benchmarks that measure RuntimeStats.
   RuntimeStats measure the time spent by v8 in different phases like
   compile, JS execute, runtime etc.,
   See browsing_stories._BrowsingStory for workload description.
   """
 
   def CreateTimelineBasedMeasurementOptions(self):
     categories = [
       # Disable all categories by default.
       '-*',
       # Memory categories.
       'disabled-by-default-memory-infra',
       # UE categories requred by runtimeStatsTotalMetric to bucket
       # runtimeStats by UE.
       'rail',
+      # EQT categories.
+      'blink.user_timing',
+      'loading',
+      'navigation',
+      'toplevel',
       # V8 categories.
       'blink.console',
       'disabled-by-default-v8.gc',
       'renderer.scheduler',
       'v8',
       'webkit.console',
       'disabled-by-default-v8.runtime_stats',
     ]
     options = timeline_based_measurement.Options(
         chrome_trace_category_filter.ChromeTraceCategoryFilter(
             ','.join(categories)))
     options.config.enable_android_graphics_memtrack = True
     # Trigger periodic light memory dumps every 1000 ms.
     memory_dump_config = chrome_trace_config.MemoryDumpConfig()
     memory_dump_config.AddTrigger('light', 1000)
     options.config.chrome_trace_config.SetMemoryDumpConfig(memory_dump_config)
 
-    options.SetTimelineBasedMetrics(['runtimeStatsTotalMetric', 'gcMetric'])
+    options.SetTimelineBasedMetrics([
+      'expectedQueueingTimeMetric', 'runtimeStatsTotalMetric', 'gcMetric'])
     return options
 
   def CreateStorySet(self, options):
     return page_sets.SystemHealthStorySet(platform=self.PLATFORM, case='browse')
 
   @classmethod
   def Name(cls):
     return 'v8.runtimestats.browsing_%s%s' % (cls.PLATFORM, cls.TEST_SUFFIX)
 
   @classmethod
@@ skipping 167 matching lines @@
   TEST_SUFFIX = '_classic'
 
   def SetExtraBrowserOptions(self, options):
     super(V8RuntimeStatsMobileClassicBrowsingBenchmark,
         self).SetExtraBrowserOptions(options)
     v8_helper.EnableClassic(options)
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     return possible_browser.platform.GetDeviceTypeName() == 'Desktop'