Chromium Code Reviews| Index: tools/perf/benchmarks/memory_infra.py |
| diff --git a/tools/perf/benchmarks/memory_infra.py b/tools/perf/benchmarks/memory_infra.py |
| index 801dd47e90875fa157647f2a38b3fdd990eda5b4..40f09ad89e465ad4fa468da18a3ba623007c9e1e 100644 |
| --- a/tools/perf/benchmarks/memory_infra.py |
| +++ b/tools/perf/benchmarks/memory_infra.py |
| @@ -52,22 +52,13 @@ class _MemoryInfra(perf_benchmark.PerfBenchmark): |
| # TODO(bashi): Workaround for http://crbug.com/532075 |
| # @benchmark.Enabled('android') shouldn't be needed. |
| @benchmark.Enabled('android') |
| -class MemoryHealthPlan(_MemoryInfra): |
| - """Timeline based benchmark for the Memory Health Plan.""" |
| - |
| - _PREFIX_WHITELIST = ('memory_allocator_', 'memory_android_memtrack_', |
| - 'memory_mmaps_', 'process_count_') |
| - |
| +class MemoryHealthQuick(_MemoryInfra): |
| + """Timeline based benchmark for the Memory Health Plan (1 iteration).""" |
| page_set = page_sets.MemoryHealthStory |
| @classmethod |
| def Name(cls): |
| - return 'memory.memory_health_plan' |
| - |
| - @classmethod |
| - def ValueCanBeAddedPredicate(cls, value, is_first_result): |
| - return (value.tir_label in ['foreground', 'background'] |
| - and any(value.name.startswith(p) for p in cls._PREFIX_WHITELIST)) |
|
perezju
2016/04/20 15:17:13
Took the chance to remove this value filter. The b
|
| + return 'memory.memory_health_quick' |
| @classmethod |
| def ShouldDisable(cls, possible_browser): |
| @@ -76,6 +67,17 @@ class MemoryHealthPlan(_MemoryInfra): |
| return 'nexus' not in possible_browser.platform.GetDeviceTypeName().lower() |
| +# Benchmark is disabled by default because it takes too long to run. |
| +@benchmark.Disabled('all') |
| +class MemoryHealthPlan(MemoryHealthQuick): |
| + """Timeline based benchmark for the Memory Health Plan (5 iterations).""" |
| + options = {'pageset_repeat': 5} |
| + |
| + @classmethod |
| + def Name(cls): |
| + return 'memory.memory_health_plan' |
| + |
| + |
| # TODO(bashi): Workaround for http://crbug.com/532075 |
| # @benchmark.Enabled('android') shouldn't be needed. |
| @benchmark.Enabled('android') |