skpbench: simplify adb and reduce number of invocations

tools/skpbench/skpbench.py

 #!/usr/bin/env python
 
 # Copyright 2016 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from __future__ import print_function
 from _adb import Adb
 from _benchresult import BenchResult
@@ skipping 50 matching lines @@
     help=".skp files or directories to expand for .skp files")
 
 FLAGS = __argparse.parse_args()
 if FLAGS.adb:
   import _adb_path as _path
   _path.init(FLAGS.device_serial)
 else:
   import _os_path as _path
 
 def dump_commandline_if_verbose(commandline):
-  if FLAGS.verbosity >= 4:
+  if FLAGS.verbosity >= 5:
     quoted = ['\'%s\'' % re.sub(r'([\\\'])', r'\\\1', x) for x in commandline]
     print(' '.join(quoted), file=sys.stderr)
 
 
 class StddevException(Exception):
   pass
 
 class Message:
   READLINE = 0,
   POLL_HARDWARE = 1,
@@ skipping 164 matching lines @@
                 "re-queuing with max=%.2f%%." %
                 (skpbench.best_result.config, skpbench.best_result.bench,
                  skpbench.best_result.stddev, skpbench.max_stddev,
                  retry_max_stddev),
                 file=sys.stderr)
         benches.append((skpbench.skp, skpbench.config, retry_max_stddev,
                         skpbench.best_result))
 
       except HardwareException as exception:
         skpbench.terminate()
-        if FLAGS.verbosity >= 5:
+        if FLAGS.verbosity >= 4:
           hardware.print_debug_diagnostics()
         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:
+        if FLAGS.verbosity >= 4:
           hardware.print_debug_diagnostics()
         SKPBench.run_warmup(hardware.warmup_time)
 
 
 def main():
   # Delimiter is ',' or ' ', skip if nested inside parens (e.g. gpu(a=b,c=d)).
   DELIMITER = r'[, ](?!(?:[^(]*\([^)]*\))*[^()]*\))'
   configs = re.split(DELIMITER, FLAGS.config)
   skps = _path.find_skps(FLAGS.skps)
 
   if FLAGS.adb:
-    adb = Adb(FLAGS.device_serial)
-    model = adb.get_device_model()
+    adb = Adb(FLAGS.device_serial,
+              echofile=(sys.stderr if FLAGS.verbosity >= 5 else None))
+    model = adb.check('getprop ro.product.model').strip()
     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 "
             "may be unreliable." % model, file=sys.stderr)
       hardware = HardwareAndroid(adb)
   else:
     hardware = Hardware()
 
   with hardware:
     SKPBench.run_warmup(hardware.warmup_time)
     run_benchmarks(configs, skps, hardware)
 
 
 if __name__ == '__main__':
   main()