Major bench refactoring.

bench/MatrixBench.cpp

 
 /*
  * Copyright 2011 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 "SkMatrix.h"
 #include "SkRandom.h"
 #include "SkString.h"
 
 class MatrixBench : public SkBenchmark {
     SkString    fName;
-    enum { N = 100000 };
 public:
     MatrixBench(void* param, const char name[]) : INHERITED(param) {
         fName.printf("matrix_%s", name);
         fIsRendering = false;
     }
 
     virtual void performTest() = 0;
 
 protected:
     virtual int mulLoopCount() const { return 1; }
 
     virtual const char* onGetName() {
         return fName.c_str();
     }
 
     virtual void onDraw(SkCanvas*) {
-        int n = SkBENCHLOOP(N * this->mulLoopCount());
-        for (int i = 0; i < n; i++) {
+        for (int i = 0; i < this->getLoops(); i++) {
             this->performTest();
         }
     }
 
 private:
     typedef SkBenchmark INHERITED;
 };
 
 // we want to stop the compiler from eliminating code that it thinks is a no-op
 // so we have a non-static global we increment, hoping that will convince the
@@ skipping 245 matching lines @@
         float ty = fMatrix[SkMatrix::kMTransY];
         do {
             dst->fY = SkScalarMulAdd(src->fY, my, ty);
             dst->fX = SkScalarMulAdd(src->fX, mx, tx);
             src += 1;
             dst += 1;
         } while (--count);
     }
  private:
     enum {
-        kCount = SkBENCHLOOP(16)
+        kCount = 16
     };
     SkMatrix fMatrix;
-    SkPoint fSrc [16];
-    SkPoint fDst [16];
+    SkPoint fSrc [kCount];
+    SkPoint fDst [kCount];
     SkRandom fRandom;
     typedef MatrixBench INHERITED;
 };
 
 class ScaleTransDoubleMatrixBench : public MatrixBench {
  public:
     ScaleTransDoubleMatrixBench(void* p) : INHERITED(p, "scaletrans_double") {
         init9(fMatrix);
         int i;
         for (i = 0; i < kCount; i++) {
@@ skipping 15 matching lines @@
         float ty = (float) fMatrix[SkMatrix::kMTransY];
         do {
             dst->fY = src->fY * my + ty;
             dst->fX = src->fX * mx + tx;
             src += 1;
             dst += 1;
         } while (--count);
     }
  private:
     enum {
-        kCount = SkBENCHLOOP(16)
+        kCount = 16
     };
     double fMatrix [9];
-    SkPoint fSrc [16];
-    SkPoint fDst [16];
+    SkPoint fSrc [kCount];
+    SkPoint fDst [kCount];
     SkRandom fRandom;
     typedef MatrixBench INHERITED;
 };
 
 class InvertMapRectMatrixBench : public MatrixBench {
 public:
     InvertMapRectMatrixBench(void* param, const char* name, int flags)
         : INHERITED(param, name)
         , fFlags(flags) {
         fMatrix.reset();
@@ skipping 83 matching lines @@
 
 DEF_BENCH( return new InvertMapRectMatrixBench(p,
                            "invert_maprect_typemask_nonpersp",
                            InvertMapRectMatrixBench::kUncachedTypeMask_Flag |
                            InvertMapRectMatrixBench::kScale_Flag |
                            InvertMapRectMatrixBench::kRotate_Flag |
                            InvertMapRectMatrixBench::kTranslate_Flag); )
 
 DEF_BENCH( return new ScaleTransMixedMatrixBench(p); )
 DEF_BENCH( return new ScaleTransDoubleMatrixBench(p); )