cleanup and optimize rect intersect routines

BUG=skia:

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

2 files changed, 115 insertions, 56 deletions

diff --git a/bench/GeometryBench.cpp b/bench/GeometryBench.cpp
new file mode 100644
index 0000000000..cd58e3cdaf
--- /dev/null
+++ b/bench/GeometryBench.cpp
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "Benchmark.h"
+#include "SkGeometry.h"
+#include "SkRandom.h"
+#include "SkRect.h"
+
+class GeometryBench : public Benchmark {
+public:
+    GeometryBench(const char suffix[]) : fVolatileInt(0) {
+        fName.printf("geo_%s", suffix);
+    }
+
+    virtual const char* onGetName() SK_OVERRIDE {
+        return fName.c_str();
+    }
+
+    virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
+        return kNonRendering_Backend == backend;
+    }
+
+protected:
+    volatile int fVolatileInt;
+
+    /**
+     *  Subclasses can call this to try to defeat the optimizer (with some result of their
+     *  inner loop), since it will fool the compiler into assuming that "n" is actually
+     *  needed somewhere, and since this method is not const, the member fields cannot
+     *  be assumed to be const before and after the call.
+     */
+    virtual void virtualCallToFoilOptimizers(int n) { fVolatileInt += n; }
+
+private:
+    SkString fName;
+};
+
+class GeoRectBench : public GeometryBench {
+public:
+    GeoRectBench(const char suffix[]) : GeometryBench(suffix) {}
+
+protected:
+    SkRect fRects[2048];
+
+    virtual void onPreDraw() {
+        const SkScalar min = -100;
+        const SkScalar max = 100;
+        SkRandom rand;
+        for (size_t i = 0; i < SK_ARRAY_COUNT(fRects); ++i) {
+            SkScalar x = rand.nextRangeScalar(min, max);
+            SkScalar y = rand.nextRangeScalar(min, max);
+            SkScalar w = rand.nextRangeScalar(min, max);
+            SkScalar h = rand.nextRangeScalar(min, max);
+            fRects[i].setXYWH(x, y, w, h);
+        }
+    }
+};
+
+class GeoRectBench_intersect : public GeoRectBench {
+public:
+    GeoRectBench_intersect() : GeoRectBench("rect_intersect") {}
+
+protected:
+    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+        for (int outer = 0; outer < loops; ++outer) {
+            int count = 0;
+            for (size_t i = 0; i < SK_ARRAY_COUNT(fRects); ++i) {
+                SkRect r = fRects[0];
+                count += r.intersect(fRects[i]);
+            }
+            this->virtualCallToFoilOptimizers(count);
+        }
+    }
+};
+
+class GeoRectBench_intersect_rect : public GeoRectBench {
+public:
+    GeoRectBench_intersect_rect() : GeoRectBench("rect_intersect_rect") {}
+
+protected:
+    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+        for (int outer = 0; outer < loops; ++outer) {
+            int count = 0;
+            SkRect r;
+            for (size_t i = 0; i < SK_ARRAY_COUNT(fRects); ++i) {
+                count += r.intersect(fRects[0], fRects[i]);
+            }
+            this->virtualCallToFoilOptimizers(count);
+        }
+    }
+};
+
+class GeoRectBench_Intersects : public GeoRectBench {
+public:
+    GeoRectBench_Intersects() : GeoRectBench("rect_Intersects") {}
+
+protected:
+    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+        for (int outer = 0; outer < loops; ++outer) {
+            int count = 0;
+            for (size_t i = 0; i < SK_ARRAY_COUNT(fRects); ++i) {
+                count += SkRect::Intersects(fRects[0], fRects[i]);
+            }
+            this->virtualCallToFoilOptimizers(count);
+        }
+    }
+};
+
+DEF_BENCH( return new GeoRectBench_intersect; )
+DEF_BENCH( return new GeoRectBench_intersect_rect; )
+DEF_BENCH( return new GeoRectBench_Intersects; )
diff --git a/bench/RegionBench.cpp b/bench/RegionBench.cpp
index b3722d4caa..91ab286923 100644
--- a/bench/RegionBench.cpp
+++ b/bench/RegionBench.cpp
@@ -117,59 +117,6 @@ private:
     typedef Benchmark INHERITED;
 };
 
-class RectSectBench : public Benchmark {
-    enum {
-        N = 1000
-    };
-    SkRect fArray0[N];
-    SkRect fArray1[N];
-    SkString fName;
-    bool fNewWay;
-
-public:
-    static void RandRect(SkRect* r, SkRandom& rand) {
-        r->set(rand.nextSScalar1(), rand.nextSScalar1(),
-               rand.nextSScalar1(), rand.nextSScalar1());
-        r->sort();
-    }
-
-    RectSectBench(bool newWay) : fNewWay(newWay) {
-        fName.printf("rect_intersect_%s", newWay ? "new" : "old");
-
-        SkRandom rand;
-        for (int i = 0; i < N; i++) {
-            RandRect(&fArray0[i], rand);
-            RandRect(&fArray1[i], rand);
-        }
-    }
-
-    virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
-        return backend == kNonRendering_Backend;
-    }
-
-protected:
-    virtual const char* onGetName() { return fName.c_str(); }
-
-    virtual void onDraw(const int loops, SkCanvas* canvas) {
-        for (int i = 0; i < loops; ++i) {
-            if (fNewWay) {
-                for (int j = 0; j < N; ++j) {
-                    SkRect r = fArray0[j];
-                    r.intersect2(fArray1[j]);
-                }
-            } else {
-                for (int j = 0; j < N; ++j) {
-                    SkRect r = fArray0[j];
-                    r.intersect(fArray1[j]);
-                }
-            }
-        }
-    }
-
-private:
-    typedef Benchmark INHERITED;
-};
-
 ///////////////////////////////////////////////////////////////////////////////
 
 #define SMALL   16
@@ -183,6 +130,3 @@ DEF_BENCH( return SkNEW_ARGS(RegionBench, (SMALL, containsrect_proc, "containsre
 DEF_BENCH( return SkNEW_ARGS(RegionBench, (SMALL, sectsrgn_proc, "intersectsrgn")); )
 DEF_BENCH( return SkNEW_ARGS(RegionBench, (SMALL, sectsrect_proc, "intersectsrect")); )
 DEF_BENCH( return SkNEW_ARGS(RegionBench, (SMALL, containsxy_proc, "containsxy")); )
-
-DEF_BENCH( return SkNEW_ARGS(RectSectBench, (false)); )
-DEF_BENCH( return SkNEW_ARGS(RectSectBench, (true)); )