Make all gradient benchs use the same repeat count.

Make all gradient benchs use the same repeat count.

Committed: http://code.google.com/p/skia/source/detail?r=11634

[bsalomon, 2013-09-30 18:04:14]

https://codereview.chromium.org/25306003/diff/1/bench/GradientBench.cpp
File bench/GradientBench.cpp (right):

https://codereview.chromium.org/25306003/diff/1/bench/GradientBench.cpp#newco...
bench/GradientBench.cpp:227: DEF_BENCH( return new
GradientBench(kLinear_GradType); )
moved from below.

[robertphillips, 2013-09-30 18:07:02]

lgtm

https://codereview.chromium.org/25306003/diff/1/bench/GradientBench.cpp
File bench/GradientBench.cpp (right):

https://codereview.chromium.org/25306003/diff/1/bench/GradientBench.cpp#newco...
bench/GradientBench.cpp:281: SK_ColorWHITE };
I don't think this indent is correct.

[commit-bot: I haz the power, 2013-09-30 18:10:12]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/bsalomon@google.com/25306003/7001

[commit-bot: I haz the power, 2013-09-30 18:43:31]

Retried try job too often on Build-Mac10.7-Clang-x86-Release-Trybot for step(s)
BuildBench, BuildEverything
http://skiabot-master.pogerlabs.com:10117/buildstatus?builder=Build-Mac10.7-C...

[commit-bot: I haz the power, 2013-09-30 19:10:54]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/bsalomon@google.com/25306003/15001

[commit-bot: I haz the power, 2013-09-30 19:41:15]

Failed to apply patch for bench/GradientBench.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file bench/GradientBench.cpp
  Hunk #1 succeeded at 109 (offset 3 lines).
  Hunk #2 succeeded at 161 (offset 3 lines).
  Hunk #3 succeeded at 190 (offset 5 lines).
  Hunk #4 succeeded at 210 (offset 5 lines).
  Hunk #5 succeeded at 228 (offset 5 lines).
  Hunk #6 FAILED at 290.
  1 out of 6 hunks FAILED -- saving rejects to file bench/GradientBench.cpp.rej

Patch:       bench/GradientBench.cpp
Index: bench/GradientBench.cpp
diff --git a/bench/GradientBench.cpp b/bench/GradientBench.cpp
index
029c3650716e1e6c48e933810e239c42c97bf987..41c3c400266d8c4afe35ab81cc27ca91f40df072
100644
--- a/bench/GradientBench.cpp
+++ b/bench/GradientBench.cpp
@@ -106,13 +106,12 @@ typedef SkShader* (*GradMaker)(const SkPoint pts[2], const
GradData& data,
 static const struct {
     GradMaker   fMaker;
     const char* fName;
-    int         fRepeat;
 } gGrads[] = {
-    { MakeLinear,   "linear",  15 },
-    { MakeRadial,   "radial1", 10 },
-    { MakeSweep,    "sweep",    1 },
-    { Make2Radial,  "radial2",  5 },
-    { MakeConical,  "conical",  5 },
+    { MakeLinear,   "linear"  },
+    { MakeRadial,   "radial1" },
+    { MakeSweep,    "sweep"   },
+    { Make2Radial,  "radial2" },
+    { MakeConical,  "conical" },
 };
 
 enum GradType { // these must match the order in gGrads
@@ -159,10 +158,10 @@ static const char* geomtypename(GeomType gt) {
 class GradientBench : public SkBenchmark {
     SkString fName;
     SkShader* fShader;
-    int      fRepeat;
     enum {
         W   = 400,
         H   = 400,
+        kRepeat = 15,
     };
 public:
     GradientBench(GradType gradType,
@@ -186,7 +185,6 @@ public:
             { SkIntToScalar(W), SkIntToScalar(H) }
         };
 
-        fRepeat = gGrads[gradType].fRepeat;
         fShader = gGrads[gradType].fMaker(pts, data, tm, NULL, scale);
         fGeomType = geomType;
     }
@@ -207,7 +205,7 @@ protected:
         paint.setShader(fShader);
 
         SkRect r = { 0, 0, SkIntToScalar(W), SkIntToScalar(H) };
-        for (int i = 0; i < this->getLoops() * fRepeat; i++) {
+        for (int i = 0; i < this->getLoops() * kRepeat; i++) {
             switch (fGeomType) {
                case kRect_GeomType:
                    canvas->drawRect(r, paint);
@@ -225,6 +223,29 @@ private:
     GeomType fGeomType;
 };
 
+DEF_BENCH( return new GradientBench(kLinear_GradType); )
+DEF_BENCH( return new GradientBench(kLinear_GradType, gGradData[1]); )
+DEF_BENCH( return new GradientBench(kLinear_GradType, gGradData[0],
SkShader::kMirror_TileMode); )
+
+// Draw a radial gradient of radius 1/2 on a rectangle; half the lines should
+// be completely pinned, the other half should pe partially pinned
+DEF_BENCH( return new GradientBench(kRadial_GradType, gGradData[0],
SkShader::kClamp_TileMode, kRect_GeomType, 0.5f); )
+
+// Draw a radial gradient on a circle of equal size; all the lines should
+// hit the unpinned fast path (so long as GradientBench.W == H)
+DEF_BENCH( return new GradientBench(kRadial_GradType, gGradData[0],
SkShader::kClamp_TileMode, kOval_GeomType); )
+
+DEF_BENCH( return new GradientBench(kRadial_GradType, gGradData[0],
SkShader::kMirror_TileMode); )
+DEF_BENCH( return new GradientBench(kSweep_GradType); )
+DEF_BENCH( return new GradientBench(kSweep_GradType, gGradData[1]); )
+DEF_BENCH( return new GradientBench(kRadial2_GradType); )
+DEF_BENCH( return new GradientBench(kRadial2_GradType, gGradData[1]); )
+DEF_BENCH( return new GradientBench(kRadial2_GradType, gGradData[0],
SkShader::kMirror_TileMode); )
+DEF_BENCH( return new GradientBench(kConical_GradType); )
+DEF_BENCH( return new GradientBench(kConical_GradType, gGradData[1]); )
+
+///////////////////////////////////////////////////////////////////////////////
+
 class Gradient2Bench : public SkBenchmark {
     SkString fName;
     bool     fHasAlpha;
@@ -269,26 +290,5 @@ private:
     typedef SkBenchmark INHERITED;
 };
 
-DEF_BENCH( return new GradientBench(kLinear_GradType); )
-DEF_BENCH( return new GradientBench(kLinear_GradType, gGradData[1]); )
-DEF_BENCH( return new GradientBench(kLinear_GradType, gGradData[0],
SkShader::kMirror_TileMode); )
-
-// Draw a radial gradient of radius 1/2 on a rectangle; half the lines should
-// be completely pinned, the other half should pe partially pinned
-DEF_BENCH( return new GradientBench(kRadial_GradType, gGradData[0],
SkShader::kClamp_TileMode, kRect_GeomType, 0.5f); )
-
-// Draw a radial gradient on a circle of equal size; all the lines should
-// hit the unpinned fast path (so long as GradientBench.W == H)
-DEF_BENCH( return new GradientBench(kRadial_GradType, gGradData[0],
SkShader::kClamp_TileMode, kOval_GeomType); )
-
-DEF_BENCH( return new GradientBench(kRadial_GradType, gGradData[0],
SkShader::kMirror_TileMode); )
-DEF_BENCH( return new GradientBench(kSweep_GradType); )
-DEF_BENCH( return new GradientBench(kSweep_GradType, gGradData[1]); )
-DEF_BENCH( return new GradientBench(kRadial2_GradType); )
-DEF_BENCH( return new GradientBench(kRadial2_GradType, gGradData[1]); )
-DEF_BENCH( return new GradientBench(kRadial2_GradType, gGradData[0],
SkShader::kMirror_TileMode); )
-DEF_BENCH( return new GradientBench(kConical_GradType); )
-DEF_BENCH( return new GradientBench(kConical_GradType, gGradData[1]); )
-
 DEF_BENCH( return new Gradient2Bench(false); )
 DEF_BENCH( return new Gradient2Bench(true); )

[commit-bot: I haz the power, 2013-10-07 16:53:03]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/bsalomon@google.com/25306003/22001

[commit-bot: I haz the power, 2013-10-07 17:18:24]

Change committed as 11634