Clean up GPU Rasterization versions of Smoothness benchmarks

tools/perf/benchmarks/smoothness.py

 # Copyright 2013 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 multiprocessing
 
 from core import perf_benchmark
 
 from benchmarks import silk_flags
 from measurements import smoothness
 import page_sets
@@ skipping 160 matching lines @@
   def CreateStorySet(self, options):
     stories = super(SmoothnessKeySilkCases, self).CreateStorySet(options)
     # Page26 (befamous) is too noisy to be useful; crbug.com/461127
     to_remove = [story for story in stories
                  if isinstance(story, page_sets.key_silk_cases.Page26)]
     for story in to_remove:
       stories.RemoveStory(story)
     return stories
 
 
-@benchmark.Enabled('android', 'mac')
+@benchmark.Enabled('android')
 class SmoothnessGpuRasterizationTop25(_Smoothness):
   """Measures rendering statistics for the top 25 with GPU rasterization.
   """
   tag = 'gpu_rasterization'
   page_set = page_sets.Top25SmoothPageSet
 
   def SetExtraBrowserOptions(self, options):
     silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
 
   @classmethod
   def Name(cls):
     return 'smoothness.gpu_rasterization.top_25_smooth'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):  # http://crbug.com/597656
       return (possible_browser.browser_type == 'reference' and
               possible_browser.platform.GetDeviceTypeName() == 'Nexus 5X')
 
 
+# Although GPU rasterization is enabled on Mac, it is blacklisted for certain
+# path cases, so it is still valuable to run both the GPU and non-GPU versions
+# of this benchmark on Mac.
 class SmoothnessGpuRasterizationToughPathRenderingCases(_Smoothness):
   """Tests a selection of pages with SVG and 2D canvas paths with GPU
   rasterization.
   """
   tag = 'gpu_rasterization'
   page_set = page_sets.ToughPathRenderingCasesPageSet
 
   def SetExtraBrowserOptions(self, options):
     silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
 
   @classmethod
   def Name(cls):
     return 'smoothness.gpu_rasterization.tough_path_rendering_cases'
 
 
+# With GPU Raster enabled on Mac, there's no reason to run this benchmark in
+# addition to SmoothnessFiltersCases.
+@benchmark.Disabled('mac')
 class SmoothnessGpuRasterizationFiltersCases(_Smoothness):
   """Tests a selection of pages with SVG and CSS filter effects with GPU
   rasterization.
   """
   tag = 'gpu_rasterization'
   page_set = page_sets.ToughFiltersCasesPageSet
 
   def SetExtraBrowserOptions(self, options):
     silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
 
@@ skipping 60 matching lines @@
 
   @classmethod
   def Name(cls):
     return 'smoothness.tough_pinch_zoom_cases'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     return cls.IsSvelte(possible_browser)  # http://crbug.com/564008
 
 
-@benchmark.Enabled('chromeos', 'mac')
+@benchmark.Enabled('mac')
 class SmoothnessDesktopToughPinchZoomCases(_Smoothness):
   """Measures rendering statistics for pinch-zooming in the tough pinch zoom
   cases. Uses lower zoom levels customized for desktop limits.
   """
   page_set = page_sets.DesktopToughPinchZoomCasesPageSet
 
   @classmethod
   def Name(cls):
     return 'smoothness.desktop_tough_pinch_zoom_cases'
 
@@ skipping 15 matching lines @@
 
   @classmethod
   def Name(cls):
     return 'smoothness.gpu_rasterization.tough_pinch_zoom_cases'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     return cls.IsSvelte(possible_browser)  # http://crbug.com/564008
 
 
-@benchmark.Enabled('chromeos', 'mac')

[ericrk, 2016/05/26 18:18:52]

This never ran on ChromeOS - adding ChromeOS to this when I added it was a
mistake.

-class SmoothnessGpuRasterizationDesktopToughPinchZoomCases(_Smoothness):
-  """Measures rendering statistics for pinch-zooming in the tough pinch zoom
-  cases with GPU rasterization. Uses lower zoom levels customized for desktop
-  limits.
-  """
-  tag = 'gpu_rasterization'
-  test = smoothness.Smoothness
-  page_set = page_sets.DesktopToughPinchZoomCasesPageSet
-
-  def SetExtraBrowserOptions(self, options):
-    silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
-
-  @classmethod
-  def Name(cls):
-    return 'smoothness.gpu_rasterization.desktop_tough_pinch_zoom_cases'
-
-
 @benchmark.Enabled('android', 'chromeos')
 class SmoothnessToughScrollingWhileZoomedInCases(_Smoothness):
   """Measures rendering statistics for pinch-zooming then diagonal scrolling"""
   page_set = page_sets.ToughScrollingWhileZoomedInCasesPageSet
 
   @classmethod
   def Name(cls):
     return 'smoothness.tough_scrolling_while_zoomed_in_cases'
 
 
@@ skipping 32 matching lines @@
     # Only keep 'mean_pixels_approximated' and 'mean_pixels_checkerboarded'
     # metrics. (crbug.com/529331)
     return value.name in ('mean_pixels_approximated',
                           'mean_pixels_checkerboarded')
 
   @classmethod
   def Name(cls):
     return 'smoothness.tough_scrolling_cases'
 
 
-@benchmark.Enabled('android', 'mac')
+@benchmark.Enabled('android')
 class SmoothnessGpuRasterizationToughScrollingCases(_Smoothness):
   tag = 'gpu_rasterization'
   test = smoothness.Smoothness
   page_set = page_sets.ToughScrollingCasesPageSet
 
   def SetExtraBrowserOptions(self, options):
     silk_flags.CustomizeBrowserOptionsForGpuRasterization(options)
 
   @classmethod
   def Name(cls):
@@ skipping 120 matching lines @@
   """Measures rendering statistics while scrolling advertisements."""
   page_set = page_sets.SyntheticToughWebglAdCasesPageSet
 
   @classmethod
   def Name(cls):
     return 'smoothness.tough_webgl_ad_cases'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     return cls.IsSvelte(possible_browser)  # http://crbug.com/574485