Revert of skpbench: add option for gpu timing

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 14 matching lines @@
 Executes the skpbench binary with various configs and skps.
 
 Also monitors the output in order to filter out and re-run results that have an
 unacceptable stddev.
 
 """)
 
 __argparse.add_argument('--adb',
     action='store_true', help="execute skpbench over adb")
 __argparse.add_argument('-s', '--device-serial',
-    help="if using adb, ID of the specific device to target "
-         "(only required if more than 1 device is attached)")
+    help="if using adb, id of the specific device to target")
 __argparse.add_argument('-p', '--path',
     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('-d', '--duration',
     type=int, help="number of milliseconds to run each benchmark")
 __argparse.add_argument('-l', '--sample-ms',
-    type=int, help="duration of a sample (minimum)")
-__argparse.add_argument('--gpu',
-    action='store_true',
-    help="perform timing on the gpu clock instead of cpu (gpu work only)")
+    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 25 matching lines @@
     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.duration:
     ARGV.extend(['--duration', str(FLAGS.duration)])
   if FLAGS.sample_ms:
     ARGV.extend(['--sampleMs', str(FLAGS.sample_ms)])
-  if FLAGS.gpu:
-    ARGV.extend(['--gpuClock', 'true'])
   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
 
@@ skipping 75 matching lines @@
     elif FLAGS.verbosity >= 2:
       print("reusing previous result for %s/%s with lower stddev "
             "(%s%% instead of %s%%)." %
             (result.config, result.bench, self.best_result.stddev,
              result.stddev), file=sys.stderr)
     if self.max_stddev and self.best_result.stddev > self.max_stddev:
       raise StddevException()
 
   def terminate(self):
     if self._proc:
-      self._proc.terminate()
+      self._proc.kill()
       self._monitor.join()
       self._proc.wait()
       self._proc = None
 
 
 def run_benchmarks(configs, skps, hardware):
   SKPBench.print_header()
 
   benches = collections.deque([(skp, config, FLAGS.max_stddev)
                                for skp in skps
@@ skipping 55 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()