skpbench: add debug prints for thermal trip points

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 95 matching lines @@
   if FLAGS.adb:
     if FLAGS.device_serial is None:
       ARGV = ['adb', 'shell'] + ARGV
     else:
       ARGV = ['adb', '-s', FLAGS.device_serial, 'shell'] + ARGV
 
   @classmethod
   def print_header(cls):
     subprocess.call(cls.ARGV + ['--duration', '0'])
 
+  @classmethod
+  def run_warmup(cls, warmup_time):
+    if not warmup_time:
+      return
+    print('running %i second warmup...' % warmup_time)
+    commandline = cls.ARGV + ['--duration', str(warmup_time * 1000),
+                              '--config', 'gpu',
+                              '--skp', 'warmup']
+    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
+    raise Exception('Invalid warmup output:\n%s' % output)
+
   def __init__(self, skp, config, max_stddev, best_result=None):
     self.skp = skp
     self.config = config
     self.max_stddev = max_stddev
     self.best_result = best_result
     self._queue = Queue()
     self._proc = None
     self._monitor = None
     self._hw_poll_timer = None
 
@@ skipping 97 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:
+        if FLAGS.verbosity >= 5:
+          hardware.print_debug_diagnostics()
         skpbench.terminate()
-        naptime = max(hardware.kick_in_time, exception.sleeptime)
         if FLAGS.verbosity >= 1:
           print("%s; taking a %i second nap..." %
-                (exception.message, naptime), file=sys.stderr)
+                (exception.message, exception.sleeptime), file=sys.stderr)
         benches.appendleft(benchargs) # retry the same bench next time.
-        hardware.sleep(naptime - hardware.kick_in_time)
-        time.sleep(hardware.kick_in_time)
+        hardware.sleep(exception.sleeptime)
+        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)
     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:
-    if hardware.kick_in_time:
-      print("sleeping %i seconds to allow hardware settings to kick in..." %
-            hardware.kick_in_time, file=sys.stderr)
-      time.sleep(hardware.kick_in_time)
+    SKPBench.run_warmup(hardware.warmup_time)
     run_benchmarks(configs, skps, hardware)
 
 
 if __name__ == '__main__':
   main()