sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-03-22 10:38:37 +00:00
Code Issues Releases Wiki Activity

Merge pull request #158 from setrofim/master

Browse Source 
report_power_stats: number of entries returned always matches number of reporters
This commit is contained in:
Sebastian Goscik 2016-05-09 10:23:05 +01:00
commit 187fd70077
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wlauto/result_processors/cpustate.py
View File

@ -181,7 +181,8 @@ class CpuStatesProcessor(ResultProcessor):
cpu_utilisation = os.path.join(context.output_directory, 'cpu_utilisation.csv') cpu_utilisation = os.path.join(context.output_directory, 'cpu_utilisation.csv')
else: else:
cpu_utilisation = None cpu_utilisation = None
parallel_report, powerstate_report = report_power_stats( # pylint: disable=unbalanced-tuple-unpacking
reports = report_power_stats( # pylint: disable=unbalanced-tuple-unpacking
trace_file=trace.path, trace_file=trace.path,
idle_state_names=self.idle_state_names, idle_state_names=self.idle_state_names,
core_names=self.core_names, core_names=self.core_names,
@ -194,6 +195,9 @@ class CpuStatesProcessor(ResultProcessor):
cpu_utilisation=cpu_utilisation, cpu_utilisation=cpu_utilisation,
max_freq_list=self.max_freq_list, max_freq_list=self.max_freq_list,
) )
parallel_report = reports.pop(0)
powerstate_report = reports.pop(0)
if parallel_report is None: if parallel_report is None:
self.logger.warning('No power state reports generated; are power ' self.logger.warning('No power state reports generated; are power '
'events enabled in the trace?') 'events enabled in the trace?')

3
wlauto/utils/power.py
View File

@ -644,8 +644,7 @@ def report_power_stats(trace_file, idle_state_names, core_names, core_clusters,
reports = [] reports = []
for reporter in reporters: for reporter in reporters:
report = reporter.report() report = reporter.report()
if report: reports.append(report)
reports.append(report)
return reports return reports