Revert of Move BenchTimer to tools as Timer

tools/bench_record.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCommandLineFlags.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkOSFile.h"
 #include "SkPicture.h"
 #include "SkPictureRecorder.h"
 #include "SkStream.h"
 #include "SkString.h"
 
+#include "BenchTimer.h"
 #include "LazyDecodeBitmap.h"
 #include "Stats.h"
-#include "Timer.h"
+
+typedef WallTimer Timer;
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
 DEFINE_string2(skps, r, "skps", "Directory containing SKPs to read and re-record.");
 DEFINE_int32(samples, 10, "Number of times to re-record each SKP.");
 DEFINE_int32(tileGridSize, 512, "Set the tile grid size. Has no effect if bbh is not set to tilegrid.");
 DEFINE_string(bbh, "", "Turn on the bbh and select the type, one of rtree, tilegrid, quadtree");
 DEFINE_bool(skr, false, "Record SKR instead of SKP.");
 DEFINE_string(match, "", "The usual filters on file names of SKPs to bench.");
 DEFINE_string(timescale, "us", "Print times in ms, us, or ns");
@@ skipping 42 matching lines @@
 }
 
 static void bench_record(const SkPicture& src,
                          const double timerOverhead,
                          const char* name,
                          SkBBHFactory* bbhFactory) {
     // Rerecord once to warm up any caches.  Otherwise the first sample can be very noisy.
     rerecord(src, bbhFactory);
 
     // Rerecord once to see how many times we should loop to make timer overhead insignificant.
-    WallTimer timer;
-    const double scale = timescale();
+    Timer timer;
     do {
-        timer.start();
+        timer.start(timescale());
         rerecord(src, bbhFactory);
         timer.end();
-    } while (timer.fWall * scale < timerOverhead);  // Loop just in case something bizarre happens.
+    } while (timer.fWall < timerOverhead);   // Loop just in case something bizarre happens.
 
     // We want (timer overhead / measurement) to be less than FLAGS_overheadGoal.
     // So in each sample, we'll loop enough times to have made that true for our first measurement.
     const int loops = (int)ceil(timerOverhead / timer.fWall / FLAGS_overheadGoal);
 
     SkAutoTMalloc<double> samples(FLAGS_samples);
     for (int i = 0; i < FLAGS_samples; i++) {
-        timer.start();
+        timer.start(timescale());
         for (int j = 0; j < loops; j++) {
             rerecord(src, bbhFactory);
         }
         timer.end();
-        samples[i] = timer.fWall * scale / loops;
+        samples[i] = timer.fWall / loops;
     }
 
     Stats stats(samples.get(), FLAGS_samples);
     if (FLAGS_verbose == 0) {
         printf("%g\t%s\n", stats.min, name);
     } else if (FLAGS_verbose == 1) {
         // Get a rough idea of how noisy the measurements were.
         const double noisePercent = 100 * sqrt(stats.var) / stats.mean;
         printf("%g\t%g\t%g\t±%.0f%%\t%s\n", stats.min, stats.mean, stats.max, noisePercent, name);
     } else if (FLAGS_verbose == 2) {
@@ skipping 12 matching lines @@
 
     if (FLAGS_bbh.count() > 1) {
         SkDebugf("Multiple bbh arguments supplied.\n");
         return 1;
     }
 
     SkAutoTDelete<SkBBHFactory> bbhFactory(parse_FLAGS_bbh());
 
     // Each run will use this timer overhead estimate to guess how many times it should run.
     static const int kOverheadLoops = 10000000;
-    WallTimer timer;
+    Timer timer;
     double overheadEstimate = 0.0;
-    const double scale = timescale();
     for (int i = 0; i < kOverheadLoops; i++) {
-        timer.start();
+        timer.start(timescale());
         timer.end();
-        overheadEstimate += timer.fWall * scale;
+        overheadEstimate += timer.fWall;
     }
     overheadEstimate /= kOverheadLoops;
 
     SkOSFile::Iter it(FLAGS_skps[0], ".skp");
     SkString filename;
     bool failed = false;
     while (it.next(&filename)) {
         if (SkCommandLineFlags::ShouldSkip(FLAGS_match, filename.c_str())) {
             continue;
         }
@@ skipping 16 matching lines @@
         bench_record(*src, overheadEstimate, filename.c_str(), bbhFactory.get());
     }
     return failed ? 1 : 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif