summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordyen <dyen@chromium.org>2015-03-27 16:37:29 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-27 23:38:04 +0000
commitb2512c2807be33d2956bb2d4ed5dfda7979a8a14 (patch)
tree4c026377b98958e08d20e75b50245a0e30d056cc
parent617e549ee93838926d8c6a4de9d1f50209be3c7a (diff)
downloadchromium_src-b2512c2807be33d2956bb2d4ed5dfda7979a8a14.zip
chromium_src-b2512c2807be33d2956bb2d4ed5dfda7979a8a14.tar.gz
chromium_src-b2512c2807be33d2956bb2d4ed5dfda7979a8a14.tar.bz2
Enable gpu_times for android.
The gpu_times metric has been known to be flaky but it seems that the flakiness only affects desktop devices. Enable it on android only. R=nednguyen@chromium.org BUG=455292 Review URL: https://codereview.chromium.org/1041963002 Cr-Commit-Position: refs/heads/master@{#322677}
-rw-r--r--tools/perf/benchmarks/gpu_times.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/tools/perf/benchmarks/gpu_times.py b/tools/perf/benchmarks/gpu_times.py
index 8ecd9ea..e726bbb0 100644
--- a/tools/perf/benchmarks/gpu_times.py
+++ b/tools/perf/benchmarks/gpu_times.py
@@ -27,7 +27,7 @@ class _GPUTimes(benchmark.Benchmark):
return (isinstance(value, gpu_timeline.GPUTimelineListOfValues) or
isinstance(value, gpu_timeline.GPUTimelineValue))
-@benchmark.Disabled # http://crbug.com/455292
+@benchmark.Enabled('android') # http://crbug.com/453131
class GPUTimesKeyMobileSites(_GPUTimes):
"""Measures GPU timeline metric on key mobile sites."""
page_set = page_sets.KeyMobileSitesSmoothPageSet
@@ -36,7 +36,7 @@ class GPUTimesKeyMobileSites(_GPUTimes):
def Name(cls):
return 'gpu_times.key_mobile_sites_smooth'
-@benchmark.Disabled # http://crbug.com/455292
+@benchmark.Enabled('android') # http://crbug.com/453131
class GPUTimesGpuRasterizationKeyMobileSites(_GPUTimes):
"""Measures GPU timeline metric on key mobile sites with GPU rasterization.
"""
@@ -48,7 +48,7 @@ class GPUTimesGpuRasterizationKeyMobileSites(_GPUTimes):
def Name(cls):
return 'gpu_times.gpu_rasterization.key_mobile_sites_smooth'
-@benchmark.Disabled # http://crbug.com/453131, http://crbug.com/455292
+@benchmark.Enabled('android') # http://crbug.com/453131
class GPUTimesTop25Sites(_GPUTimes):
"""Measures GPU timeline metric for the top 25 sites."""
page_set = page_sets.Top25SmoothPageSet
@@ -57,7 +57,7 @@ class GPUTimesTop25Sites(_GPUTimes):
def Name(cls):
return 'gpu_times.top_25_smooth'
-@benchmark.Disabled # http://crbug.com/455292
+@benchmark.Enabled('android') # http://crbug.com/453131
class GPUTimesGpuRasterizationTop25Sites(_GPUTimes):
"""Measures GPU timeline metric for the top 25 sites with GPU rasterization.
"""
@@ -68,4 +68,3 @@ class GPUTimesGpuRasterizationTop25Sites(_GPUTimes):
@classmethod
def Name(cls):
return 'gpu_times.gpu_rasterization.top_25_smooth'
-