Don't suppress nanobench output table in verbose mode

Changes verbose mode to print both the table and the individual sample
values. No need to hold back information in verbose mode.

BUG=skia:

Review URL: https://codereview.chromium.org/1208763003

1 files changed, 7 insertions, 7 deletions

diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index 19fdac0d47..7cc5383091 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -1005,8 +1005,6 @@ int nanobench_main() {
 
     if (kAutoTuneLoops != FLAGS_loops) {
         SkDebugf("Fixed number of loops; times would only be misleading so we won't print them.\n");
-    } else if (FLAGS_verbose) {
-        // No header.
     } else if (FLAGS_quiet) {
         SkDebugf("median\tbench\tconfig\n");
     } else if (kTimedSampling == FLAGS_samples) {
@@ -1103,11 +1101,6 @@ int nanobench_main() {
                          , sk_tools::getMaxResidentSetSizeMB()
                          , bench->getUniqueName()
                          , config);
-            } else if (FLAGS_verbose) {
-                for (int i = 0; i < samples.count(); i++) {
-                    SkDebugf("%s  ", HUMANIZE(samples[i]));
-                }
-                SkDebugf("%s\n", bench->getUniqueName());
             } else if (FLAGS_quiet) {
                 if (configs.count() == 1) {
                     config = ""; // Only print the config if we run the same bench on more than one.
@@ -1137,6 +1130,13 @@ int nanobench_main() {
                 gGrFactory->get(configs[i].ctxType)->printGpuStats();
             }
 #endif
+            if (FLAGS_verbose) {
+                SkDebugf("Samples:  ");
+                for (int i = 0; i < samples.count(); i++) {
+                    SkDebugf("%s  ", HUMANIZE(samples[i]));
+                }
+                SkDebugf("%s\n", bench->getUniqueName());
+            }
             cleanup_run(target);
         }
     }