[perf] Prepare benchmarks for memory metric normalization

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 144 matching lines @@
   @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))
 
 
 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:(reported_by_chrome:v8|reported_by_os:system:[^:]+$)')
+
   def CreateTimelineBasedMeasurementOptions(self):
     v8_categories = [
         'blink.console', 'renderer.scheduler', 'v8', 'webkit.console']
     memory_categories = ['blink.console', 'disabled-by-default-memory-infra']
     category_filter = tracing_category_filter.TracingCategoryFilter(
         ','.join(['-*'] + v8_categories + memory_categories))
     options = timeline_based_measurement.Options(category_filter)
     options.SetTimelineBasedMetric('v8AndMemoryMetrics')
     return options
 
   @classmethod
   def ValueCanBeAddedPredicate(cls, value, _):
     if 'memory:chrome' in value.name:
+      # TODO(petrcermak): Remove the first two cases once
+      # https://codereview.chromium.org/2018503002/ lands in Catapult and rolls
+      # into Chromium.
       return ('renderer:subsystem:v8' in value.name or
-              'renderer:vmstats:overall' in value.name)
+              'renderer:vmstats:overall' in value.name or
+              bool(cls._V8_AND_OVERALL_MEMORY_RE.search(value.name)))
     return 'v8' in value.name
 
 
 class MemoryLongRunningIdleGmail(_MemoryV8Benchmark):
   """Use (recorded) real world web sites and measure memory consumption
   of long running idle Gmail page """
   page_set = page_sets.LongRunningIdleGmailPageSet
 
   @classmethod
   def Name(cls):
@@ skipping 10 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)