Switch memory.blink_memory_mobile to TBMv2

tools/perf/benchmarks/memory_infra.py

 # Copyright 2015 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 core import perf_benchmark
 
 from telemetry import benchmark
 from telemetry.timeline import tracing_category_filter
@@ skipping 126 matching lines @@
     # TODO(crbug.com/610962): Remove this stopgap when the perf dashboard
     # is able to cope with the data load generated by TBMv2 metrics.
     return not _IGNORED_STATS_RE.search(value.name)
 
 
 # TODO(bashi): Workaround for http://crbug.com/532075
 # @benchmark.Enabled('android') shouldn't be needed.
 @benchmark.Enabled('android')
 class RendererMemoryBlinkMemoryMobile(_MemoryInfra):
   """Timeline based benchmark for measuring memory consumption on mobile
-  sites on which blink's memory consumption is relatively high."""
-
-  _RE_RENDERER_VALUES = re.compile('memory_.+_renderer')
+  sites on which blink's memory consumption is relatively high.
+  """
+  TBM_VERSION = 2

[nednguyen, 2016/06/23 05:26:03]

Why do we need this?

[bashi, 2016/06/23 05:29:24]

The base class (_MemoryInfra.CreateTimelineBasedMeasurementOptions) uses it to
determine which version it should use. I think it will be gone after this CL.

[nednguyen, 2016/06/23 05:38:17]

Acknowledged.

 
   page_set = page_sets.BlinkMemoryMobilePageSet
 
   def SetExtraBrowserOptions(self, options):
     super(RendererMemoryBlinkMemoryMobile, self).SetExtraBrowserOptions(
         options)
     options.AppendExtraBrowserArgs([
         # Ignore certs errors because record_wpr cannot handle certs correctly
         # in some cases (e.g. WordPress).
         '--ignore-certificate-errors',
     ])
 
   @classmethod
   def Name(cls):
     return 'memory.blink_memory_mobile'
 
   @classmethod
   def ValueCanBeAddedPredicate(cls, value, is_first_result):
-    return bool(cls._RE_RENDERER_VALUES.match(value.name))
+    return (not _IGNORED_STATS_RE.search(value.name) and
+            'renderer_process' in value.name)

[petrcermak, 2016/06/23 09:29:13]

strictly speaking it should be 'renderer_processes', but I guess it doesn't
really matter. Thanks!

[bashi, 2016/06/23 23:01:18]

Done.

 
 
 class _MemoryV8Benchmark(_MemoryInfra):
 
   # Report only V8-specific and overall renderer memory values. Note that
   # detailed values reported by the OS (such as native heap) are excluded.
   _V8_AND_OVERALL_MEMORY_RE = re.compile(
       r'renderer_processes:'
       r'(reported_by_chrome:v8|reported_by_os:system_memory:[^:]+$)')
 
@@ skipping 39 matching lines @@
   of long running idle Gmail page """
   page_set = page_sets.LongRunningIdleGmailBackgroundPageSet
 
   @classmethod
   def Name(cls):
     return 'memory.long_running_idle_gmail_background_tbmv2'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):  # http://crbug.com/616530
     return cls.IsSvelte(possible_browser)