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

Side by Side Diff: tools/perf/benchmarks/octane.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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 import os 5 import os
6 6
7 from telemetry import test 7 from telemetry import test
8 from telemetry.core import util 8 from telemetry.core import util
9 from telemetry.page import page_measurement 9 from telemetry.page import page_measurement
10 from telemetry.page import result_data_type
10 from telemetry.page import page_set 11 from telemetry.page import page_set
11 12
12 13
13 class OctaneMeasurement(page_measurement.PageMeasurement): 14 class OctaneMeasurement(page_measurement.PageMeasurement):
14 def MeasurePage(self, _, tab, results): 15 def MeasurePage(self, _, tab, results):
15 js_is_done = """ 16 js_is_done = """
16 completed && !document.getElementById("progress-bar-container")""" 17 completed && !document.getElementById("progress-bar-container")"""
17 def _IsDone(): 18 def _IsDone():
18 return bool(tab.EvaluateJavaScript(js_is_done)) 19 return bool(tab.EvaluateJavaScript(js_is_done))
19 util.WaitFor(_IsDone, 300, poll_interval=5) 20 util.WaitFor(_IsDone, 300, poll_interval=5)
20 21
21 js_get_results = """ 22 js_get_results = """
22 var results = {}; 23 var results = {};
23 var result_divs = document.querySelectorAll('.p-result'); 24 var result_divs = document.querySelectorAll('.p-result');
24 for (var r in result_divs) { 25 for (var r in result_divs) {
25 if (result_divs[r].id && result_divs[r].id.indexOf('Result-') == 0) { 26 if (result_divs[r].id && result_divs[r].id.indexOf('Result-') == 0) {
26 var key = result_divs[r].id.replace('Result-', ''); 27 var key = result_divs[r].id.replace('Result-', '');
27 results[key] = result_divs[r].innerHTML; 28 results[key] = result_divs[r].innerHTML;
28 } 29 }
29 } 30 }
30 var main_banner = document.getElementById("main-banner").innerHTML; 31 var main_banner = document.getElementById("main-banner").innerHTML;
31 var octane_score = main_banner.substr(main_banner.lastIndexOf(':') + 2); 32 var octane_score = main_banner.substr(main_banner.lastIndexOf(':') + 2);
32 results['score'] = octane_score; 33 results['score'] = octane_score;
33 JSON.stringify(results); 34 JSON.stringify(results);
34 """ 35 """
35 result_dict = eval(tab.EvaluateJavaScript(js_get_results)) 36 result_dict = eval(tab.EvaluateJavaScript(js_get_results))
36 for key, value in result_dict.iteritems(): 37 for key, value in result_dict.iteritems():
37 if value == '...': 38 if value == '...':
38 continue 39 continue
39 data_type = 'unimportant' 40 data_type = result_data_type.UNIMPORTANT
40 if key == 'score': 41 if key == 'score':
41 data_type = 'default' 42 data_type = result_data_type.DEFAULT
42 results.Add(key, 'score (bigger is better)', value, data_type=data_type) 43 results.Add(key, 'score (bigger is better)', value, data_type=data_type)
43 44
44 45
45 class Octane(test.Test): 46 class Octane(test.Test):
46 """Google's Octane JavaScript benchmark.""" 47 """Google's Octane JavaScript benchmark."""
47 test = OctaneMeasurement 48 test = OctaneMeasurement
48 49
49 def CreatePageSet(self, options): 50 def CreatePageSet(self, options):
50 octane_dir = os.path.join(util.GetChromiumSrcDir(), 'chrome', 'test', 51 octane_dir = os.path.join(util.GetChromiumSrcDir(), 'chrome', 'test',
51 'data', 'perf', 'third_party', 'octane') 52 'data', 'perf', 'third_party', 'octane')
52 return page_set.PageSet.FromDict({ 53 return page_set.PageSet.FromDict({
53 'pages': [ 54 'pages': [
54 { 'url': 'file:///index.html?auto=1' } 55 { 'url': 'file:///index.html?auto=1' }
55 ] 56 ]
56 }, octane_dir) 57 }, octane_dir)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698