OLD | NEW |
1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 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 metrics import power | 8 from metrics import power |
9 from telemetry import benchmark | 9 from telemetry import benchmark |
10 from telemetry.page import page_measurement | 10 from telemetry.page import page_measurement |
11 from telemetry.page import page_set | 11 from telemetry.page import page_set |
| 12 from telemetry.value import list_of_scalar_values |
12 | 13 |
13 | 14 |
14 _URL = 'http://www.webkit.org/perf/sunspider-1.0.2/sunspider-1.0.2/driver.html' | 15 _URL = 'http://www.webkit.org/perf/sunspider-1.0.2/sunspider-1.0.2/driver.html' |
15 | 16 |
16 | 17 |
17 class _SunspiderMeasurement(page_measurement.PageMeasurement): | 18 class _SunspiderMeasurement(page_measurement.PageMeasurement): |
18 def __init__(self): | 19 def __init__(self): |
19 super(_SunspiderMeasurement, self).__init__() | 20 super(_SunspiderMeasurement, self).__init__() |
20 self._power_metric = None | 21 self._power_metric = None |
21 | 22 |
(...skipping 21 matching lines...) Expand all Loading... |
43 # js_results is: [{'foo': v1, 'bar': v2}, | 44 # js_results is: [{'foo': v1, 'bar': v2}, |
44 # {'foo': v3, 'bar': v4}, | 45 # {'foo': v3, 'bar': v4}, |
45 # ...] | 46 # ...] |
46 for result in js_results: | 47 for result in js_results: |
47 total = 0 | 48 total = 0 |
48 for key, value in result.iteritems(): | 49 for key, value in result.iteritems(): |
49 r[key].append(value) | 50 r[key].append(value) |
50 total += value | 51 total += value |
51 totals.append(total) | 52 totals.append(total) |
52 for key, values in r.iteritems(): | 53 for key, values in r.iteritems(): |
53 results.Add(key, 'ms', values, data_type='unimportant') | 54 results.AddValue(list_of_scalar_values.ListOfScalarValues( |
54 results.Add('Total', 'ms', totals) | 55 results.current_page, key, 'ms', values, important=False)) |
| 56 results.AddValue(list_of_scalar_values.ListOfScalarValues( |
| 57 results.current_page, 'Total', 'ms', totals)) |
55 | 58 |
56 | 59 |
57 class Sunspider(benchmark.Benchmark): | 60 class Sunspider(benchmark.Benchmark): |
58 """Apple's SunSpider JavaScript benchmark.""" | 61 """Apple's SunSpider JavaScript benchmark.""" |
59 test = _SunspiderMeasurement | 62 test = _SunspiderMeasurement |
60 | 63 |
61 def CreatePageSet(self, options): | 64 def CreatePageSet(self, options): |
62 ps = page_set.PageSet( | 65 ps = page_set.PageSet( |
63 archive_data_file='../page_sets/data/sunspider.json', | 66 archive_data_file='../page_sets/data/sunspider.json', |
64 make_javascript_deterministic=False, | 67 make_javascript_deterministic=False, |
65 file_path=os.path.abspath(__file__)) | 68 file_path=os.path.abspath(__file__)) |
66 ps.AddPageWithDefaultRunNavigate(_URL) | 69 ps.AddPageWithDefaultRunNavigate(_URL) |
67 return ps | 70 return ps |
OLD | NEW |