| Index: tools/perf/benchmarks/system_health.py
|
| diff --git a/tools/perf/benchmarks/system_health.py b/tools/perf/benchmarks/system_health.py
|
| index 598ff82909401a4a9cc4b2a624cb84567c069a48..8037c349c72a354688d53825fff3b0c6ed999d76 100644
|
| --- a/tools/perf/benchmarks/system_health.py
|
| +++ b/tools/perf/benchmarks/system_health.py
|
| @@ -2,12 +2,20 @@
|
| # 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
|
| from telemetry.web_perf import timeline_based_measurement
|
| import page_sets
|
|
|
| +
|
| +# See tr.v.Numeric.getSummarizedScalarNumericsWithNames()
|
| +# https://github.com/catapult-project/catapult/blob/master/tracing/tracing/value/numeric.html#L323
|
| +_IGNORED_STATS_RE = re.compile(r'_(std|count|max|min|sum|pct_\d{4}(_\d+)?)$')
|
| +
|
| +
|
| class _SystemHealthBenchmark(perf_benchmark.PerfBenchmark):
|
| TRACING_CATEGORIES = [
|
| 'benchmark',
|
| @@ -73,8 +81,13 @@ class _MemorySystemHealthBenchmark(perf_benchmark.PerfBenchmark):
|
| def Name(cls):
|
| return 'system_health.memory_%s' % cls.page_set.PLATFORM
|
|
|
| -# https://github.com/catapult-project/catapult/issues/2340
|
| -@benchmark.Disabled('all')
|
| + @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 not _IGNORED_STATS_RE.search(value.name)
|
| +
|
| +
|
| class DesktopMemorySystemHealth(_MemorySystemHealthBenchmark):
|
| """Desktop Chrome Memory System Health Benchmark."""
|
| page_set = page_sets.DesktopMemorySystemHealthStorySet
|
| @@ -83,8 +96,7 @@ class DesktopMemorySystemHealth(_MemorySystemHealthBenchmark):
|
| def ShouldDisable(cls, possible_browser):
|
| return possible_browser.platform.GetDeviceTypeName() != 'Desktop'
|
|
|
| -# https://github.com/catapult-project/catapult/issues/2340
|
| -@benchmark.Disabled('all')
|
| +
|
| class MobileMemorySystemHealth(_MemorySystemHealthBenchmark):
|
| """Mobile Chrome Memory System Health Benchmark."""
|
| page_set = page_sets.MobileMemorySystemHealthStorySet
|
|
|