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

perf: Fix instrument for Android 13

Browse Source 
The simpleperf included with Android 13 now does not show the percentage
when no counter multiplexing took place. This causes the perf instrument
to crash when processing the output. This fix checks whether the percentage
exists before trying to extract it.

Signed-off-by: Kajetan Puchalski <kajetan.puchalski@arm.com>
This commit is contained in:
Kajetan Puchalski 2023-05-25 15:06:23 +01:00 committed by Marc Bonnici
parent 36a909dda2
commit 88b085c11b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wa/instruments/perf.py
View File

@ -259,7 +259,9 @@ class PerfInstrument(Instrument):
line_num = 0
for row in readCSV:
if 'Performance counter statistics' not in row and 'Total test time' not in row:
classifiers = {'scaled from(%)': row[len(row) - 2].replace('(', '').replace(')', '').replace('%', '')}
classifiers = {}
if '%' in row:
classifiers['scaled from(%)'] = row[len(row) - 2].replace('(', '').replace(')', '').replace('%', '')
context.add_metric('{}_{}'.format(label, row[1]), row[0], 'count', classifiers=classifiers)
line_num += 1
@ -276,10 +278,12 @@ class PerfInstrument(Instrument):
tmp_line = line.strip()
count, metric = tmp_line.split(' ')[0], tmp_line.split(' ')[2]
count = float(count) if "." in count else int(count.replace(',', ''))
scaled_percentage = line.split('(')[1].strip().replace(')', '').replace('%', '')
scaled_percentage = int(scaled_percentage)
classifiers = {}
if '%' in line:
scaled_percentage = line.split('(')[1].strip().replace(')', '').replace('%', '')
classifiers['scaled from(%)'] = int(scaled_percentage)
metric = '{}_{}'.format(label, metric)
context.add_metric(metric, count, units, classifiers={'scaled from(%)': scaled_percentage})
context.add_metric(metric, count, units, classifiers=classifiers)
def _process_simpleperf_record_output(self, context):
for host_file in os.listdir(self.outdir):