Delete thread times benchmarks

Now that the thread_times.__ benchmarks are merged into the rendering
benchmarks, remove benchmarks in thread_times.py and unnecessary
page set json files. Since oop_raster.py benchmarks use
thread_times._ThreadTimes, leave this for now.

Remove page_sets/polymer.py because it has been entirely replaced by
page_sets/rendering/polymer.py.

Bug: 855063
Change-Id: Ie78a503d3a0b09ad696b6d375c2af7b60483d39f
Reviewed-on: https://chromium-review.googlesource.com/1120949
Commit-Queue: Amy Qiu <amyqiu@google.com>
Reviewed-by: Ned Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#571678}

tools/perf/benchmark.csv

@@ -63,14 +63,6 @@ system_health.memory_desktop,perezju@chromium.org,
 system_health.memory_mobile,perezju@chromium.org,
 system_health.webview_startup,"perezju@chromium.org, torne@chromium.org, changwan@chromium.org",Mobile>WebView>Perf
 tab_switching.typical_25,vovoy@chromium.org,OS>Performance
-thread_times.key_hit_test_cases,"vmiura@chromium.org, sadrul@chromium.org",
-thread_times.key_idle_power_cases,skyostil@chromium.org,
-thread_times.key_mobile_sites_smooth,vmiura@chromium.org,
-thread_times.key_noop_cases,"vmiura@chromium.org, sadrul@chromium.org",
-thread_times.key_silk_cases,vmiura@chromium.org,
-thread_times.simple_mobile_sites,vmiura@chromium.org,
-thread_times.tough_compositor_cases,vmiura@chromium.org,
-thread_times.tough_scrolling_cases,"bokan@chromium.org, nzolghadr@chromium.org",
 tracing.tracing_with_background_memory_infra,ssid@chromium.org,
 tracing_perftests,"kkraynov@chromium.org, primiano@chromium.org",
 v8.browsing_desktop,"mythria@chromium.org, ulan@chromium.org",

tools/perf/benchmarks/thread_times.py

@@ -3,11 +3,7 @@
 # found in the LICENSE file.
 
 from core import perf_benchmark
-
 from measurements import thread_times
-import page_sets
-from telemetry import benchmark
-from telemetry import story
 
 
 class _ThreadTimes(perf_benchmark.PerfBenchmark):
@@ -24,114 +20,3 @@ class _ThreadTimes(perf_benchmark.PerfBenchmark):
 
   def CreatePageTest(self, options):
     return thread_times.ThreadTimes(report_silk_details=True)
-
-
-@benchmark.Owner(emails=['vmiura@chromium.org'])
-class ThreadTimesKeySilkCases(_ThreadTimes):
-  """Measures timeline metrics while performing smoothness action on key silk
-  cases."""
-  page_set = page_sets.KeySilkCasesPageSet
-  SUPPORTED_PLATFORMS = [story.expectations.ALL_MOBILE]
-
-  @classmethod
-  def Name(cls):
-    return 'thread_times.key_silk_cases'
-
-@benchmark.Owner(emails=['vmiura@chromium.org', 'sadrul@chromium.org'])
-class ThreadTimesKeyHitTestCases(_ThreadTimes):
-  """Measure timeline metrics while performing smoothness action on key hit
-  testing cases."""
-  page_set = page_sets.KeyHitTestCasesPageSet
-  SUPPORTED_PLATFORMS = [
-      story.expectations.ALL_ANDROID, story.expectations.ALL_LINUX
-  ]
-
-  @classmethod
-  def Name(cls):
-    return 'thread_times.key_hit_test_cases'
-
-
-@benchmark.Owner(emails=['vmiura@chromium.org'])
-class ThreadTimesKeyMobileSitesSmooth(_ThreadTimes):
-  """Measures timeline metrics while performing smoothness action on
-  key mobile sites labeled with fast-path tag.
-  http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
-  page_set = page_sets.KeyMobileSitesSmoothPageSet
-  options = {'story_tag_filter': 'fastpath'}
-  SUPPORTED_PLATFORMS = [story.expectations.ALL_MOBILE]
-
-  @classmethod
-  def Name(cls):
-    return 'thread_times.key_mobile_sites_smooth'
-
-
-@benchmark.Owner(emails=['vmiura@chromium.org'])
-class ThreadTimesSimpleMobileSites(_ThreadTimes):
-  """Measures timeline metric using smoothness action on simple mobile sites
-  http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
-  page_set = page_sets.SimpleMobileSitesPageSet
-  SUPPORTED_PLATFORMS = [story.expectations.ALL_MOBILE]
-
-  @classmethod
-  def Name(cls):
-    return 'thread_times.simple_mobile_sites'
-
-
-@benchmark.Owner(emails=['vmiura@chromium.org'])
-class ThreadTimesCompositorCases(_ThreadTimes):
-  """Measures timeline metrics while performing smoothness action on
-  tough compositor cases, using software rasterization.
-
-  http://www.chromium.org/developers/design-documents/rendering-benchmarks"""
-  page_set = page_sets.ToughCompositorCasesPageSet
-
-  @classmethod
-  def Name(cls):
-    return 'thread_times.tough_compositor_cases'
-
-
-@benchmark.Owner(emails=['skyostil@chromium.org'])
-class ThreadTimesKeyIdlePowerCases(_ThreadTimes):
-  """Measures timeline metrics for sites that should be idle in foreground
-  and background scenarios. The metrics are per-second rather than per-frame."""
-  page_set = page_sets.KeyIdlePowerCasesPageSet
-  SUPPORTED_PLATFORMS = [story.expectations.ALL_MOBILE]
-
-  @classmethod
-  def Name(cls):
-    return 'thread_times.key_idle_power_cases'
-
-  @classmethod
-  def ShouldAddValue(cls, name, from_first_story_run):
-    del from_first_story_run  # unused
-    # Only report per-second metrics.
-    return 'per_frame' not in name and 'mean_frame' not in name
-
-
-@benchmark.Owner(emails=['vmiura@chromium.org', 'sadrul@chromium.org'])
-class ThreadTimesKeyNoOpCases(_ThreadTimes):
-  """Measures timeline metrics for common interactions and behaviors that should
-  have minimal cost. The metrics are per-second rather than per-frame."""
-  page_set = page_sets.KeyNoOpCasesPageSet
-  SUPPORTED_PLATFORMS = [story.expectations.ALL_MOBILE]
-
-  @classmethod
-  def Name(cls):
-    return 'thread_times.key_noop_cases'
-
-  @classmethod
-  def ShouldAddValue(cls, name, from_first_story_run):
-    del from_first_story_run  # unused
-    # Only report per-second metrics.
-    return 'per_frame' not in name and 'mean_frame' not in name
-
-
-@benchmark.Owner(emails=['bokan@chromium.org', 'nzolghadr@chromium.org'])
-class ThreadTimesToughScrollingCases(_ThreadTimes):
-  """Measure timeline metrics while performing smoothness action on tough
-  scrolling cases."""
-  page_set = page_sets.ToughScrollingCasesPageSet
-
-  @classmethod
-  def Name(cls):
-    return 'thread_times.tough_scrolling_cases'

tools/perf/core/shard_maps/desktop_26_shard_map.json

@@ -179,14 +179,6 @@
             "system_health.memory_mobile": {},
             "system_health.webview_startup": {},
             "tab_switching.typical_25": {},
-            "thread_times.key_hit_test_cases": {},
-            "thread_times.key_idle_power_cases": {},
-            "thread_times.key_mobile_sites_smooth": {},
-            "thread_times.key_noop_cases": {},
-            "thread_times.key_silk_cases": {},
-            "thread_times.simple_mobile_sites": {},
-            "thread_times.tough_compositor_cases": {},
-            "thread_times.tough_scrolling_cases": {},
             "tracing.tracing_with_background_memory_infra": {
                 "end": 1
             }

tools/perf/core/shard_maps/mobile_39_shard_map.json

@@ -263,24 +263,11 @@
     },
     "29": {
         "benchmarks": {
-            "tab_switching.typical_25": {},
-            "thread_times.key_hit_test_cases": {},
-            "thread_times.key_idle_power_cases": {},
-            "thread_times.key_mobile_sites_smooth": {},
-            "thread_times.key_noop_cases": {},
-            "thread_times.key_silk_cases": {},
-            "thread_times.simple_mobile_sites": {
-                "end": 2
-            }
+            "tab_switching.typical_25": {}
         }
     },
     "30": {
         "benchmarks": {
-            "thread_times.simple_mobile_sites": {
-                "begin": 2
-            },
-            "thread_times.tough_compositor_cases": {},
-            "thread_times.tough_scrolling_cases": {},
             "tracing.tracing_with_background_memory_infra": {},
             "v8.browsing_desktop": {},
             "v8.browsing_desktop-future": {},

tools/perf/expectations.config

@@ -194,6 +194,10 @@ crbug.com/685342 [ Nexus_7 ] rendering.mobile/linkedin_pathological [ Skip ]
 crbug.com/822925 [ Android_Webview ] rendering.mobile/yahoo_sports_pathological [ Skip ]
 crbug.com/850295 [ All ] rendering.mobile/aquarium_20k [ Skip ]
 crbug.com/750876 [ All ] rendering.mobile/paper_calculator_hit_test [ Skip ]
+crbug.com/446332 [ All ] rendering.mobile/slide_drawer [ Skip ]
+crbug.com/764825 [ All ] rendering.mobile/swipe_action [ Skip ]
+crbug.com/764825 [ All ] rendering.mobile/masonry [ Skip ]
+crbug.com/338838 [ All ] rendering.mobile/basic_stream [ Skip ]
 
 # Benchmark: rasterize_and_record_micro.top_25
 crbug.com/768010 [ Android_One ] rasterize_and_record_micro.top_25/file://static_top_25/yahoonews.html [ Skip ]
@@ -294,29 +298,6 @@ crbug.com/852888 [ Nexus_5X ] system_health.memory_mobile/background:news:nytime
 # Benchmark: tab_switching.typical_25
 crbug.com/747026 [ Mac ] tab_switching.typical_25/multitab:misc:typical24 [ Skip ]
 
-# Benchmark: thread_times.key_hit_test_cases
-crbug.com/750876 [ All ] thread_times.key_hit_test_cases/* [ Skip ]
-
-# Benchmark: thread_times.key_silk_cases
-crbug.com/446332 [ All ] thread_times.key_silk_cases/slide_drawer [ Skip ]
-crbug.com/764825 [ All ] thread_times.key_silk_cases/swipe_action [ Skip ]
-crbug.com/507865 [ All ] thread_times.key_silk_cases/polymer_topeka [ Skip ]
-crbug.com/764825 [ All ] thread_times.key_silk_cases/famo_us_twitter_demo [ Skip ]
-crbug.com/764825 [ All ] thread_times.key_silk_cases/masonry [ Skip ]
-crbug.com/338838 [ All ] thread_times.key_silk_cases/basic_stream [ Skip ]
-
-# Benchmark: thread_times.tough_scrolling_cases
-crbug.com/783362 [ Android_Webview ] thread_times.tough_scrolling_cases/canvas_15000_pixels_per_second [ Skip ]
-crbug.com/783362 [ Android_Webview ] thread_times.tough_scrolling_cases/canvas_20000_pixels_per_second [ Skip ]
-crbug.com/783362 [ Android_Webview ] thread_times.tough_scrolling_cases/canvas_40000_pixels_per_second [ Skip ]
-crbug.com/783362 [ Android_Webview ] thread_times.tough_scrolling_cases/canvas_50000_pixels_per_second [ Skip ]
-crbug.com/783362 [ Android_Webview ] thread_times.tough_scrolling_cases/canvas_10000_pixels_per_second [ Skip ]
-crbug.com/783362 [ Android_Webview ] thread_times.tough_scrolling_cases/canvas_05000_pixels_per_second [ Skip ]
-crbug.com/783362 [ Android_Webview ] thread_times.tough_scrolling_cases/canvas_30000_pixels_per_second [ Skip ]
-crbug.com/783362 [ Android_Webview ] thread_times.tough_scrolling_cases/canvas_75000_pixels_per_second [ Skip ]
-crbug.com/783362 [ Android_Webview ] thread_times.tough_scrolling_cases/canvas_60000_pixels_per_second [ Skip ]
-crbug.com/783362 [ Android_Webview ] thread_times.tough_scrolling_cases/canvas_90000_pixels_per_second [ Skip ]
-
 # Benchmark: v8.browsing_desktop
 crbug.com/773084 [ Mac ] v8.browsing_desktop/browse:tools:maps [ Skip ]
 crbug.com/788796 [ Linux ] v8.browsing_desktop/browse:media:imgur [ Skip ]

tools/perf/page_sets/data/polymer.json

-{
-    "archives": {
-        "core_scroll_header_panel": {
-            "DEFAULT": "polymer_001.wprgo"
-        },
-        "paper_button": {
-            "DEFAULT": "polymer_001.wprgo"
-        },
-        "paper_calculator": {
-            "DEFAULT": "polymer_001.wprgo"
-        },
-        "paper_checkbox": {
-            "DEFAULT": "polymer_001.wprgo"
-        },
-        "paper_fab": {
-            "DEFAULT": "polymer_001.wprgo"
-        },
-        "paper_icon_button": {
-            "DEFAULT": "polymer_001.wprgo"
-        },
-        "paper_shadow": {
-            "DEFAULT": "polymer_001.wprgo"
-        },
-        "paper_tabs": {
-            "DEFAULT": "polymer_001.wprgo"
-        },
-        "paper_toggle_button": {
-            "DEFAULT": "polymer_001.wprgo"
-        }
-    },
-    "description": "Describes the Web Page Replay archives for a story set. Don't edit by hand! Use record_wpr for updating.",
-    "platform_specific": true
-}

tools/perf/page_sets/data/simple_mobile_sites.json

-{
-    "archives": {
-        "nytimes_scroll": {
-            "DEFAULT": "simple_mobile_sites_002.wprgo"
-        },
-        "ebay_scroll": {
-            "DEFAULT": "simple_mobile_sites_002.wprgo"
-        },
-        "nyc_gov_scroll": {
-            "DEFAULT": "simple_mobile_sites_002.wprgo"
-        },
-        "flickr_scroll": {
-            "DEFAULT": "simple_mobile_sites_002.wprgo"
-        }
-    },
-    "description": "Describes the Web Page Replay archives for a story set. Don't edit by hand! Use record_wpr for updating.",
-    "platform_specific": true
-}

tools/perf/page_sets/data/tough_compositor_cases.json

-{
-    "archives": {
-        "js_full_screen_invalidation": {
-            "DEFAULT": "tough_compositor_cases_001.wprgo"
-        },
-        "new_tilings": {
-            "DEFAULT": "tough_compositor_cases_002.wprgo"
-        },
-        "cc_poster_circle": {
-            "DEFAULT": "tough_compositor_cases_001.wprgo"
-        },
-        "js_poster_circle": {
-            "DEFAULT": "tough_compositor_cases_001.wprgo"
-        },
-        "js_scroll_200_layer_grid": {
-            "DEFAULT": "tough_compositor_cases_001.wprgo"
-        },
-        "cc_scroll_text_only": {
-            "DEFAULT": "tough_compositor_cases_001.wprgo"
-        },
-        "js_scroll_text_only": {
-            "DEFAULT": "tough_compositor_cases_001.wprgo"
-        },
-        "cc_scroll_200_layer_grid": {
-            "DEFAULT": "tough_compositor_cases_001.wprgo"
-        }
-    },
-    "description": "Describes the Web Page Replay archives for a story set. Don't edit by hand! Use record_wpr for updating.",
-    "platform_specific": true
-}

tools/perf/page_sets/rendering/key_hit_test_cases.py

@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 from telemetry.page import shared_page_state
-from telemetry import story
 
 from page_sets.rendering import polymer
 from page_sets.rendering import story_tags
@@ -48,12 +47,3 @@ class PaperCalculatorHitTest(polymer.PolymerPage):
   def TapButton(self, action_runner):
     with action_runner.CreateInteraction('Action_TapAction'):
       action_runner.TapElement(element_function='''window.__tapTarget''')
-
-# TODO(crbug.com/760553):remove this class once thread_times.key_hit_test_cases
-# benchmark is completely replaced by rendering benchmarks
-class KeyHitTestCasesPageSet(story.StorySet):
-
-  def __init__(self):
-    super(KeyHitTestCasesPageSet, self).__init__()
-
-    self.AddStory(PaperCalculatorHitTest(self))

tools/perf/page_sets/rendering/key_idle_power_cases.py

@@ -6,8 +6,6 @@ from page_sets.rendering import rendering_story
 from page_sets.rendering import story_tags
 from page_sets.system_health import platforms
 
-from telemetry import story
-
 
 class KeyIdlePowerPage(rendering_story.RenderingStory):
   ABSTRACT_STORY = True
@@ -82,26 +80,3 @@ class SetTimeoutLongIdlePowerPage(KeyIdlePowerPage):
   # 90 seconds ensures the capture of activity after the 60-second
   # PowerMonitor suspend signal.
   DURATION_SECONDS = 90
-
-
-# TODO(crbug.com/760553):remove this class after
-# thread_times.key_idle_power_cases benchmark is completely replaced
-# by rendering benchmarks
-class KeyIdlePowerCasesPageSet(story.StorySet):
-
-  """ Key idle power cases """
-
-  def __init__(self):
-    super(KeyIdlePowerCasesPageSet, self).__init__()
-
-    page_classes = [
-        BlankIdlePowerPage,
-        AnimatedGifIdlePowerPage,
-        CssAnimationIdlePowerPage,
-        RequestAnimationIdlePowerPage,
-        SetTimeoutIdlePowerPage,
-        SetTimeoutLongIdlePowerPage
-    ]
-
-    for page_class in page_classes:
-      self.AddStory(page_class(self))

tools/perf/page_sets/rendering/key_noop_cases.py

@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 from telemetry.page import shared_page_state
-from telemetry import story
 
 from page_sets.rendering import rendering_story
 from page_sets.rendering import story_tags
@@ -71,19 +70,3 @@ class NoOpScrollPage(NoOpTouchScrollPage):
 class NoOpTouchHandlerPage(NoOpTouchScrollPage):
   BASE_NAME = 'no_op_touch_handler'
   URL = 'file://../key_noop_cases/no_op_touch_handler.html'
-
-
-# TODO(crbug.com/760553):remove this class after
-# thread_times.key_noop_cases benchmark is completely
-# replaced by rendering benchmarks
-class KeyNoOpCasesPageSet(story.StorySet):
-
-  """ Key no-op cases """
-
-  def __init__(self):
-    super(KeyNoOpCasesPageSet, self).__init__()
-
-    self.AddStory(NoOpRafPage(self))
-    self.AddStory(NoOpSetTimeoutPage(self))
-    self.AddStory(NoOpScrollPage(self))
-    self.AddStory(NoOpTouchHandlerPage(self))

tools/perf/page_sets/rendering/simple_mobile_sites.py

@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 from telemetry.page import shared_page_state
-from telemetry import story
 
 from page_sets.rendering import rendering_story
 from page_sets.rendering import story_tags
@@ -55,25 +54,3 @@ class SimpleNYCGovPage(SimplePage):
 class SimpleNYTimesPage(SimplePage):
   BASE_NAME = 'nytimes_scroll'
   URL = 'http://m.nytimes.com/'
-
-
-# TODO(crbug.com/760553):remove this class once smoothness.simple_mobile_sites
-# benchmark is completely replaced by rendering benchmarks
-class SimpleMobileSitesPageSet(story.StorySet):
-  """ Simple mobile sites """
-
-  def __init__(self):
-    super(SimpleMobileSitesPageSet, self).__init__(
-      archive_data_file='../data/simple_mobile_sites.json',
-      cloud_storage_bucket=story.PUBLIC_BUCKET)
-
-    page_classes = [
-      # Why: Scrolls moderately complex pages (up to 60 layers)
-      SimpleEbayPage,
-      SimpleFlickrPage,
-      SimpleNYCGovPage,
-      SimpleNYTimesPage
-    ]
-
-    for page_class in page_classes:
-      self.AddStory(page_class(self))

tools/perf/page_sets/rendering/tough_compositor_cases.py

@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 from telemetry.page import shared_page_state
-from telemetry import story
 
 from page_sets.rendering import rendering_story
 from page_sets.rendering import story_tags
@@ -94,30 +93,3 @@ class JSFullScreenPage(ToughCompositorWaitPage):
 class NewTilingsPage(ToughCompositorWaitPage):
   BASE_NAME = 'new_tilings'
   URL = 'http://jsbin.com/covoqi/1/quiet?NEW_TILINGS'
-
-
-# TODO(crbug.com/760553):remove this class after
-# thread_times.tough_compositor_cases benchmark is completely
-# replaced by rendering benchmarks
-class ToughCompositorCasesPageSet(story.StorySet):
-
-  """ Touch compositor sites """
-
-  def __init__(self):
-    super(ToughCompositorCasesPageSet, self).__init__(
-      archive_data_file='../data/tough_compositor_cases.json',
-      cloud_storage_bucket=story.PUBLIC_BUCKET)
-
-    page_classes = [
-        CCScrollTextPage,
-        JSScrollTextPage,
-        CCScroll200LayerPage,
-        JSScroll200LayerPage,
-        CCPosterCirclePage,
-        JSPosterCirclePage,
-        JSFullScreenPage,
-        NewTilingsPage
-    ]
-
-    for page_class in page_classes:
-      self.AddStory(page_class(self))

tools/perf/page_sets/rendering/tough_scrolling_cases.py

@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 from telemetry.internal.actions import page_action
 from telemetry.page import shared_page_state
-from telemetry import story
 
 from page_sets.rendering import rendering_story
 from page_sets.rendering import story_tags
@@ -282,62 +281,3 @@ class ScrollingCanvas90000Page(ToughFastScrollingPage):
   BASE_NAME = 'canvas_90000_pixels_per_second'
   URL = 'file://../tough_scrolling_cases/canvas.html'
   SPEED_IN_PIXELS_PER_SECOND = 90000
-
-
-# TODO(crbug.com/760553):remove this class after
-# smoothness.tough_scrolling_cases benchmark is completely
-# replaced by rendering benchmarks
-class ToughScrollingCasesPageSet(story.StorySet):
-
-  """
-  Description: A collection of difficult scrolling tests
-  """
-
-  def __init__(self):
-    super(ToughScrollingCasesPageSet, self).__init__()
-
-    page_classes = [
-      ScrollingText5000Page,
-      ScrollingText10000Page,
-      ScrollingText15000Page,
-      ScrollingText20000Page,
-      ScrollingText30000Page,
-      ScrollingText40000Page,
-      ScrollingText50000Page,
-      ScrollingText60000Page,
-      ScrollingText75000Page,
-      ScrollingText90000Page,
-      ScrollingTextHover5000Page,
-      ScrollingTextHover10000Page,
-      ScrollingTextHover15000Page,
-      ScrollingTextHover20000Page,
-      ScrollingTextHover30000Page,
-      ScrollingTextHover40000Page,
-      ScrollingTextHover50000Page,
-      ScrollingTextHover60000Page,
-      ScrollingTextHover75000Page,
-      ScrollingTextHover90000Page,
-      ScrollingTextRaster5000Page,
-      ScrollingTextRaster10000Page,
-      ScrollingTextRaster15000Page,
-      ScrollingTextRaster20000Page,
-      ScrollingTextRaster30000Page,
-      ScrollingTextRaster40000Page,
-      ScrollingTextRaster50000Page,
-      ScrollingTextRaster60000Page,
-      ScrollingTextRaster75000Page,
-      ScrollingTextRaster90000Page,
-      ScrollingCanvas5000Page,
-      ScrollingCanvas10000Page,
-      ScrollingCanvas15000Page,
-      ScrollingCanvas20000Page,
-      ScrollingCanvas30000Page,
-      ScrollingCanvas40000Page,
-      ScrollingCanvas50000Page,
-      ScrollingCanvas60000Page,
-      ScrollingCanvas75000Page,
-      ScrollingCanvas90000Page,
-    ]
-
-    for page_class in page_classes:
-      self.AddStory(page_class(self))