hack

tools/PictureBenchmark.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBenchLogger.h"
 #include "BenchTimer.h"
 #include "PictureBenchmark.h"
 #include "SkCanvas.h"
 #include "SkPicture.h"
 #include "SkString.h"
 #include "picture_utils.h"
 
 namespace sk_tools {
 
 PictureBenchmark::PictureBenchmark()
 : fRepeats(1)
 , fLogger(NULL)
 , fRenderer(NULL)
 , fTimerResult(TimerData::kAvg_Result)
 , fTimerTypes(0)
 , fTimeIndividualTiles(false)
-, fPurgeDecodedTex(false)
+, fPurgeDecodedTex1(false)
+, fPreprocess(false)
 {}
 
 PictureBenchmark::~PictureBenchmark() {
     SkSafeUnref(fRenderer);
 }
 
 void PictureBenchmark::setTimersToShow(bool wall,
                                        bool truncatedWall,
                                        bool cpu,
                                        bool truncatedCpu,
@@ skipping 33 matching lines @@
     }
 
     SkASSERT(fRenderer != NULL);
     if (NULL == fRenderer) {
         return;
     }
 
     fRenderer->init(pict, NULL, NULL, false);
 
     // We throw this away to remove first time effects (such as paging in this program)
-    fRenderer->setup();
+    fRenderer->setup1();
+
+    if (fPreprocess) {
+        if (NULL != fRenderer->getCanvas()) {
+            fRenderer->getCanvas()->EXPERIMENTAL_optimize(pict);
+        }
+    }
+
     fRenderer->render(NULL);
     fRenderer->resetState(true);   // flush, swapBuffers and Finish
 
-    if (fPurgeDecodedTex) {
+    if (fPreprocess) {
+//        pict->needsNewGenID();
+        if (NULL != fRenderer->getCanvas()) {
+            fRenderer->getCanvas()->EXPERIMENTAL_purge();
+        }
+    }
+
+    if (fPurgeDecodedTex1) {
         fRenderer->purgeTextures();
     }
 
     bool usingGpu = false;
 #if SK_SUPPORT_GPU
     usingGpu = fRenderer->isUsingGpuDevice();
 #endif
 
     uint32_t timerTypes = fTimerTypes;
     if (!usingGpu) {
@@ skipping 59 matching lines @@
 
                 longRunningTimer->start();
                 for (int inner = 0; inner < numInnerLoops; ++inner) {
                     perTileTimer->start();
                     tiledRenderer->drawCurrentTile();
                     perTileTimer->truncatedEnd();
                     tiledRenderer->resetState(false);  // flush & swapBuffers, but don't Finish
                     perTileTimer->end();
                     SkAssertResult(perTileTimerData.appendTimes(perTileTimer.get()));
 
-                    if (fPurgeDecodedTex) {
+                    if (fPurgeDecodedTex1) {
                         fRenderer->purgeTextures();
                     }
                 }
                 longRunningTimer->truncatedEnd();
                 tiledRenderer->resetState(true);       // flush, swapBuffers and Finish
                 longRunningTimer->end();
                 SkAssertResult(longRunningTimerData.appendTimes(longRunningTimer.get()));
             }
 
             SkString configName = tiledRenderer->getConfigName();
             configName.appendf(": tile [%i,%i] out of [%i,%i]", x, y, xTiles, yTiles);
 
             // TODO(borenet): Turn off per-iteration tile time reporting for now.
             // Avoiding logging the time for every iteration for each tile cuts
             // down on data file size by a significant amount. Re-enable this once
             // we're loading the bench data directly into a data store and are no
             // longer generating SVG graphs.
 #if 0
             SkString result = perTileTimerData.getResult(timeFormat.c_str(), fTimerResult,
                                                          configName.c_str(), timerTypes);
             result.append("\n");
             this->logProgress(result.c_str());
 #endif
 
-            if (fPurgeDecodedTex) {
+            if (fPurgeDecodedTex1) {
                 configName.append(" <withPurging>");
             }
             configName.append(" <averaged>");
             SkString longRunningResult = longRunningTimerData.getResult(
                 tiledRenderer->getNormalTimeFormat().c_str(),
                 TimerData::kAvg_Result,
                 configName.c_str(), timerTypes, numInnerLoops);
             longRunningResult.append("\n");
             this->logProgress(longRunningResult.c_str());
         }
     } else {
         SkAutoTDelete<BenchTimer> longRunningTimer(this->setupTimer());
         TimerData longRunningTimerData(numOuterLoops);
 
         for (int outer = 0; outer < numOuterLoops; ++outer) {
             SkAutoTDelete<BenchTimer> perRunTimer(this->setupTimer(false));
             TimerData perRunTimerData(numInnerLoops);
 
             longRunningTimer->start();
             for (int inner = 0; inner < numInnerLoops; ++inner) {
-                fRenderer->setup();
+                fRenderer->setup1();
 
                 perRunTimer->start();
                 fRenderer->render(NULL);
                 perRunTimer->truncatedEnd();
                 fRenderer->resetState(false);   // flush & swapBuffers, but don't Finish
                 perRunTimer->end();
 
                 SkAssertResult(perRunTimerData.appendTimes(perRunTimer.get()));
 
-                if (fPurgeDecodedTex) {
+                if (fPreprocess) {
+//                    pict->needsNewGenID();
+                    if (NULL != fRenderer->getCanvas()) {
+                        fRenderer->getCanvas()->EXPERIMENTAL_purge();
+                    }
+                }
+
+                if (fPurgeDecodedTex1) {
                     fRenderer->purgeTextures();
                 }
+
             }
             longRunningTimer->truncatedEnd();
             fRenderer->resetState(true);        // flush, swapBuffers and Finish
             longRunningTimer->end();
             SkAssertResult(longRunningTimerData.appendTimes(longRunningTimer.get()));
         }
 
         SkString configName = fRenderer->getConfigName();
-        if (fPurgeDecodedTex) {
+        if (fPurgeDecodedTex1) {
             configName.append(" <withPurging>");
         }
 
         // Beware - since the per-run-timer doesn't ever include a glFinish it can
         // report a lower time then the long-running-timer
 #if 0
         SkString result = perRunTimerData.getResult(timeFormat.c_str(),
                                                     fTimerResult,
                                                     configName.c_str(),
                                                     timerTypes);
         result.append("\n");
 
         this->logProgress(result.c_str());
 #else
         SkString result = longRunningTimerData.getResult(timeFormat.c_str(),
                                                             fTimerResult,
                                                             configName.c_str(),
                                                             timerTypes,
                                                             numInnerLoops);
         result.append("\n");
         this->logProgress(result.c_str());
 #endif
     }
 
     fRenderer->end();
 }
 
 }