OLD | NEW |
1 # Copyright 2012 The Chromium Authors. All rights reserved. | 1 # Copyright 2012 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 | 4 |
5 """Runs Mozilla's Kraken JavaScript benchmark.""" | 5 """Runs Mozilla's Kraken JavaScript benchmark.""" |
6 | 6 |
7 import os | 7 import os |
8 | 8 |
9 from metrics import power | 9 from metrics import power |
10 from telemetry import benchmark | 10 from telemetry import benchmark |
11 from telemetry.page import page_measurement | 11 from telemetry.page import page_measurement |
12 from telemetry.page import page_set | 12 from telemetry.page import page_set |
| 13 from telemetry.value import scalar |
13 | 14 |
14 | 15 |
15 def _Mean(l): | 16 def _Mean(l): |
16 return float(sum(l)) / len(l) if len(l) > 0 else 0.0 | 17 return float(sum(l)) / len(l) if len(l) > 0 else 0.0 |
17 | 18 |
18 | 19 |
19 class _KrakenMeasurement(page_measurement.PageMeasurement): | 20 class _KrakenMeasurement(page_measurement.PageMeasurement): |
20 def __init__(self): | 21 def __init__(self): |
21 super(_KrakenMeasurement, self).__init__() | 22 super(_KrakenMeasurement, self).__init__() |
22 self._power_metric = None | 23 self._power_metric = None |
(...skipping 17 matching lines...) Expand all Loading... |
40 | 41 |
41 js_get_results = """ | 42 js_get_results = """ |
42 var formElement = document.getElementsByTagName("input")[0]; | 43 var formElement = document.getElementsByTagName("input")[0]; |
43 decodeURIComponent(formElement.value.split("?")[1]); | 44 decodeURIComponent(formElement.value.split("?")[1]); |
44 """ | 45 """ |
45 result_dict = eval(tab.EvaluateJavaScript(js_get_results)) | 46 result_dict = eval(tab.EvaluateJavaScript(js_get_results)) |
46 total = 0 | 47 total = 0 |
47 for key in result_dict: | 48 for key in result_dict: |
48 if key == 'v': | 49 if key == 'v': |
49 continue | 50 continue |
50 results.Add(key, 'ms', result_dict[key], data_type='unimportant') | 51 results.AddValue(scalar.ScalarValue( |
| 52 results.current_page, key, 'ms', result_dict[key], important=False)) |
51 total += _Mean(result_dict[key]) | 53 total += _Mean(result_dict[key]) |
52 results.Add('Total', 'ms', total) | 54 results.AddValue(scalar.ScalarValue( |
| 55 results.current_page, 'Total', 'ms', total)) |
53 | 56 |
54 | 57 |
55 class Kraken(benchmark.Benchmark): | 58 class Kraken(benchmark.Benchmark): |
56 """Mozilla's Kraken JavaScript benchmark.""" | 59 """Mozilla's Kraken JavaScript benchmark.""" |
57 test = _KrakenMeasurement | 60 test = _KrakenMeasurement |
58 | 61 |
59 def CreatePageSet(self, options): | 62 def CreatePageSet(self, options): |
60 ps = page_set.PageSet( | 63 ps = page_set.PageSet( |
61 archive_data_file='../page_sets/data/kraken.json', | 64 archive_data_file='../page_sets/data/kraken.json', |
62 file_path=os.path.abspath(__file__)) | 65 file_path=os.path.abspath(__file__)) |
63 ps.AddPageWithDefaultRunNavigate( | 66 ps.AddPageWithDefaultRunNavigate( |
64 'http://krakenbenchmark.mozilla.org/kraken-1.1/driver.html') | 67 'http://krakenbenchmark.mozilla.org/kraken-1.1/driver.html') |
65 return ps | 68 return ps |
OLD | NEW |