[Telemetry] Create loading.desktop, a desktop analog for loading.mobile

tools/perf/benchmarks/loading.py

 # Copyright 2016 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.
 
 from core import perf_benchmark
 import page_sets
 
 import ct_benchmarks_util
 from benchmarks import page_cycler_v2
 from telemetry import benchmark
 from telemetry.page import cache_temperature
 from telemetry.page import traffic_setting
 from telemetry.web_perf import timeline_based_measurement
 
 
 class _LoadingBase(perf_benchmark.PerfBenchmark):
   """ A base class for loading benchmarks. """
 
   options = {'pageset_repeat': 2}
+  SUBNAME = None
 
   def CreateTimelineBasedMeasurementOptions(self):
     tbm_options = timeline_based_measurement.Options()
     page_cycler_v2.AugmentOptionsForLoadingMetrics(tbm_options)
     return tbm_options
 
+  @classmethod
+  def Name(cls):
+    assert cls.SUBNAME
+    return 'loading.%s' % cls.SUBNAME

[nednguyen, 2017/04/26 21:02:36]

its' better just uses the raw strings so people can code search for it.

[rnephew (Reviews Here), 2017/04/26 21:15:43]

Acknowledged.

+
+
+@benchmark.Disabled('android')
+@benchmark.Owner(emails=['kouhei@chormium.org', 'ksakamoto@chromium.org'])
+class LoadingDesktop(_LoadingBase):
+  """ A benchmark measuring loading performance of desktop sites. """
+  SUBNAME = 'desktop'
+
+  @classmethod
+  def ShouldDisable(cls, possible_browser):
+    return possible_browser.browser_type == 'reference'
+
+  def CreateStorySet(self, options):
+    return page_sets.LoadingDesktopStorySet(
+        cache_temperatures=[cache_temperature.ANY])

[nednguyen, 2017/04/26 21:02:36]

I think we would need cold & warm cache 

[rnephew (Reviews Here), 2017/04/26 21:15:43]

The existing loading.mobile benchmark uses the same cache setting as this does.
Is there a reason we would want it here and not there?

[nednguyen, 2017/05/01 19:50:47]

Not sure, but for now, we need to make sure that this matches the existing
page_cycler_v2 benchmarks, which include:
pageset_repeat = 2
cache_temperatures=[
          cache_temperature.PCV1_COLD, cache_temperature.PCV1_WARM]

(https://cs.chromium.org/chromium/src/tools/perf/benchmarks/page_cycler_v2.py?...)

+
 
 @benchmark.Enabled('android')
 @benchmark.Owner(emails=['kouhei@chromium.org', 'ksakamoto@chromium.org'])
 class LoadingMobile(_LoadingBase):
   """ A benchmark measuring loading performance of mobile sites. """
+  SUBNAME = 'mobile'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     # crbug.com/619254
     if possible_browser.browser_type == 'reference':
       return True
 
     # crbug.com/676612
     if ((possible_browser.platform.GetDeviceTypeName() == 'Nexus 6' or
          possible_browser.platform.GetDeviceTypeName() == 'AOSP on Shamu') and
         possible_browser.browser_type == 'android-webview'):
       return True
 
     return False
 
-  @classmethod
-  def Name(cls):
-    return 'loading.mobile'
-
   def CreateStorySet(self, options):
     return page_sets.LoadingMobileStorySet(
         cache_temperatures=[cache_temperature.ANY],
         traffic_settings=[traffic_setting.NONE, traffic_setting.REGULAR_3G])
 
 
 # Disabled because we do not plan on running CT benchmarks on the perf
 # waterfall any time soon.
 @benchmark.Disabled('all')
 class LoadingClusterTelemetry(_LoadingBase):
 
   options = {'upload_results': True}
 
   _ALL_NET_CONFIGS = traffic_setting.NETWORK_CONFIGS.keys()
 
-  @classmethod
-  def Name(cls):
-    return 'loading.cluster_telemetry'
+  SUBNAME = 'cluster_telemetry'
+
 
   @classmethod
   def AddBenchmarkCommandLineArgs(cls, parser):
     super(LoadingClusterTelemetry, cls).AddBenchmarkCommandLineArgs(parser)
     ct_benchmarks_util.AddBenchmarkCommandLineArgs(parser)
     parser.add_option(
         '--wait-time',  action='store', type='int',
         default=60, help='Number of seconds to wait for after navigation.')
     parser.add_option(
         '--traffic-setting',  choices=cls._ALL_NET_CONFIGS,
         default=traffic_setting.REGULAR_4G,
         help='Traffic condition (string). Default to "%%default". Can be: %s' %
          ', '.join(cls._ALL_NET_CONFIGS))
 
   def CreateStorySet(self, options):
     def Wait(action_runner):
       action_runner.Wait(options.wait_time)
     return page_sets.CTPageSet(
       options.urls_list, options.user_agent, options.archive_data_file,
       traffic_setting=options.traffic_setting,
       run_page_interaction_callback=Wait)