use BenchTimer, print in µs

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 "BenchTimer.h"
 #include "SkCommandLineFlags.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkOSFile.h"
 #include "SkPicture.h"
 #include "SkPictureRecorder.h"
 #include "SkRecording.h"
 #include "SkStream.h"
 #include "SkString.h"
-#include "SkTime.h"
 #include "LazyDecodeBitmap.h"
 
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
 // Just reading all the SKPs takes about 2 seconds for me, which is the same as about 100 loops of
 // rerecording all the SKPs.  So we default to --loops=900, which makes ~90% of our time spent in
 // recording, and this should take ~20 seconds to run.
 
 DEFINE_string2(skps, r, "skps", "Directory containing SKPs to read and re-record.");
 DEFINE_int32(loops, 900, "Number of times to re-record each SKP.");
@@ skipping 21 matching lines @@
         return SkNEW_ARGS(SkTileGridFactory, (info));
     }
     if (FLAGS_bbh.contains("quadtree")) {
         return SkNEW(SkQuadTreeFactory);
     }
     SkDebugf("Invalid bbh type %s, must be one of rtree, tilegrid, quadtree.\n", FLAGS_bbh[0]);
     return NULL;
 }
 
 static void bench_record(SkPicture* src, const char* name, SkBBHFactory* bbhFactory) {
-    const SkMSec start = SkTime::GetMSecs();
+    BenchTimer timer;
+    timer.start();
     const int width  = src ? src->width()  : FLAGS_nullSize;
     const int height = src ? src->height() : FLAGS_nullSize;
 
     for (int i = 0; i < FLAGS_loops; i++) {
         if (FLAGS_skr) {
             EXPERIMENTAL::SkRecording recording(width, height);
             if (NULL != src) {
                 src->draw(recording.canvas());
             }
             // Release and delete the SkPlayback so that recording optimizes its SkRecord.
             SkDELETE(recording.releasePlayback());
         } else {
             SkPictureRecorder recorder;
             SkCanvas* canvas = recorder.beginRecording(width, height, bbhFactory, FLAGS_flags);
             if (NULL != src) {
                 src->draw(canvas);
             }
             if (FLAGS_endRecording) {
                 SkAutoTUnref<SkPicture> dst(recorder.endRecording());
             }
         }
     }
+    timer.end();
 
-    const SkMSec elapsed = SkTime::GetMSecs() - start;
-    const double msPerLoop = elapsed / (double)FLAGS_loops;
-    printf("%.2g\t%s\n", msPerLoop, name);
+    const double msPerLoop = timer.fCpu / (double)FLAGS_loops;
+    printf("%u\t%s\n", unsigned(1000 * msPerLoop), name);
 }
 
 int tool_main(int argc, char** argv);
 int tool_main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     SkAutoGraphics autoGraphics;
 
     if (FLAGS_bbh.count() > 1) {
         SkDebugf("Multiple bbh arguments supplied.\n");
         return 1;
@@ skipping 31 matching lines @@
         bench_record(src, 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