sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-01-31 18:21:14 +00:00
Code Issues Releases Wiki Activity

bbench: handle lack of results in logcat

Browse Source 
- make sure results_list is always instatiated even if no metrics found;
  this would previously cause a "used before declaration" error
- Detect that no metrics were extracted from the log and raise a
  WorkloadError
This commit is contained in:
Sergei Trofimov 2016-06-14 08:56:56 +01:00
parent 6f8989a8ba
commit f33d6f4729
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wlauto/workloads/bbench/__init__.py
View File

@ -24,7 +24,7 @@ import re
from collections import defaultdict from collections import defaultdict
from wlauto import settings, Workload, Parameter, Alias, Executable from wlauto import settings, Workload, Parameter, Alias, Executable
from wlauto.exceptions import ConfigError from wlauto.exceptions import ConfigError, WorkloadError
from wlauto.utils.types import boolean from wlauto.utils.types import boolean
DEFAULT_BBENCH_FILE = "http://bbench.eecs.umich.edu/bbench/bbench_2.0.tgz" DEFAULT_BBENCH_FILE = "http://bbench.eecs.umich.edu/bbench/bbench_2.0.tgz"
@ -158,6 +158,9 @@ class BBench(Workload):
metrics = _parse_metrics(os.path.join(context.output_directory, 'browser_bbench_logcat.txt'), metrics = _parse_metrics(os.path.join(context.output_directory, 'browser_bbench_logcat.txt'),
os.path.join(context.output_directory, 'index_noinput.html'), os.path.join(context.output_directory, 'index_noinput.html'),
context.output_directory) context.output_directory)
if not metrics:
raise WorkloadError('No BBench metrics extracted from Logcat')
for key, values in metrics: for key, values in metrics:
for i, value in enumerate(values): for i, value in enumerate(values):
metric = '{}_{}'.format(key, i) if i else key metric = '{}_{}'.format(key, i) if i else key
@ -217,6 +220,7 @@ def _parse_metrics(logfile, indexfile, output_directory): # pylint: disable=R09
settings_dict['iterations'], settings_dict['scrollDelay'], settings_dict['scrollSize'] = match.group(1).split(',') settings_dict['iterations'], settings_dict['scrollDelay'], settings_dict['scrollSize'] = match.group(1).split(',')
with open(logfile) as fh: with open(logfile) as fh:
results_dict = defaultdict(list) results_dict = defaultdict(list)
results_list = []
for line in fh: for line in fh:
if 'metrics:Mean' in line: if 'metrics:Mean' in line:
results_list = regex_bbscore.findall(line) results_list = regex_bbscore.findall(line)
@ -241,4 +245,4 @@ def _parse_metrics(logfile, indexfile, output_directory): # pylint: disable=R09
with open(os.path.join(output_directory, 'settings.json'), 'w') as wfh: with open(os.path.join(output_directory, 'settings.json'), 'w') as wfh:
json.dump(settings_dict, wfh) json.dump(settings_dict, wfh)
return sorted_results return list(sorted_results)