[tools/perf] Only send _avg metrics for memory infra metrics

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 71 matching lines @@
   benchmarks (including the ones in this file) will switch to use it instead
   of the TBMv1 metric and this temporary benchmark will be removed. See
   crbug.com/60361.
   """
   TBM_VERSION = 2
 
   @classmethod
   def Name(cls):
     return 'memory.top_10_mobile_tbmv2'
 
+  @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.
+    return value.name.endswith('_avg')

[petrcermak, 2016/05/24 10:23:52]

Ned: Will this method also be applied to things like num_failed? If so, then we
should do the following:

  return 'memory:' not in value.name or value.name.endswith('_avg')

(I don't think we can use value.name.startswith('memory:') because the tir_label
might have already been added to the front of the value name).

Furthermore, this code will remove all dump counts (because they're simple
scalars), so I think that we should do the following instead:

  _IGNORED_STATS_RE = re.compile(r'_(std|count|max|min|sum|pct_\d{4}(_\d+)?)$')

  return not _IGNORED_STATS_RE.search(value.name)

See
https://github.com/catapult-project/catapult/blob/master/tracing/tracing/valu....

[perezju, 2016/05/24 11:29:06]

You're correct, this was throwing away dump counts. I took your suggestion, and
did a few other manual checks to ensure doesn't throw away too much or too
little.

+
 
 # Benchmark is disabled by default because it takes too long to run.
 @benchmark.Disabled('all')
 class DualBrowserBenchmark(_MemoryInfra):
   """Measures memory usage while interacting with two different browsers.
 
   The user story involves going back and forth between doing Google searches
   on a webview-based browser (a stand in for the Search app), and loading
   pages on a select browser.
   """
   TBM_VERSION = 2
   page_set = page_sets.DualBrowserStorySet
   options = {'pageset_repeat': 5}
 
   @classmethod
   def Name(cls):
     return 'memory.dual_browser_test'
 
+  @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.
+    return value.name.endswith('_avg')
+
 
 # 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')
 
@@ skipping 45 matching lines @@
 
 @benchmark.Disabled('android-webview') # http://crbug.com/612210
 class MemoryLongRunningIdleGmailBackground(_MemoryV8Benchmark):
   """Use (recorded) real world web sites and measure memory consumption
   of long running idle Gmail page """
   page_set = page_sets.LongRunningIdleGmailBackgroundPageSet
 
   @classmethod
   def Name(cls):
     return 'memory.long_running_idle_gmail_background_tbmv2'