skpbench: suppot Nexus 6P

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 106 matching lines @@
   @classmethod
   def print_header(cls):
     commandline = cls.ARGV + ['--duration', '0']
     dump_commandline_if_verbose(commandline)
     subprocess.call(commandline)
 
   @classmethod
   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']
     dump_commandline_if_verbose(commandline)
     output = subprocess.check_output(commandline).decode('utf-8')
     # validate the warmup run output.
     for line in output.split('\n'):
       match = BenchResult.match(line.rstrip())
       if match and match.bench == 'warmup':
         return
@@ skipping 35 matching lines @@
     self._monitor.start()
 
     while True:
       message = self._queue.get()
       if message.message == Message.READLINE:
         result = BenchResult.match(message.value)
         if result:
           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:
         hardware.sanity_check()
         self._schedule_hardware_poll()
         continue
       if message.message == Message.EXIT:
         self._monitor.join()
         self._proc.wait()
         if self._proc.returncode != 0:
@@ skipping 51 matching lines @@
           print("stddev is too high for %s/%s (%s%%, max=%.2f%%), "
                 "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:
           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)
 
 
 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()
     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()