From 2067b3b3daa855ba797c68e604c86f1f3901251b Mon Sep 17 00:00:00 2001
From: Kajetan Puchalski <kajetan.puchalski@arm.com>
Date: Wed, 31 May 2023 10:16:55 +0100
Subject: [PATCH 1/2] Squashed 'external/devlib/' changes from
 ac0c39e31..be988bb42

be988bb42 target: Expose Android external storage app dir

git-subtree-dir: external/devlib
git-subtree-split: be988bb42b766574bb9bd9191fa3532a65091716
---
 devlib/target.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/devlib/target.py b/devlib/target.py
index 4eeeb5c95..811fc3b6e 100644
--- a/devlib/target.py
+++ b/devlib/target.py
@@ -1754,6 +1754,11 @@ class AndroidTarget(Target):
     def external_storage(self):
         return self.execute('echo $EXTERNAL_STORAGE').strip()
 
+    @property
+    @memoized
+    def external_storage_app_dir(self):
+        return self.path.join(self.external_storage, 'Android', 'data')
+
     @property
     @memoized
     def screen_resolution(self):
-- 
GitLab


From d2c520525386fcbfc152565adaf21e1384942054 Mon Sep 17 00:00:00 2001
From: Kajetan Puchalski <kajetan.puchalski@arm.com>
Date: Wed, 31 May 2023 10:17:44 +0100
Subject: [PATCH 2/2] Squashed 'external/workload-automation/' changes from
 36a909dda..f4ebca39a

f4ebca39a build(deps): bump requests from 2.29.0 to 2.31.0
88b085c11 perf: Fix instrument for Android 13

git-subtree-dir: external/workload-automation
git-subtree-split: f4ebca39a15ece7fa752c1b3ceba3a603ce52e6c
---
 requirements.txt       |  2 +-
 wa/instruments/perf.py | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 7ab2755b3..429a7fb49 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,7 +21,7 @@ pyserial==3.5
 python-dateutil==2.8.2
 pytz==2023.3
 PyYAML==6.0
-requests==2.29.0
+requests==2.31.0
 scp==0.14.5
 six==1.16.0
 tzdata==2023.3
diff --git a/wa/instruments/perf.py b/wa/instruments/perf.py
index 49b23bfea..c7a3d87cc 100644
--- a/wa/instruments/perf.py
+++ b/wa/instruments/perf.py
@@ -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):
-- 
GitLab