Index: tools/perf/benchmarks/v8_browsing.py |
diff --git a/tools/perf/benchmarks/v8_browsing.py b/tools/perf/benchmarks/v8_browsing.py |
index f77db99b2986f9a0eb951783ca9cf8fdeec1a2d1..4052ba8fcb92515d944697cd1027a48e70533b0c 100644 |
--- a/tools/perf/benchmarks/v8_browsing.py |
+++ b/tools/perf/benchmarks/v8_browsing.py |
@@ -4,6 +4,7 @@ |
import re |
+from benchmarks import v8_helper |
from core import perf_benchmark |
from telemetry import benchmark |
from telemetry.timeline import chrome_trace_config |
@@ -47,6 +48,10 @@ class _V8BrowsingBenchmark(perf_benchmark.PerfBenchmark): |
'renderer.scheduler', |
'v8', |
'webkit.console', |
+ # TODO(crbug.com/616441, primiano): Remove this temporary workaround, |
+ # which enables memory-infra V8 code stats in V8 code size benchmarks |
+ # only (to not slow down detailed memory dumps in other benchmarks). |
+ 'disabled-by-default-memory-infra.v8.code_stats', |
] |
options = timeline_based_measurement.Options( |
chrome_trace_category_filter.ChromeTraceCategoryFilter( |
@@ -60,11 +65,12 @@ class _V8BrowsingBenchmark(perf_benchmark.PerfBenchmark): |
return options |
def CreateStorySet(self, options): |
- return page_sets.SystemHealthStorySet(platform=self.PLATFORM, case='browse') |
+ return page_sets.SystemHealthStorySet( |
+ platform=self.PLATFORM, case='browse') |
petrcermak
2016/08/19 11:06:29
You don't need this line break ;-)
rmcilroy
2016/08/19 15:38:59
Done.
|
@classmethod |
def Name(cls): |
- return 'v8.browsing_%s' % cls.PLATFORM |
+ return 'v8.browsing_%s%s' % (cls.PLATFORM, cls.TEST_SUFFIX) |
@classmethod |
def ValueCanBeAddedPredicate(cls, value, is_first_result): |
@@ -83,6 +89,7 @@ class _V8BrowsingBenchmark(perf_benchmark.PerfBenchmark): |
class V8DesktopBrowsingBenchmark(_V8BrowsingBenchmark): |
petrcermak
2016/08/19 11:06:29
You could remove some of the code duplication acro
rmcilroy
2016/08/19 15:38:59
Done.
|
PLATFORM = 'desktop' |
+ TEST_SUFFIX = '' |
@classmethod |
def ShouldDisable(cls, possible_browser): |
@@ -96,6 +103,39 @@ class V8DesktopBrowsingBenchmark(_V8BrowsingBenchmark): |
@benchmark.Disabled('reference') # http://crbug.com/628631 |
class V8MobileBrowsingBenchmark(_V8BrowsingBenchmark): |
PLATFORM = 'mobile' |
+ TEST_SUFFIX = '' |
+ |
+ @classmethod |
+ def ShouldDisable(cls, possible_browser): |
+ return possible_browser.platform.GetDeviceTypeName() == 'Desktop' |
+ |
petrcermak
2016/08/19 11:06:29
nit: add blank line (there should be 2 blank lines
rmcilroy
2016/08/19 15:38:59
Done.
|
+class V8DesktopIgnitionBrowsingBenchmark(_V8BrowsingBenchmark): |
+ PLATFORM = 'desktop' |
+ TEST_SUFFIX = '_ignition' |
+ |
+ def SetExtraBrowserOptions(self, options): |
+ super(V8DesktopIgnitionBrowsingBenchmark, self).SetExtraBrowserOptions( |
+ options) |
+ v8_helper.EnableIgnition(options) |
+ |
+ @classmethod |
+ def ShouldDisable(cls, possible_browser): |
+ # http://crbug.com/628736 |
+ if (possible_browser.platform.GetOSName() == 'mac' and |
+ possible_browser.browser_type == 'reference'): |
+ return True |
+ |
+ return possible_browser.platform.GetDeviceTypeName() != 'Desktop' |
+ |
petrcermak
2016/08/19 11:06:29
nit: add blank line (ditto)
rmcilroy
2016/08/19 15:38:59
Done.
|
+@benchmark.Disabled('reference') # http://crbug.com/628631 |
+class V8MobileIgnitionBrowsingBenchmark(_V8BrowsingBenchmark): |
+ PLATFORM = 'mobile' |
+ TEST_SUFFIX = '_ignition' |
+ |
+ def SetExtraBrowserOptions(self, options): |
+ super(V8MobileIgnitionBrowsingBenchmark, self).SetExtraBrowserOptions( |
+ options) |
+ v8_helper.EnableIgnition(options) |
@classmethod |
def ShouldDisable(cls, possible_browser): |