commit 06cddec8570cbf29f89e89736afb0487b5b95abd
author bsalomon <bsalomon@google.com> Fri Oct 24 10:40:50 2014 -0700
committer Commit bot <commit-bot@chromium.org> Fri Oct 24 10:40:50 2014 -0700
tree 5f7dc9f5e0b0bba4953dd77bfb2be4891eed7855
parent efb7e42e3779c9e8829d2edf1284ae57e310b847

Print GPU cache stats in nanobench/dm with veryVerbose

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

bench/nanobench.cpp

diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index 2758528..a5a96aa 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -576,6 +576,10 @@
     gGrFactory.reset(SkNEW_ARGS(GrContextFactory, (grContextOpts)));
 #endif
 
+    if (FLAGS_veryVerbose) {
+        FLAGS_verbose = true;
+    }
+
     if (kAutoTuneLoops != FLAGS_loops) {
         FLAGS_samples     = 1;
         FLAGS_gpuFrameLag = 0;
@@ -719,17 +723,23 @@
                         , bench->getUniqueName()
                         );
             }
+#if SK_SUPPORT_GPU && GR_CACHE_STATS
+            if (FLAGS_veryVerbose &&
+                Benchmark::kGPU_Backend == targets[j]->config.backend) {
+                gGrFactory->get(targets[j]->config.ctxType)->printCacheStats();  
+            }
+#endif
         }
         targets.deleteAll();
 
-    #if SK_SUPPORT_GPU
+#if SK_SUPPORT_GPU
         if (FLAGS_abandonGpuContext) {
             gGrFactory->abandonContexts();
         }
         if (FLAGS_resetGpuContext || FLAGS_abandonGpuContext) {
             gGrFactory->destroyContexts();
         }
-    #endif
+#endif
     }
 
     return 0;

dm/DM.cpp

diff --git a/dm/DM.cpp b/dm/DM.cpp
index aba6523..51bbf0d 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -189,7 +189,7 @@
     SkAutoGraphics ag;
     SkTaskGroup::Enabler enabled(FLAGS_threads);
 
-    if (FLAGS_dryRun) {
+    if (FLAGS_dryRun || FLAGS_veryVerbose) {
         FLAGS_verbose = true;
     }
 #if SK_ENABLE_INST_COUNT

dm/DMGpuGMTask.cpp

diff --git a/dm/DMGpuGMTask.cpp b/dm/DMGpuGMTask.cpp
index 65d65d9..fb170a2 100644
--- a/dm/DMGpuGMTask.cpp
+++ b/dm/DMGpuGMTask.cpp
@@ -1,7 +1,7 @@
 #include "DMGpuGMTask.h"
 #include "DMUtil.h"
 #include "DMWriteTask.h"
-#include "SkCommandLineFlags.h"
+#include "SkCommonFlags.h"
 #include "SkSurface.h"
 #include "SkTLS.h"
 
@@ -39,6 +39,11 @@
     canvas->concat(fGM->getInitialTransform());
     fGM->draw(canvas);
     canvas->flush();
+#if GR_CACHE_STATS && SK_SUPPORT_GPU
+    if (FLAGS_veryVerbose) {
+        grFactory->get(fContextType)->printCacheStats();
+    }
+#endif
 
     SkBitmap bitmap;
     bitmap.setInfo(info);