sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-02-21 20:38:57 +00:00
Code Issues Releases Wiki Activity

gfxbench: Add a non corporate version

Browse Source 
Which works as the corporate version except for a different in package
name and a set of Fixed Time Tests that don't exist on free version.

Only support v 4.X and v5.X as that's what's available.

Note there's a clash with glbenchmark package name. glbenchmark is an
ancient version provided by the same developers but was superseded by
gfxbench.  The version checks in both workloads should ensure we get the
right one in the unlikely case both are installed.

Signed-off-by: Qais Yousef <qais.yousef@arm.com>
This commit is contained in:
Qais Yousef 2022-01-31 14:28:56 +00:00 committed by Marc Bonnici
parent be02ad649c
commit 7b5ffafbda
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wa/workloads/gfxbench/__init__.py
View File

@ -20,8 +20,10 @@ from wa.utils.types import list_or_string
class Gfxbench(ApkUiautoWorkload):
name = 'gfxbench-corporate'
package_names = ['net.kishonti.gfxbench.gl.v50000.corporate']
name = 'gfxbench'
package_names = ['com.glbenchmark.glbenchmark27']
supported_versions = ['4', '5']
is_corporate = False
clear_data_on_reset = False
regex_template = 'name: \((?P<test_name>.*)\).*result: \((?P<result>.*)?\).* sub_result:.*\((?P<sub_result>.*?)?\).*'
description = '''
@ -98,3 +100,10 @@ class Gfxbench(ApkUiautoWorkload):
if failed or detected_results < len(regex_matches):
msg = "The workload has failed to process all scores. Expected >={} scores, Detected {} scores."
raise WorkloadError(msg.format(len(regex_matches), detected_results))
class GfxbenchCorporate(Gfxbench): # pylint: disable=too-many-ancestors
name = 'gfxbench-corporate'
package_names = ['net.kishonti.gfxbench.gl.v50000.corporate']
is_corporate = True

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

@ -39,6 +39,7 @@ public class UiAutomation extends BaseUiAutomation {
private int networkTimeoutSecs = 30;
private long networkTimeout = TimeUnit.SECONDS.toMillis(networkTimeoutSecs);
private Boolean isCorporate;
public static String TAG = "UXPERF";
protected Bundle parameters;
protected String[] testList;
@ -50,6 +51,7 @@ public class UiAutomation extends BaseUiAutomation {
parameters = getParams();
testList = parameters.getStringArray("tests");
packageID = getPackageID(parameters);
isCorporate = parameters.getBoolean("is_corporate");
}
@Test
@ -82,7 +84,8 @@ public class UiAutomation extends BaseUiAutomation {
toggleTest("High-Level Tests");
toggleTest("Low-Level Tests");
toggleTest("Special Tests");
toggleTest("Fixed Time Test");
if (isCorporate)
toggleTest("Fixed Time Test");
// Enable selected tests
for (String test : testList) {