diff options
author | csmartdalton <csmartdalton@google.com> | 2016-10-18 09:19:50 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-10-18 09:19:50 -0700 |
commit | 310d72c5e2c474296c8dd7f9af54e323583c2e0b (patch) | |
tree | 179d5cdc64dbff808a6b53c8a496da62fba08912 /tools/skpbench/skpbench.py | |
parent | e9ea349ff12f84c55766d75e36dadaa4c754105e (diff) |
skpbench: suppot Nexus 6P
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2415033002
Review-Url: https://codereview.chromium.org/2415033002
Diffstat (limited to 'tools/skpbench/skpbench.py')
-rwxr-xr-x | tools/skpbench/skpbench.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tools/skpbench/skpbench.py b/tools/skpbench/skpbench.py index 9598162693..3e5b45138f 100755 --- a/tools/skpbench/skpbench.py +++ b/tools/skpbench/skpbench.py @@ -124,7 +124,7 @@ class SKPBench: def run_warmup(cls, warmup_time): if not warmup_time: return - print('running %i second warmup...' % warmup_time) + print('running %i second warmup...' % warmup_time, file=sys.stderr) commandline = cls.ARGV + ['--duration', str(warmup_time * 1000), '--config', 'gpu', '--skp', 'warmup'] @@ -180,7 +180,7 @@ class SKPBench: hardware.sanity_check() self._process_result(result) else: - print(message.value) + print(message.value, file=sys.stderr) sys.stdout.flush() continue if message.message == Message.POLL_HARDWARE: @@ -252,14 +252,16 @@ def run_benchmarks(configs, skps, hardware): skpbench.best_result)) except HardwareException as exception: + skpbench.terminate() if FLAGS.verbosity >= 5: hardware.print_debug_diagnostics() - skpbench.terminate() if FLAGS.verbosity >= 1: print("%s; taking a %i second nap..." % (exception.message, exception.sleeptime), file=sys.stderr) benches.appendleft(benchargs) # retry the same bench next time. hardware.sleep(exception.sleeptime) + if FLAGS.verbosity >= 5: + hardware.print_debug_diagnostics() SKPBench.run_warmup(hardware.warmup_time) @@ -275,6 +277,9 @@ def main(): if model == 'Pixel C': from _hardware_pixel_c import HardwarePixelC hardware = HardwarePixelC(adb) + elif model == 'Nexus 6P': + from _hardware_nexus_6p import HardwareNexus6P + hardware = HardwareNexus6P(adb) else: from _hardware_android import HardwareAndroid print("WARNING: %s: don't know how to monitor this hardware; results " |