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

geekbench: Add/fix support for Geekbench5

Browse Source 
The non corporate version of geekbench5 didn't work although the code
had everything needed, except for a number of tiny required tweaks:

1. Add '5' in the supported versions in __init__.py
2. Fix the name of the android package in__init__.py and
   UiAutomation.java
3. Improve handling of minorVersion to fix potential exception when we
   don't specify the minorVersion number in the yaml file. Launching
   geekbench5 works fine when it's the only one installed. But if you
   have multiple versions, then using the version string in the yaml
   agenda didn't like specifying '5' as the version and threw exception
   out of bound because we assume '5.X' as input. No reason I'm aware of
   to force support for a specific version of geekbench5. So keep it
   relaxed until we know for sure it breaks with a specific version.

Signed-off-by: Qais Yousef <qais.yousef@arm.com>
This commit is contained in:
Qais Yousef 2022-02-27 19:11:30 +00:00 committed by Marc Bonnici
parent 9c7bae3440
commit b109acac05
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wa/workloads/geekbench/__init__.py
View File

@ -53,8 +53,8 @@ class Geekbench(ApkUiautoWorkload):
"""
summary_metrics = ['score', 'multicore_score']
supported_versions = ['4.4.2', '4.4.0', '4.3.4', '4.3.2', '4.3.1', '4.2.0', '4.0.1', '3.4.1', '3.0.0', '2']
package_names = ['com.primatelabs.geekbench', 'com.primatelabs.geekbench3', 'ca.primatelabs.geekbench2']
supported_versions = ['5', '4.4.2', '4.4.0', '4.3.4', '4.3.2', '4.3.1', '4.2.0', '4.0.1', '3.4.1', '3.0.0', '2']
package_names = ['com.primatelabs.geekbench5', 'com.primatelabs.geekbench', 'com.primatelabs.geekbench3', 'ca.primatelabs.geekbench2']
begin_regex = re.compile(r'^\s*D/WebViewClassic.loadDataWithBaseURL\(\s*\d+\s*\)'
r'\s*:\s*(?P<content>\<.*)\s*$')

BIN
wa/workloads/geekbench/com.arm.wa.uiauto.geekbench.apk
View File

Binary file not shown.

5
wa/workloads/geekbench/uiauto/app/src/main/java/com/arm/wa/uiauto/geekbench/UiAutomation.java
View File

@ -53,7 +53,8 @@ public class UiAutomation extends BaseUiAutomation {
params = getParams();
version = params.getString("version").split("\\.");
majorVersion = Integer.parseInt(version[0]);
minorVersion = Integer.parseInt(version[1]);
if (version.length > 1)
minorVersion = Integer.parseInt(version[1]);
isCorporate = params.getBoolean("is_corporate");
loops = params.getInt("loops");
}
@ -140,7 +141,7 @@ public class UiAutomation extends BaseUiAutomation {
scrollPage();
String packageName = isCorporate ? "com.primatelabs.geekbench.*.corporate"
: "com.primatelabs.geekbench";
: "com.primatelabs.geekbench.*";
UiObject runButton =
mDevice.findObject(new UiSelector().resourceIdMatches(packageName + ":id/runCpuBenchmarks"));