Commit 117effd6 authored by Annie Sullivan's avatar Annie Sullivan Committed by Commit Bot

Update name of CreateTimelineBasedMeasurementOptions to CreateCoreTimelineBasedMeasurementOptions.

This is being renamed in https://codereview.chromium.org/2965383002/
This CL should land after that CL rolls into chromium.

Change-Id: Id36c421709d40de22771a241d431aa9c19be355b
Reviewed-on: https://chromium-review.googlesource.com/570678Reviewed-by: default avatarNed Nguyen <nednguyen@google.com>
Reviewed-by: default avatarDerek Cheng <imcheng@chromium.org>
Commit-Queue: Annie Sullivan <sullivan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486846}
parent 49b77ab7
...@@ -41,7 +41,7 @@ class _BaseCastBenchmark(perf_benchmark.PerfBenchmark): ...@@ -41,7 +41,7 @@ class _BaseCastBenchmark(perf_benchmark.PerfBenchmark):
class TraceEventCastBenckmark(_BaseCastBenchmark): class TraceEventCastBenckmark(_BaseCastBenchmark):
"""Benchmark for dialog latency from trace event.""" """Benchmark for dialog latency from trace event."""
def CreateTimelineBasedMeasurementOptions(self): def CreateCoreTimelineBasedMeasurementOptions(self):
media_router_category = 'media_router' media_router_category = 'media_router'
category_filter = chrome_trace_category_filter.ChromeTraceCategoryFilter( category_filter = chrome_trace_category_filter.ChromeTraceCategoryFilter(
media_router_category) media_router_category)
......
...@@ -13,7 +13,7 @@ from telemetry import benchmark ...@@ -13,7 +13,7 @@ from telemetry import benchmark
# are the primary means of benchmarking power. # are the primary means of benchmarking power.
class _BattOrBenchmark(perf_benchmark.PerfBenchmark): class _BattOrBenchmark(perf_benchmark.PerfBenchmark):
def CreateTimelineBasedMeasurementOptions(self): def CreateCoreTimelineBasedMeasurementOptions(self):
category_filter = chrome_trace_category_filter.ChromeTraceCategoryFilter( category_filter = chrome_trace_category_filter.ChromeTraceCategoryFilter(
filter_string='toplevel') filter_string='toplevel')
options = timeline_based_measurement.Options(category_filter) options = timeline_based_measurement.Options(category_filter)
......
...@@ -21,7 +21,7 @@ class BlobStorage(perf_benchmark.PerfBenchmark): ...@@ -21,7 +21,7 @@ class BlobStorage(perf_benchmark.PerfBenchmark):
page_set = page_sets.BlobWorkshopPageSet page_set = page_sets.BlobWorkshopPageSet
def CreateTimelineBasedMeasurementOptions(self): def CreateCoreTimelineBasedMeasurementOptions(self):
cat_filter = chrome_trace_category_filter.ChromeTraceCategoryFilter() cat_filter = chrome_trace_category_filter.ChromeTraceCategoryFilter()
cat_filter.AddIncludedCategory(BLOB_CATEGORY) cat_filter.AddIncludedCategory(BLOB_CATEGORY)
cat_filter.AddIncludedCategory(TIMELINE_REQUIRED_CATEGORY) cat_filter.AddIncludedCategory(TIMELINE_REQUIRED_CATEGORY)
......
...@@ -107,7 +107,7 @@ class IndexedDbTracing(perf_benchmark.PerfBenchmark): ...@@ -107,7 +107,7 @@ class IndexedDbTracing(perf_benchmark.PerfBenchmark):
"""IndexedDB Performance tests that use tracing.""" """IndexedDB Performance tests that use tracing."""
page_set = page_sets.IndexedDBEndurePageSet page_set = page_sets.IndexedDBEndurePageSet
def CreateTimelineBasedMeasurementOptions(self): def CreateCoreTimelineBasedMeasurementOptions(self):
cat_filter = chrome_trace_category_filter.ChromeTraceCategoryFilter() cat_filter = chrome_trace_category_filter.ChromeTraceCategoryFilter()
cat_filter.AddIncludedCategory(IDB_CATEGORY) cat_filter.AddIncludedCategory(IDB_CATEGORY)
cat_filter.AddIncludedCategory(TIMELINE_REQUIRED_CATEGORY) cat_filter.AddIncludedCategory(TIMELINE_REQUIRED_CATEGORY)
......
...@@ -17,7 +17,7 @@ class _LoadingBase(perf_benchmark.PerfBenchmark): ...@@ -17,7 +17,7 @@ class _LoadingBase(perf_benchmark.PerfBenchmark):
options = {'pageset_repeat': 2} options = {'pageset_repeat': 2}
def CreateTimelineBasedMeasurementOptions(self): def CreateCoreTimelineBasedMeasurementOptions(self):
tbm_options = timeline_based_measurement.Options() tbm_options = timeline_based_measurement.Options()
loading_metrics_category.AugmentOptionsForLoadingMetrics(tbm_options) loading_metrics_category.AugmentOptionsForLoadingMetrics(tbm_options)
return tbm_options return tbm_options
......
...@@ -92,7 +92,7 @@ class _MediaTBMv2Benchmark(perf_benchmark.PerfBenchmark): ...@@ -92,7 +92,7 @@ class _MediaTBMv2Benchmark(perf_benchmark.PerfBenchmark):
def CreateStorySet(self, options): def CreateStorySet(self, options):
return page_sets.ToughVideoCasesPageSet(measure_memory=True) return page_sets.ToughVideoCasesPageSet(measure_memory=True)
def CreateTimelineBasedMeasurementOptions(self): def CreateCoreTimelineBasedMeasurementOptions(self):
category_filter = chrome_trace_category_filter.ChromeTraceCategoryFilter() category_filter = chrome_trace_category_filter.ChromeTraceCategoryFilter()
# 'toplevel' category provides CPU time slices used by # cpuTimeMetric. # 'toplevel' category provides CPU time slices used by # cpuTimeMetric.
......
...@@ -27,7 +27,7 @@ class _MemoryInfra(perf_benchmark.PerfBenchmark): ...@@ -27,7 +27,7 @@ class _MemoryInfra(perf_benchmark.PerfBenchmark):
is part of chrome tracing, and extracts it using timeline-based measurements. is part of chrome tracing, and extracts it using timeline-based measurements.
""" """
def CreateTimelineBasedMeasurementOptions(self): def CreateCoreTimelineBasedMeasurementOptions(self):
# Enable only memory-infra, to get memory dumps, and blink.console, to get # Enable only memory-infra, to get memory dumps, and blink.console, to get
# the timeline markers used for mapping threads to tabs. # the timeline markers used for mapping threads to tabs.
trace_memory = chrome_trace_category_filter.ChromeTraceCategoryFilter( trace_memory = chrome_trace_category_filter.ChromeTraceCategoryFilter(
...@@ -161,7 +161,7 @@ class _MemoryV8Benchmark(_MemoryInfra): ...@@ -161,7 +161,7 @@ class _MemoryV8Benchmark(_MemoryInfra):
r'renderer_processes:' r'renderer_processes:'
r'(reported_by_chrome:v8|reported_by_os:system_memory:[^:]+$)') r'(reported_by_chrome:v8|reported_by_os:system_memory:[^:]+$)')
def CreateTimelineBasedMeasurementOptions(self): def CreateCoreTimelineBasedMeasurementOptions(self):
v8_categories = [ v8_categories = [
'blink.console', 'renderer.scheduler', 'v8', 'webkit.console'] 'blink.console', 'renderer.scheduler', 'v8', 'webkit.console']
memory_categories = ['blink.console', 'disabled-by-default-memory-infra'] memory_categories = ['blink.console', 'disabled-by-default-memory-infra']
......
...@@ -15,7 +15,7 @@ from telemetry.web_perf import timeline_based_measurement ...@@ -15,7 +15,7 @@ from telemetry.web_perf import timeline_based_measurement
class _OopifBase(perf_benchmark.PerfBenchmark): class _OopifBase(perf_benchmark.PerfBenchmark):
options = {'pageset_repeat': 2} options = {'pageset_repeat': 2}
def CreateTimelineBasedMeasurementOptions(self): def CreateCoreTimelineBasedMeasurementOptions(self):
tbm_options = timeline_based_measurement.Options() tbm_options = timeline_based_measurement.Options()
loading_metrics_category.AugmentOptionsForLoadingMetrics(tbm_options) loading_metrics_category.AugmentOptionsForLoadingMetrics(tbm_options)
return tbm_options return tbm_options
......
...@@ -79,7 +79,7 @@ class OortOnlineTBMv2(perf_benchmark.PerfBenchmark): ...@@ -79,7 +79,7 @@ class OortOnlineTBMv2(perf_benchmark.PerfBenchmark):
pass # http://oortonline.gl/#run not disabled. pass # http://oortonline.gl/#run not disabled.
return StoryExpectations() return StoryExpectations()
def CreateTimelineBasedMeasurementOptions(self): def CreateCoreTimelineBasedMeasurementOptions(self):
categories = [ categories = [
# Implicitly disable all categories. # Implicitly disable all categories.
'-*', '-*',
......
...@@ -76,7 +76,7 @@ class IdlePlatformBenchmark(perf_benchmark.PerfBenchmark): ...@@ -76,7 +76,7 @@ class IdlePlatformBenchmark(perf_benchmark.PerfBenchmark):
Our power benchmarks are prone to noise caused by other things running on the Our power benchmarks are prone to noise caused by other things running on the
system. This benchmark is intended to help find the sources of noise. system. This benchmark is intended to help find the sources of noise.
""" """
def CreateTimelineBasedMeasurementOptions(self): def CreateCoreTimelineBasedMeasurementOptions(self):
options = timeline_based_measurement.Options( options = timeline_based_measurement.Options(
chrome_trace_category_filter.ChromeTraceCategoryFilter()) chrome_trace_category_filter.ChromeTraceCategoryFilter())
options.config.enable_battor_trace = True options.config.enable_battor_trace = True
......
...@@ -19,7 +19,7 @@ class _StartupPerfBenchmark(perf_benchmark.PerfBenchmark): ...@@ -19,7 +19,7 @@ class _StartupPerfBenchmark(perf_benchmark.PerfBenchmark):
'--enable-stats-collection-bindings' '--enable-stats-collection-bindings'
]) ])
def CreateTimelineBasedMeasurementOptions(self): def CreateCoreTimelineBasedMeasurementOptions(self):
startup_category_filter = ( startup_category_filter = (
chrome_trace_category_filter.ChromeTraceCategoryFilter( chrome_trace_category_filter.ChromeTraceCategoryFilter(
filter_string='startup,blink.user_timing')) filter_string='startup,blink.user_timing'))
......
...@@ -33,7 +33,7 @@ class _CommonSystemHealthBenchmark(perf_benchmark.PerfBenchmark): ...@@ -33,7 +33,7 @@ class _CommonSystemHealthBenchmark(perf_benchmark.PerfBenchmark):
https://goo.gl/Jek2NL. https://goo.gl/Jek2NL.
""" """
def CreateTimelineBasedMeasurementOptions(self): def CreateCoreTimelineBasedMeasurementOptions(self):
options = timeline_based_measurement.Options( options = timeline_based_measurement.Options(
chrome_trace_category_filter.ChromeTraceCategoryFilter( chrome_trace_category_filter.ChromeTraceCategoryFilter(
filter_string='rail,toplevel')) filter_string='rail,toplevel'))
...@@ -97,7 +97,7 @@ class _MemorySystemHealthBenchmark(perf_benchmark.PerfBenchmark): ...@@ -97,7 +97,7 @@ class _MemorySystemHealthBenchmark(perf_benchmark.PerfBenchmark):
""" """
options = {'pageset_repeat': 3} options = {'pageset_repeat': 3}
def CreateTimelineBasedMeasurementOptions(self): def CreateCoreTimelineBasedMeasurementOptions(self):
options = timeline_based_measurement.Options( options = timeline_based_measurement.Options(
chrome_trace_category_filter.ChromeTraceCategoryFilter( chrome_trace_category_filter.ChromeTraceCategoryFilter(
'-*,disabled-by-default-memory-infra')) '-*,disabled-by-default-memory-infra'))
...@@ -178,7 +178,7 @@ class WebviewStartupSystemHealthBenchmark(perf_benchmark.PerfBenchmark): ...@@ -178,7 +178,7 @@ class WebviewStartupSystemHealthBenchmark(perf_benchmark.PerfBenchmark):
def GetExpectations(self): def GetExpectations(self):
return page_sets.SystemHealthWebviewStartupExpectations() return page_sets.SystemHealthWebviewStartupExpectations()
def CreateTimelineBasedMeasurementOptions(self): def CreateCoreTimelineBasedMeasurementOptions(self):
options = timeline_based_measurement.Options() options = timeline_based_measurement.Options()
options.SetTimelineBasedMetrics(['webviewStartupMetric']) options.SetTimelineBasedMetrics(['webviewStartupMetric'])
options.config.enable_atrace_trace = True options.config.enable_atrace_trace = True
......
...@@ -20,7 +20,7 @@ class TracingWithDebugOverhead(perf_benchmark.PerfBenchmark): ...@@ -20,7 +20,7 @@ class TracingWithDebugOverhead(perf_benchmark.PerfBenchmark):
page_set = page_sets.Top10PageSet page_set = page_sets.Top10PageSet
def CreateTimelineBasedMeasurementOptions(self): def CreateCoreTimelineBasedMeasurementOptions(self):
options = timeline_based_measurement.Options( options = timeline_based_measurement.Options(
timeline_based_measurement.DEBUG_OVERHEAD_LEVEL) timeline_based_measurement.DEBUG_OVERHEAD_LEVEL)
options.SetTimelineBasedMetrics(['tracingMetric']) options.SetTimelineBasedMetrics(['tracingMetric'])
...@@ -45,7 +45,7 @@ class TracingWithBackgroundMemoryInfra(perf_benchmark.PerfBenchmark): ...@@ -45,7 +45,7 @@ class TracingWithBackgroundMemoryInfra(perf_benchmark.PerfBenchmark):
"""Measures the overhead of background memory-infra dumps""" """Measures the overhead of background memory-infra dumps"""
page_set = page_sets.Top10PageSet page_set = page_sets.Top10PageSet
def CreateTimelineBasedMeasurementOptions(self): def CreateCoreTimelineBasedMeasurementOptions(self):
# Enable only memory-infra category with periodic background mode dumps # Enable only memory-infra category with periodic background mode dumps
# every 200 milliseconds. # every 200 milliseconds.
trace_memory = chrome_trace_category_filter.ChromeTraceCategoryFilter( trace_memory = chrome_trace_category_filter.ChromeTraceCategoryFilter(
......
...@@ -46,7 +46,7 @@ class _Top25RuntimeStats(perf_benchmark.PerfBenchmark): ...@@ -46,7 +46,7 @@ class _Top25RuntimeStats(perf_benchmark.PerfBenchmark):
options.AppendExtraBrowserArgs( options.AppendExtraBrowserArgs(
'--enable-blink-features=BlinkRuntimeCallStats') '--enable-blink-features=BlinkRuntimeCallStats')
def CreateTimelineBasedMeasurementOptions(self): def CreateCoreTimelineBasedMeasurementOptions(self):
# TODO(fmeawad): most of the cat_filter information is extracted from # TODO(fmeawad): most of the cat_filter information is extracted from
# page_cycler_v2 TimelineBasedMeasurementOptionsForLoadingMetric because # page_cycler_v2 TimelineBasedMeasurementOptionsForLoadingMetric because
# used by the loadingMetric because the runtimeStatsMetric uses the # used by the loadingMetric because the runtimeStatsMetric uses the
......
...@@ -53,7 +53,7 @@ class _V8BrowsingBenchmark(_v8BrowsingBenchmarkBaseClass): ...@@ -53,7 +53,7 @@ class _V8BrowsingBenchmark(_v8BrowsingBenchmarkBaseClass):
See browsing_stories._BrowsingStory for workload description. See browsing_stories._BrowsingStory for workload description.
""" """
def CreateTimelineBasedMeasurementOptions(self): def CreateCoreTimelineBasedMeasurementOptions(self):
categories = [ categories = [
# Disable all categories by default. # Disable all categories by default.
'-*', '-*',
...@@ -109,7 +109,7 @@ class _V8RuntimeStatsBrowsingBenchmark(_v8BrowsingBenchmarkBaseClass): ...@@ -109,7 +109,7 @@ class _V8RuntimeStatsBrowsingBenchmark(_v8BrowsingBenchmarkBaseClass):
See browsing_stories._BrowsingStory for workload description. See browsing_stories._BrowsingStory for workload description.
""" """
def CreateTimelineBasedMeasurementOptions(self): def CreateCoreTimelineBasedMeasurementOptions(self):
categories = [ categories = [
# Disable all categories by default. # Disable all categories by default.
'-*', '-*',
......
...@@ -21,7 +21,7 @@ class WebrtcPerfBenchmark(perf_benchmark.PerfBenchmark): ...@@ -21,7 +21,7 @@ class WebrtcPerfBenchmark(perf_benchmark.PerfBenchmark):
def Name(cls): def Name(cls):
return 'webrtc' return 'webrtc'
def CreateTimelineBasedMeasurementOptions(self): def CreateCoreTimelineBasedMeasurementOptions(self):
categories = [ categories = [
# Disable all categories by default. # Disable all categories by default.
'-*', '-*',
......
...@@ -19,7 +19,7 @@ from telemetry.web_perf import timeline_based_measurement ...@@ -19,7 +19,7 @@ from telemetry.web_perf import timeline_based_measurement
class _PageCyclerV2(perf_benchmark.PerfBenchmark): class _PageCyclerV2(perf_benchmark.PerfBenchmark):
options = {'pageset_repeat': 2} options = {'pageset_repeat': 2}
def CreateTimelineBasedMeasurementOptions(self): def CreateCoreTimelineBasedMeasurementOptions(self):
tbm_options = timeline_based_measurement.Options() tbm_options = timeline_based_measurement.Options()
loading_metrics_category.AugmentOptionsForLoadingMetrics(tbm_options) loading_metrics_category.AugmentOptionsForLoadingMetrics(tbm_options)
return tbm_options return tbm_options
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment