Major bench refactoring.

bench/RTreeBench.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 "SkBenchmark.h"
 #include "SkCanvas.h"
 #include "SkRTree.h"
 #include "SkRandom.h"
 #include "SkString.h"
 
 // confine rectangles to a smallish area, so queries generally hit something, and overlap occurs:
 static const int GENERATE_EXTENTS = 1000;
 static const int NUM_BUILD_RECTS = 500;
 static const int NUM_QUERY_RECTS = 5000;
-static const int NUM_QUERIES = 1000;
 static const int GRID_WIDTH = 100;
 
 typedef SkIRect (*MakeRectProc)(SkMWCRandom&, int, int);
 
 // Time how long it takes to build an R-Tree either bulk-loaded or not
 class BBoxBuildBench : public SkBenchmark {
 public:
     BBoxBuildBench(void* param, const char* name, MakeRectProc proc, bool bulkLoad,
                     SkBBoxHierarchy* tree)
         : INHERITED(param)
@@ skipping 10 matching lines @@
     }
     virtual ~BBoxBuildBench() {
         fTree->unref();
     }
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fName.c_str();
     }
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkMWCRandom rand;
-        for (int i = 0; i < SkBENCHLOOP(100); ++i) {
+        for (int i = 0; i < this->getLoops(); ++i) {
             for (int j = 0; j < NUM_BUILD_RECTS; ++j) {
                 fTree->insert(reinterpret_cast<void*>(j), fProc(rand, j, NUM_BUILD_RECTS),
                               fBulkLoad);
             }
             fTree->flushDeferredInserts();
             fTree->clear();
         }
     }
 private:
     SkBBoxHierarchy* fTree;
@@ skipping 30 matching lines @@
     }
     virtual ~BBoxQueryBench() {
         fTree->unref();
     }
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fName.c_str();
     }
     virtual void onPreDraw() SK_OVERRIDE {
         SkMWCRandom rand;
-        for (int j = 0; j < SkBENCHLOOP(NUM_QUERY_RECTS); ++j) {
-            fTree->insert(reinterpret_cast<void*>(j), fProc(rand, j,
-                           SkBENCHLOOP(NUM_QUERY_RECTS)), fBulkLoad);
+        for (int j = 0; j < NUM_QUERY_RECTS; ++j) {
+            fTree->insert(reinterpret_cast<void*>(j),
+                          fProc(rand, j, NUM_QUERY_RECTS),
+                          fBulkLoad);
         }
         fTree->flushDeferredInserts();
     }
 
     virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkMWCRandom rand;
-        for (int i = 0; i < SkBENCHLOOP(NUM_QUERIES); ++i) {
+        for (int i = 0; i < this->getLoops(); ++i) {
             SkTDArray<void*> hits;
             SkIRect query;
             switch(fQuery) {
                 case kSmall_QueryType:
                     query.fLeft = rand.nextU() % GENERATE_EXTENTS;
                     query.fTop = rand.nextU() % GENERATE_EXTENTS;
                     query.fRight = query.fLeft + (GENERATE_EXTENTS / 20);
                     query.fBottom = query.fTop + (GENERATE_EXTENTS / 20);
                     break;
                 case kLarge_QueryType:
@@ skipping 181 matching lines @@
 static BenchRegistry gReg9(Fact9);
 static BenchRegistry gReg8(Fact8);
 static BenchRegistry gReg7(Fact7);
 static BenchRegistry gReg6(Fact6);
 static BenchRegistry gReg5(Fact5);
 static BenchRegistry gReg4(Fact4);
 static BenchRegistry gReg3(Fact3);
 static BenchRegistry gReg2(Fact2);
 static BenchRegistry gReg1(Fact1);
 static BenchRegistry gReg0(Fact0);