Index: tools/perf/benchmarks/smoothness.py |
diff --git a/tools/perf/benchmarks/smoothness.py b/tools/perf/benchmarks/smoothness.py |
index 6021c4a26f6ead7541469c0f8f65ed4cfe5d95b3..fac584baa3288a492cb773afc17077d098ed45da 100644 |
--- a/tools/perf/benchmarks/smoothness.py |
+++ b/tools/perf/benchmarks/smoothness.py |
@@ -10,8 +10,22 @@ import page_sets |
import page_sets.key_silk_cases |
from telemetry import benchmark |
+class _Smoothness(perf_benchmark.PerfBenchmark): |
+ @classmethod |
+ def Name(cls): |
+ return 'smoothness' |
+ |
+ @classmethod |
+ def ValueCanBeAddedPredicate(cls, value, _): |
+ # Lack of first_gesture_scroll_update_latency existence is not (typically) a |
+ # failure, as some smoothness pages don't perform gesture scrolling. |
+ if (value.name == 'first_gesture_scroll_update_latency' and |
+ value.values is None): |
nednguyen
2015/09/25 20:38:47
I would suggest tracking which pages currently don
jdduke (slow)
2015/09/25 21:17:15
Done.
|
+ return False |
+ return True |
+ |
-class SmoothnessTop25(perf_benchmark.PerfBenchmark): |
+class SmoothnessTop25(_Smoothness): |
"""Measures rendering statistics while scrolling down the top 25 web pages. |
http://www.chromium.org/developers/design-documents/rendering-benchmarks |
@@ -24,7 +38,7 @@ class SmoothnessTop25(perf_benchmark.PerfBenchmark): |
return 'smoothness.top_25_smooth' |
-class SmoothnessToughFiltersCases(perf_benchmark.PerfBenchmark): |
+class SmoothnessToughFiltersCases(_Smoothness): |
"""Measures frame rate and a variety of other statistics. |
Uses a selection of pages making use of SVG and CSS Filter Effects. |
@@ -37,7 +51,7 @@ class SmoothnessToughFiltersCases(perf_benchmark.PerfBenchmark): |
return 'smoothness.tough_filters_cases' |
-class SmoothnessToughPathRenderingCases(perf_benchmark.PerfBenchmark): |
+class SmoothnessToughPathRenderingCases(_Smoothness): |
"""Tests a selection of pages with SVG and 2D Canvas paths. |
Measures frame rate and a variety of other statistics. """ |
@@ -50,7 +64,7 @@ class SmoothnessToughPathRenderingCases(perf_benchmark.PerfBenchmark): |
@benchmark.Disabled('android') # crbug.com/526901 |
-class SmoothnessToughCanvasCases(perf_benchmark.PerfBenchmark): |
+class SmoothnessToughCanvasCases(_Smoothness): |
"""Measures frame rate and a variety of other statistics. |
Uses a selection of pages making use of the 2D Canvas API. |
@@ -64,7 +78,7 @@ class SmoothnessToughCanvasCases(perf_benchmark.PerfBenchmark): |
@benchmark.Disabled('android') # crbug.com/373812 |
-class SmoothnessToughWebGLCases(perf_benchmark.PerfBenchmark): |
+class SmoothnessToughWebGLCases(_Smoothness): |
test = smoothness.Smoothness |
page_set = page_sets.ToughWebglCasesPageSet |
@@ -74,7 +88,7 @@ class SmoothnessToughWebGLCases(perf_benchmark.PerfBenchmark): |
@benchmark.Enabled('android') |
-class SmoothnessMaps(perf_benchmark.PerfBenchmark): |
+class SmoothnessMaps(_Smoothness): |
page_set = page_sets.MapsPageSet |
@classmethod |
@@ -83,7 +97,7 @@ class SmoothnessMaps(perf_benchmark.PerfBenchmark): |
@benchmark.Disabled('android') |
-class SmoothnessKeyDesktopMoveCases(perf_benchmark.PerfBenchmark): |
+class SmoothnessKeyDesktopMoveCases(_Smoothness): |
test = smoothness.Smoothness |
page_set = page_sets.KeyDesktopMoveCasesPageSet |
@@ -93,7 +107,7 @@ class SmoothnessKeyDesktopMoveCases(perf_benchmark.PerfBenchmark): |
@benchmark.Enabled('android') |
-class SmoothnessKeyMobileSites(perf_benchmark.PerfBenchmark): |
+class SmoothnessKeyMobileSites(_Smoothness): |
"""Measures rendering statistics while scrolling down the key mobile sites. |
http://www.chromium.org/developers/design-documents/rendering-benchmarks |
@@ -106,7 +120,7 @@ class SmoothnessKeyMobileSites(perf_benchmark.PerfBenchmark): |
return 'smoothness.key_mobile_sites_smooth' |
-class SmoothnessToughAnimationCases(perf_benchmark.PerfBenchmark): |
+class SmoothnessToughAnimationCases(_Smoothness): |
test = smoothness.SmoothnessWithRestart |
page_set = page_sets.ToughAnimationCasesPageSet |
@@ -116,7 +130,7 @@ class SmoothnessToughAnimationCases(perf_benchmark.PerfBenchmark): |
@benchmark.Enabled('android') |
-class SmoothnessKeySilkCases(perf_benchmark.PerfBenchmark): |
+class SmoothnessKeySilkCases(_Smoothness): |
"""Measures rendering statistics for the key silk cases without GPU |
rasterization. |
""" |
@@ -138,7 +152,7 @@ class SmoothnessKeySilkCases(perf_benchmark.PerfBenchmark): |
@benchmark.Enabled('android') |
-class SmoothnessGpuRasterizationTop25(perf_benchmark.PerfBenchmark): |
+class SmoothnessGpuRasterizationTop25(_Smoothness): |
"""Measures rendering statistics for the top 25 with GPU rasterization. |
""" |
tag = 'gpu_rasterization' |
@@ -154,7 +168,7 @@ class SmoothnessGpuRasterizationTop25(perf_benchmark.PerfBenchmark): |
@benchmark.Enabled('android') |
-class SmoothnessGpuRasterizationKeyMobileSites(perf_benchmark.PerfBenchmark): |
+class SmoothnessGpuRasterizationKeyMobileSites(_Smoothness): |
"""Measures rendering statistics for the key mobile sites with GPU |
rasterization. |
""" |
@@ -170,8 +184,7 @@ class SmoothnessGpuRasterizationKeyMobileSites(perf_benchmark.PerfBenchmark): |
return 'smoothness.gpu_rasterization.key_mobile_sites_smooth' |
-class SmoothnessGpuRasterizationToughPathRenderingCases( |
- perf_benchmark.PerfBenchmark): |
+class SmoothnessGpuRasterizationToughPathRenderingCases(_Smoothness): |
"""Tests a selection of pages with SVG and 2D canvas paths with GPU |
rasterization. |
""" |
@@ -187,7 +200,7 @@ class SmoothnessGpuRasterizationToughPathRenderingCases( |
return 'smoothness.gpu_rasterization.tough_path_rendering_cases' |
-class SmoothnessGpuRasterizationFiltersCases(perf_benchmark.PerfBenchmark): |
+class SmoothnessGpuRasterizationFiltersCases(_Smoothness): |
"""Tests a selection of pages with SVG and CSS filter effects with GPU |
rasterization. |
""" |
@@ -204,7 +217,7 @@ class SmoothnessGpuRasterizationFiltersCases(perf_benchmark.PerfBenchmark): |
@benchmark.Enabled('android') |
-class SmoothnessSyncScrollKeyMobileSites(perf_benchmark.PerfBenchmark): |
+class SmoothnessSyncScrollKeyMobileSites(_Smoothness): |
"""Measures rendering statistics for the key mobile sites with synchronous |
(main thread) scrolling. |
""" |
@@ -221,7 +234,7 @@ class SmoothnessSyncScrollKeyMobileSites(perf_benchmark.PerfBenchmark): |
@benchmark.Enabled('android') |
-class SmoothnessSimpleMobilePages(perf_benchmark.PerfBenchmark): |
+class SmoothnessSimpleMobilePages(_Smoothness): |
"""Measures rendering statistics for simple mobile sites page set. |
""" |
test = smoothness.Smoothness |
@@ -233,7 +246,7 @@ class SmoothnessSimpleMobilePages(perf_benchmark.PerfBenchmark): |
@benchmark.Enabled('android') |
-class SmoothnessFlingSimpleMobilePages(perf_benchmark.PerfBenchmark): |
+class SmoothnessFlingSimpleMobilePages(_Smoothness): |
"""Measures rendering statistics for flinging a simple mobile sites page set. |
""" |
test = smoothness.Smoothness |
@@ -251,7 +264,7 @@ class SmoothnessFlingSimpleMobilePages(perf_benchmark.PerfBenchmark): |
@benchmark.Enabled('android', 'chromeos', 'mac') |
-class SmoothnessToughPinchZoomCases(perf_benchmark.PerfBenchmark): |
+class SmoothnessToughPinchZoomCases(_Smoothness): |
"""Measures rendering statistics for pinch-zooming into the tough pinch zoom |
cases. |
""" |
@@ -264,7 +277,7 @@ class SmoothnessToughPinchZoomCases(perf_benchmark.PerfBenchmark): |
@benchmark.Enabled('android', 'chromeos') |
-class SmoothnessToughScrollingWhileZoomedInCases(perf_benchmark.PerfBenchmark): |
+class SmoothnessToughScrollingWhileZoomedInCases(_Smoothness): |
"""Measures rendering statistics for pinch-zooming then diagonal scrolling""" |
test = smoothness.Smoothness |
page_set = page_sets.ToughScrollingWhileZoomedInCasesPageSet |
@@ -275,7 +288,7 @@ class SmoothnessToughScrollingWhileZoomedInCases(perf_benchmark.PerfBenchmark): |
@benchmark.Enabled('android') |
-class SmoothnessPolymer(perf_benchmark.PerfBenchmark): |
+class SmoothnessPolymer(_Smoothness): |
"""Measures rendering statistics for Polymer cases. |
""" |
test = smoothness.Smoothness |
@@ -287,7 +300,7 @@ class SmoothnessPolymer(perf_benchmark.PerfBenchmark): |
@benchmark.Enabled('android') |
-class SmoothnessGpuRasterizationPolymer(perf_benchmark.PerfBenchmark): |
+class SmoothnessGpuRasterizationPolymer(_Smoothness): |
"""Measures rendering statistics for the Polymer cases with GPU rasterization. |
""" |
tag = 'gpu_rasterization' |
@@ -302,7 +315,7 @@ class SmoothnessGpuRasterizationPolymer(perf_benchmark.PerfBenchmark): |
return 'smoothness.gpu_rasterization.polymer' |
-class SmoothnessToughScrollingCases(perf_benchmark.PerfBenchmark): |
+class SmoothnessToughScrollingCases(_Smoothness): |
test = smoothness.Smoothness |
page_set = page_sets.ToughScrollingCasesPageSet |
@@ -311,7 +324,7 @@ class SmoothnessToughScrollingCases(perf_benchmark.PerfBenchmark): |
return 'smoothness.tough_scrolling_cases' |
@benchmark.Disabled('android') # http://crbug.com/531593 |
-class SmoothnessToughImageDecodeCases(perf_benchmark.PerfBenchmark): |
+class SmoothnessToughImageDecodeCases(_Smoothness): |
test = smoothness.Smoothness |
page_set = page_sets.ToughImageDecodeCasesPageSet |
@@ -320,7 +333,7 @@ class SmoothnessToughImageDecodeCases(perf_benchmark.PerfBenchmark): |
return 'smoothness.tough_image_decode_cases' |
@benchmark.Disabled('android') # http://crbug.com/513699 |
-class SmoothnessImageDecodingCases(perf_benchmark.PerfBenchmark): |
+class SmoothnessImageDecodingCases(_Smoothness): |
"""Measures decoding statistics for jpeg images. |
""" |
test = smoothness.Smoothness |
@@ -336,7 +349,7 @@ class SmoothnessImageDecodingCases(perf_benchmark.PerfBenchmark): |
@benchmark.Disabled('android') # http://crbug.com/513699 |
-class SmoothnessGpuImageDecodingCases(perf_benchmark.PerfBenchmark): |
+class SmoothnessGpuImageDecodingCases(_Smoothness): |
"""Measures decoding statistics for jpeg images with GPU rasterization. |
""" |
tag = 'gpu_rasterization_and_decoding' |
@@ -354,7 +367,7 @@ class SmoothnessGpuImageDecodingCases(perf_benchmark.PerfBenchmark): |
@benchmark.Enabled('android') |
-class SmoothnessPathologicalMobileSites(perf_benchmark.PerfBenchmark): |
+class SmoothnessPathologicalMobileSites(_Smoothness): |
"""Measures task execution statistics while scrolling pathological sites. |
""" |
test = smoothness.Smoothness |
@@ -365,7 +378,7 @@ class SmoothnessPathologicalMobileSites(perf_benchmark.PerfBenchmark): |
return 'smoothness.pathological_mobile_sites' |
-class SmoothnessToughAnimatedImageCases(perf_benchmark.PerfBenchmark): |
+class SmoothnessToughAnimatedImageCases(_Smoothness): |
test = smoothness.Smoothness |
page_set = page_sets.ToughAnimatedImageCasesPageSet |
@@ -375,7 +388,7 @@ class SmoothnessToughAnimatedImageCases(perf_benchmark.PerfBenchmark): |
@benchmark.Disabled('reference') # http://crbug.com/499489 |
-class SmoothnessToughTextureUploadCases(perf_benchmark.PerfBenchmark): |
+class SmoothnessToughTextureUploadCases(_Smoothness): |
test = smoothness.Smoothness |
page_set = page_sets.ToughTextureUploadCasesPageSet |
@@ -385,7 +398,7 @@ class SmoothnessToughTextureUploadCases(perf_benchmark.PerfBenchmark): |
@benchmark.Disabled('reference') # http://crbug.com/496684 |
-class SmoothnessToughAdCases(perf_benchmark.PerfBenchmark): |
+class SmoothnessToughAdCases(_Smoothness): |
"""Measures rendering statistics while displaying advertisements.""" |
test = smoothness.Smoothness |
page_set = page_sets.ToughAdCasesPageSet |
@@ -398,7 +411,7 @@ class SmoothnessToughAdCases(perf_benchmark.PerfBenchmark): |
# http://crbug.com/496684 (reference) |
# http://crbug.com/522619 (mac/win) |
@benchmark.Disabled('reference', 'win', 'mac') |
-class SmoothnessScrollingToughAdCases(perf_benchmark.PerfBenchmark): |
+class SmoothnessScrollingToughAdCases(_Smoothness): |
"""Measures rendering statistics while scrolling advertisements.""" |
test = smoothness.Smoothness |
page_set = page_sets.ScrollingToughAdCasesPageSet |
@@ -411,8 +424,7 @@ class SmoothnessScrollingToughAdCases(perf_benchmark.PerfBenchmark): |
# http://crbug.com/496684 (reference) |
# http://crbug.com/522619 (mac/win) |
@benchmark.Disabled('reference', 'win', 'mac') |
-class SmoothnessBidirectionallyScrollingToughAdCases( |
- perf_benchmark.PerfBenchmark): |
+class SmoothnessBidirectionallyScrollingToughAdCases(_Smoothness): |
"""Measures rendering statistics while scrolling advertisements.""" |
test = smoothness.Smoothness |
page_set = page_sets.BidirectionallyScrollingToughAdCasesPageSet |
@@ -427,7 +439,7 @@ class SmoothnessBidirectionallyScrollingToughAdCases( |
@benchmark.Disabled('reference') # http://crbug.com/496684 |
-class SmoothnessToughWebGLAdCases(perf_benchmark.PerfBenchmark): |
+class SmoothnessToughWebGLAdCases(_Smoothness): |
"""Measures rendering statistics while scrolling advertisements.""" |
test = smoothness.Smoothness |
page_set = page_sets.ToughWebglAdCasesPageSet |