Have nanobench --verbose mode always just print integer nanoseconds.

bench/nanobench.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 <ctype.h>
 
 #include "Benchmark.h"
@@ skipping 54 matching lines @@
 
 DEFINE_string(outResultsFile, "", "If given, write results here as JSON.");
 DEFINE_int32(maxCalibrationAttempts, 3,
              "Try up to this many times to guess loops for a bench, or skip the bench.");
 DEFINE_int32(maxLoops, 1000000, "Never run a bench more times than this.");
 DEFINE_string(clip, "0,0,1000,1000", "Clip for SKPs.");
 DEFINE_string(scales, "1.0", "Space-separated scales for SKPs.");
 DEFINE_bool(bbh, true, "Build a BBH for SKPs?");
 
 static SkString humanize(double ms) {
-    if (ms > 1e+3) return SkStringPrintf("%.3gs",  ms/1e3);
-    if (ms < 1e-3) return SkStringPrintf("%.3gns", ms*1e6);
+    if (FLAGS_verbose) return SkStringPrintf("%llu", (uint64_t)(ms*1e6));
+    if (ms > 1e+3)     return SkStringPrintf("%.3gs",  ms/1e3);
+    if (ms < 1e-3)     return SkStringPrintf("%.3gns", ms*1e6);
 #ifdef SK_BUILD_FOR_WIN
-    if (ms < 1)    return SkStringPrintf("%.3gus", ms*1e3);
+    if (ms < 1)        return SkStringPrintf("%.3gus", ms*1e3);
 #else
-    if (ms < 1)    return SkStringPrintf("%.3gµs", ms*1e3);
+    if (ms < 1)        return SkStringPrintf("%.3gµs", ms*1e3);
 #endif
     return SkStringPrintf("%.3gms", ms);
 }
 #define HUMANIZE(ms) humanize(ms).c_str()
 
 static double time(int loops, Benchmark* bench, SkCanvas* canvas, SkGLContextHelper* gl) {
     if (canvas) {
         canvas->clear(SK_ColorWHITE);
     }
     WallTimer timer;
@@ skipping 625 matching lines @@
 
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return nanobench_main();
 }
 #endif