Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(643)

Side by Side Diff: tools/perf/benchmarks/sunspider.py

Issue 22754003: Refactor BenchmarkResult.Add to take enum for data_type (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 import collections 4 import collections
5 import json 5 import json
6 import os 6 import os
7 7
8 from telemetry import test 8 from telemetry import test
9 from telemetry.core import util 9 from telemetry.core import util
10 from telemetry.page import page_measurement 10 from telemetry.page import page_measurement
11 from telemetry.page import result_data_type
11 from telemetry.page import page_set 12 from telemetry.page import page_set
12 13
13 14
14 class SunspiderMeasurement(page_measurement.PageMeasurement): 15 class SunspiderMeasurement(page_measurement.PageMeasurement):
15 def MeasurePage(self, _, tab, results): 16 def MeasurePage(self, _, tab, results):
16 js_is_done = ('window.location.pathname.indexOf("results.html") >= 0' 17 js_is_done = ('window.location.pathname.indexOf("results.html") >= 0'
17 '&& typeof(output) != "undefined"') 18 '&& typeof(output) != "undefined"')
18 def _IsDone(): 19 def _IsDone():
19 return tab.EvaluateJavaScript(js_is_done) 20 return tab.EvaluateJavaScript(js_is_done)
20 util.WaitFor(_IsDone, 300, poll_interval=1) 21 util.WaitFor(_IsDone, 300, poll_interval=1)
21 22
22 js_get_results = 'JSON.stringify(output);' 23 js_get_results = 'JSON.stringify(output);'
23 js_results = json.loads(tab.EvaluateJavaScript(js_get_results)) 24 js_results = json.loads(tab.EvaluateJavaScript(js_get_results))
24 r = collections.defaultdict(list) 25 r = collections.defaultdict(list)
25 totals = [] 26 totals = []
26 # js_results is: [{'foo': v1, 'bar': v2}, 27 # js_results is: [{'foo': v1, 'bar': v2},
27 # {'foo': v3, 'bar': v4}, 28 # {'foo': v3, 'bar': v4},
28 # ...] 29 # ...]
29 for result in js_results: 30 for result in js_results:
30 total = 0 31 total = 0
31 for key, value in result.iteritems(): 32 for key, value in result.iteritems():
32 r[key].append(value) 33 r[key].append(value)
33 total += value 34 total += value
34 totals.append(total) 35 totals.append(total)
35 for key, values in r.iteritems(): 36 for key, values in r.iteritems():
36 results.Add(key, 'ms', values, data_type='unimportant') 37 results.Add(key, 'ms', values, data_type=result_data_type.UNIMPORTANT)
37 results.Add('Total', 'ms', totals) 38 results.Add('Total', 'ms', totals)
38 39
39 40
40 class Sunspider(test.Test): 41 class Sunspider(test.Test):
41 """Apple's SunSpider JavaScript benchmark.""" 42 """Apple's SunSpider JavaScript benchmark."""
42 test = SunspiderMeasurement 43 test = SunspiderMeasurement
43 44
44 def CreatePageSet(self, options): 45 def CreatePageSet(self, options):
45 sunspider_dir = os.path.join(util.GetChromiumSrcDir(), 46 sunspider_dir = os.path.join(util.GetChromiumSrcDir(),
46 'chrome', 'test', 'data', 'sunspider') 47 'chrome', 'test', 'data', 'sunspider')
47 return page_set.PageSet.FromDict( 48 return page_set.PageSet.FromDict(
48 { 49 {
49 'serving_dirs': [''], 50 'serving_dirs': [''],
50 'pages': [{ 'url': 'file:///sunspider-1.0/driver.html' }], 51 'pages': [{ 'url': 'file:///sunspider-1.0/driver.html' }],
51 }, 52 },
52 sunspider_dir) 53 sunspider_dir)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698