From 088709f2900760a07457bb912734f29805cd208d Mon Sep 17 00:00:00 2001 From: James Hartley Date: Thu, 24 Nov 2016 16:22:10 +0000 Subject: [PATCH] geekbench: Improve UiAutomator timeouts for slow devices, fixes for rooted devices Tested by running Mate 8 on the lowest cluster at the lowest available frequency On rooted devices, skip attempting to pull log files from device. This allows the benchmark to run to completion without failure. GB log files are stored in /data/data/com.primatelabs.geekbench/files and not accessible without root. On Chromebooks ( which have no adb root rights) it is possible to copy from this folder manually after the test run. --- wlauto/workloads/geekbench/__init__.py | 17 +++++++++++---- .../com.arm.wlauto.uiauto.geekbench.jar | Bin 11918 -> 11869 bytes .../com/arm/wlauto/uiauto/UiAutomation.java | 20 +++++++----------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/wlauto/workloads/geekbench/__init__.py b/wlauto/workloads/geekbench/__init__.py index f3abfde8..efff9aac 100644 --- a/wlauto/workloads/geekbench/__init__.py +++ b/wlauto/workloads/geekbench/__init__.py @@ -87,6 +87,14 @@ class Geekbench(AndroidUiAutoBenchmark): Parameter('times', kind=int, default=1, description=('Specfies the number of times the benchmark will be run in a "tight ' 'loop", i.e. without performaing setup/teardown inbetween.')), + Parameter('timeout', kind=int, default=900, + description=('Timeout for a single iteration of the benchmark. This value is ' + 'multiplied by ``times`` to calculate the overall run timeout. ')), + Parameter('disable_update_result', kind=bool, default=False, + description=('If ``True`` the results file will not be pulled from the devices ' + '/data/data/com.primatelabs.geekbench folder. This allows the ' + 'workload to be run on unrooted devices and the results extracted ' + 'manually later. ' )), ] @property @@ -101,14 +109,15 @@ class Geekbench(AndroidUiAutoBenchmark): super(Geekbench, self).__init__(device, **kwargs) self.uiauto_params['version'] = self.version self.uiauto_params['times'] = self.times - self.run_timeout = 10 * 60 * self.times + self.run_timeout = self.timeout * self.times self.exact_apk_version = self.version def update_result(self, context): super(Geekbench, self).update_result(context) - major_version = versiontuple(self.version)[0] - update_method = getattr(self, 'update_result_{}'.format(major_version)) - update_method(context) + if not self.disable_update_result: + major_version = versiontuple(self.version)[0] + update_method = getattr(self, 'update_result_{}'.format(major_version)) + update_method(context) def validate(self): if (self.times > 1) and (self.version == '2'): diff --git a/wlauto/workloads/geekbench/com.arm.wlauto.uiauto.geekbench.jar b/wlauto/workloads/geekbench/com.arm.wlauto.uiauto.geekbench.jar index 699555036655e72602a94b1b13f61ba30584c01f..c807b1cd9233f634931193ac4268bfa3b6c38848 100644 GIT binary patch delta 11643 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 F001cMU+n+@ delta 11692 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 Cu|vlI diff --git a/wlauto/workloads/geekbench/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java b/wlauto/workloads/geekbench/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java index 8f1bc0b2..140e35e4 100644 --- a/wlauto/workloads/geekbench/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java +++ b/wlauto/workloads/geekbench/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java @@ -35,9 +35,8 @@ import java.util.concurrent.TimeUnit; public class UiAutomation extends UxPerfUiAutomation { public static String TAG = "geekbench"; - public static final int WAIT_TIMEOUT_1SEC = 1000; - public static final long WAIT_TIMEOUT_5MIN = TimeUnit.SECONDS.toMillis(5 * 60); - public static final long WAIT_TIMEOUT_10MIN = TimeUnit.SECONDS.toMillis(10 * 60); + public static final long WAIT_TIMEOUT_5SEC = TimeUnit.SECONDS.toMillis(5); + public static final long WAIT_TIMEOUT_20MIN = TimeUnit.SECONDS.toMillis(20 * 60); public void runUiAutomation() throws Exception { Bundle params = getParams(); @@ -93,7 +92,7 @@ public class UiAutomation extends UxPerfUiAutomation { // new UiObject(new UiSelector().textContains("Accept") new UiObject(new UiSelector().resourceId("android:id/button1") .className("android.widget.Button")); - if (!acceptButton.waitForExists(WAIT_TIMEOUT_1SEC)) { + if (!acceptButton.waitForExists(WAIT_TIMEOUT_5SEC)) { throw new UiObjectNotFoundException("Could not find Accept button"); } acceptButton.click(); @@ -103,7 +102,7 @@ public class UiAutomation extends UxPerfUiAutomation { UiObject runButton = new UiObject(new UiSelector().textContains("Run Benchmarks") .className("android.widget.Button")); - if (!runButton.waitForExists(WAIT_TIMEOUT_1SEC)) { + if (!runButton.waitForExists(WAIT_TIMEOUT_5SEC)) { throw new UiObjectNotFoundException("Could not find Run button"); } runButton.click(); @@ -116,7 +115,7 @@ public class UiAutomation extends UxPerfUiAutomation { UiObject runButton = new UiObject(new UiSelector().resourceId("com.primatelabs.geekbench:id/runCpuBenchmarks") .className("android.widget.Button")); - if (!runButton.waitForExists(WAIT_TIMEOUT_1SEC)) { + if (!runButton.waitForExists(WAIT_TIMEOUT_5SEC)) { throw new UiObjectNotFoundException("Could not find Run button"); } runButton.click(); @@ -125,7 +124,7 @@ public class UiAutomation extends UxPerfUiAutomation { public void waitForResultsv2() throws Exception { UiSelector selector = new UiSelector(); UiObject resultsWebview = new UiObject(selector.className("android.webkit.WebView")); - if (!resultsWebview.waitForExists(WAIT_TIMEOUT_5MIN)) { + if (!resultsWebview.waitForExists(WAIT_TIMEOUT_20MIN)) { throw new UiObjectNotFoundException("Did not see Geekbench results screen."); } } @@ -135,10 +134,7 @@ public class UiAutomation extends UxPerfUiAutomation { UiObject runningTextView = new UiObject(selector.text("Running Benchmarks...") .className("android.widget.TextView")); - if (!runningTextView.waitForExists(WAIT_TIMEOUT_1SEC)) { - throw new UiObjectNotFoundException("Did not get to Running Benchmarks... screen."); - } - if (!runningTextView.waitUntilGone(WAIT_TIMEOUT_10MIN)) { + if (!runningTextView.waitUntilGone(WAIT_TIMEOUT_20MIN)) { throw new UiObjectNotFoundException("Did not get to Geekbench results screen."); } } @@ -160,7 +156,7 @@ public class UiAutomation extends UxPerfUiAutomation { getUiDevice().pressMenu(); UiObject shareButton = new UiObject(selector.text("Share") .className("android.widget.TextView")); - shareButton.waitForExists(WAIT_TIMEOUT_1SEC); + shareButton.waitForExists(WAIT_TIMEOUT_5SEC); shareButton.click(); } }