diff options
author | ulan <ulan@chromium.org> | 2015-09-10 11:00:22 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-09-10 18:01:05 +0000 |
commit | afba7e985498e16ad0c1000ea0040f42100c73b5 (patch) | |
tree | 92a16b15b2cb9d9e5908426c0622ed5bd76782d2 /tools | |
parent | 42e96e0bde30efe3aa84f63e688c2f09298f1e16 (diff) | |
download | chromium_src-afba7e985498e16ad0c1000ea0040f42100c73b5.zip chromium_src-afba7e985498e16ad0c1000ea0040f42100c73b5.tar.gz chromium_src-afba7e985498e16ad0c1000ea0040f42100c73b5.tar.bz2 |
Remove memory.idle_multi_tab benchmark because it is too noisy.
BUG=495022
CQ_EXTRA_TRYBOTS=tryserver.chromium.perf:linux_perf_bisect;tryserver.chromium.perf:mac_perf_bisect;tryserver.chromium.perf:win_perf_bisect
Review URL: https://codereview.chromium.org/1333923002
Cr-Commit-Position: refs/heads/master@{#348184}
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/benchmarks/memory.py | 20 | ||||
-rw-r--r-- | tools/perf/page_sets/idle_multi_tab_cases.js | 19 | ||||
-rw-r--r-- | tools/perf/page_sets/idle_multi_tab_cases.py | 53 | ||||
-rw-r--r-- | tools/perf/page_sets/page_reload_cases.py | 12 |
4 files changed, 1 insertions, 103 deletions
diff --git a/tools/perf/benchmarks/memory.py b/tools/perf/benchmarks/memory.py index 69a9372..c796b6e 100644 --- a/tools/perf/benchmarks/memory.py +++ b/tools/perf/benchmarks/memory.py @@ -30,24 +30,6 @@ class MemoryTop7Stress(perf_benchmark.PerfBenchmark): return 'memory.top_7_stress' -@benchmark.Enabled('has tabs') -@benchmark.Disabled('android') # Benchmark uses > 700MB of memory. -class MemoryIdleMultiTab(perf_benchmark.PerfBenchmark): - """Use (recorded) real world web sites and measure memory consumption - with many tabs and idle times. """ - test = memory.Memory - page_set = page_sets.IdleMultiTabCasesPageSet - - def SetExtraBrowserOptions(self, options): - # This benchmark opens tabs from JavaScript, which does not work - # with popup-blocking enabled. - options.AppendExtraBrowserArgs(['--disable-popup-blocking']) - - @classmethod - def Name(cls): - return 'memory.idle_multi_tab' - - class MemoryLongRunningIdleGmail(perf_benchmark.PerfBenchmark): """Use (recorded) real world web sites and measure memory consumption of long running idle Gmail page """ @@ -67,4 +49,4 @@ class MemoryLongRunningIdleGmailBackground(perf_benchmark.PerfBenchmark): @classmethod def Name(cls): - return 'memory.long_running_idle_gmail_background'
\ No newline at end of file + return 'memory.long_running_idle_gmail_background' diff --git a/tools/perf/page_sets/idle_multi_tab_cases.js b/tools/perf/page_sets/idle_multi_tab_cases.js deleted file mode 100644 index bdb4c9f..0000000 --- a/tools/perf/page_sets/idle_multi_tab_cases.js +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2015 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. - -__telemetry_spawned_tabs = []; - -function __telemetry_spawn_tab() { - var tab = window.open(window.location.href); - if (typeof tab === "undefined") { - throw "Cannot open tab. Forgot --disable-popup-blocking flag?"; - } - __telemetry_spawned_tabs.push(tab); - return __telemetry_spawned_tabs.length - 1; -} - -function __telemetry_close_tab(tab) { - __telemetry_spawned_tabs[tab].close(); - __telemetry_spawned_tabs[tab] = null; -} diff --git a/tools/perf/page_sets/idle_multi_tab_cases.py b/tools/perf/page_sets/idle_multi_tab_cases.py deleted file mode 100644 index a057425..0000000 --- a/tools/perf/page_sets/idle_multi_tab_cases.py +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 2015 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 os - -from telemetry.page import shared_page_state -from telemetry import story - -from page_sets import google_pages - -def _SpawnTab(action_runner): - return action_runner.EvaluateJavaScript('__telemetry_spawn_tab()') - - -def _CloseTab(action_runner, tab): - action_runner.EvaluateJavaScript('__telemetry_close_tab(' + str(tab) + ')') - - -def _CreateIdleMultiTabPageClass(base_page_cls, base_js): - class DerivedIdleMultiTabPage(base_page_cls): # pylint: disable=W0232 - - def RunPageInteractions(self, action_runner): - MAX_TABS = 4 - action_runner.ExecuteJavaScript(base_js) - tabs = {} - # Slowly open tabs. - for tab in xrange(MAX_TABS): - tabs[tab] = _SpawnTab(action_runner) - action_runner.Wait(1) - action_runner.Wait(40) - # Slowly close tabs. - for tab in xrange(MAX_TABS): - _CloseTab(action_runner, tabs[tab]) - action_runner.Wait(1) - action_runner.Wait(40) - return DerivedIdleMultiTabPage - - -class IdleMultiTabCasesPageSet(story.StorySet): - - """ Pages for testing GC efficiency on idle pages. """ - - def __init__(self): - super(IdleMultiTabCasesPageSet, self).__init__( - archive_data_file='data/idle_multi_tab_cases.json', - cloud_storage_bucket=story.PARTNER_BUCKET) - with open(os.path.join(os.path.dirname(__file__), - 'idle_multi_tab_cases.js')) as f: - base_js = f.read() - self.AddStory( - _CreateIdleMultiTabPageClass(google_pages.GoogleDocPage, base_js) - (self, shared_page_state.SharedDesktopPageState)) diff --git a/tools/perf/page_sets/page_reload_cases.py b/tools/perf/page_sets/page_reload_cases.py index e7fceeb..c2d3239 100644 --- a/tools/perf/page_sets/page_reload_cases.py +++ b/tools/perf/page_sets/page_reload_cases.py @@ -40,16 +40,4 @@ class PageReloadCasesPageSet(story.StorySet): self.AddStory(_CreatePageClassWithReload( top_pages.GoogleWebSearchPage)(self, shared_desktop_state)) self.AddStory(_CreatePageClassWithReload( - top_pages.GmailPage)(self, shared_desktop_state)) - self.AddStory(_CreatePageClassWithReload( - top_pages.GoogleCalendarPage)(self, shared_desktop_state)) - self.AddStory(_CreatePageClassWithReload( top_pages.GoogleDocPage)(self, shared_desktop_state)) - self.AddStory(_CreatePageClassWithReload( - top_pages.GooglePlusPage)(self, shared_desktop_state)) - self.AddStory(_CreatePageClassWithReload( - top_pages.YoutubePage)(self, shared_desktop_state)) - self.AddStory(_CreatePageClassWithReload( - top_pages.WordpressPage)(self, shared_desktop_state)) - self.AddStory(_CreatePageClassWithReload( - top_pages.FacebookPage)(self, shared_desktop_state)) |