skpbench: run for a fixed duration

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 26 matching lines @@
     help="directory to execute ./skpbench from")
 __argparse.add_argument('-m', '--max-stddev',
     type=float, default=4,
     help="initial max allowable relative standard deviation")
 __argparse.add_argument('-x', '--suffix',
     help="suffix to append on config (e.g. '_before', '_after')")
 __argparse.add_argument('-w','--write-path',
     help="directory to save .png proofs to disk.")
 __argparse.add_argument('-v','--verbosity',
     type=int, default=1, help="level of verbosity (0=none to 5=debug)")
-__argparse.add_argument('-n', '--samples',
-    type=int, help="number of samples to collect for each bench")
-__argparse.add_argument('-d', '--sample-ms',
-    type=int, help="duration of each sample")
+__argparse.add_argument('-d', '--duration',
+    type=int, help="number of milliseconds to run each benchmark")
+__argparse.add_argument('-l', '--sample-ms',
+    type=int, help="minimum duration of a sample")
 __argparse.add_argument('--fps',
     action='store_true', help="use fps instead of ms")
 __argparse.add_argument('-c', '--config',
     default='gpu', help="comma- or space-separated list of GPU configs")
 __argparse.add_argument('skps',
     nargs='+',
     help=".skp files or directories to expand for .skp files")
 
 FLAGS = __argparse.parse_args()
 if FLAGS.adb:
@@ skipping 21 matching lines @@
     Thread.__init__(self)
 
   def run(self):
     """Runs on the background thread."""
     for line in iter(self._proc.stdout.readline, b''):
       self._queue.put(Message(Message.READLINE, line.decode('utf-8').rstrip()))
     self._queue.put(Message(Message.EXIT))
 
 class SKPBench:
   ARGV = ['skpbench', '--verbosity', str(FLAGS.verbosity)]
-  if FLAGS.samples:
-    ARGV.extend(['--samples', str(FLAGS.samples)])
+  if FLAGS.duration:
+    ARGV.extend(['--duration', str(FLAGS.duration)])
   if FLAGS.sample_ms:
     ARGV.extend(['--sampleMs', str(FLAGS.sample_ms)])
   if FLAGS.fps:
     ARGV.extend(['--fps', 'true'])
   if FLAGS.path:
     ARGV[0] = _path.join(FLAGS.path, ARGV[0])
   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 + ['--samples', '0'])
+    subprocess.call(cls.ARGV + ['--duration', '0'])
 
   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 138 matching lines @@
   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)
     run_benchmarks(configs, skps, hardware)
 
 
 if __name__ == '__main__':
   main()