[perf] Add rounded rectangle perf case.

Add the performance test case to compare the speed of filling a rounded
rectangle (one with camphered corners) as opposed to an ordinary
rectangle. Since the majority of the pixels are identical, ideally the two
cases would take similar times (modulo the additional overhead in the more
complex path).

5 files changed, 135 insertions, 1 deletions

diff --git a/perf/Makefile.am b/perf/Makefile.am
index 0f48fb276..46f053d6b 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -25,6 +25,7 @@ cairo_perf_SOURCES =		\
 	paint-with-alpha.c	\
 	pattern_create_radial.c \
 	rectangles.c		\
+	rounded-rectangles.c	\
 	stroke.c		\
 	subimage_copy.c		\
 	tessellate.c		\
diff --git a/perf/cairo-perf.c b/perf/cairo-perf.c
index 38c711901..0a1e370c6 100644
--- a/perf/cairo-perf.c
+++ b/perf/cairo-perf.c
@@ -454,6 +454,7 @@ const cairo_perf_case_t perf_cases[] = {
     { long_lines, 100, 100},
     { unaligned_clip, 100, 100},
     { rectangles, 512, 512},
+    { rounded_rectangles, 512, 512},
     { long_dashed_lines, 512, 512},
     { NULL }
 };
diff --git a/perf/cairo-perf.h b/perf/cairo-perf.h
index 753f0455c..222251d27 100644
--- a/perf/cairo-perf.h
+++ b/perf/cairo-perf.h
@@ -110,6 +110,7 @@ CAIRO_PERF_DECL (mosaic);
 CAIRO_PERF_DECL (long_lines);
 CAIRO_PERF_DECL (unaligned_clip);
 CAIRO_PERF_DECL (rectangles);
+CAIRO_PERF_DECL (rounded_rectangles);
 CAIRO_PERF_DECL (long_dashed_lines);
 
 #endif
diff --git a/perf/rectangles.c b/perf/rectangles.c
index 9fa89f562..991391c45 100644
--- a/perf/rectangles.c
+++ b/perf/rectangles.c
@@ -24,6 +24,12 @@
  */
 #include "cairo-perf.h"
 
+#if 0
+#define MODE cairo_perf_run
+#else
+#define MODE cairo_perf_cover_sources_and_operators
+#endif
+
 #define RECTANGLE_COUNT (1000)
 
 static struct
@@ -53,6 +59,19 @@ do_rectangles (cairo_t *cr, int width, int height)
     return cairo_perf_timer_elapsed ();
 }
 
+static cairo_perf_ticks_t
+do_rectangle (cairo_t *cr, int width, int height)
+{
+    cairo_perf_timer_start ();
+
+    cairo_rectangle (cr, 0, 0, width, height);
+    cairo_fill (cr);
+
+    cairo_perf_timer_stop ();
+
+    return cairo_perf_timer_elapsed ();
+}
+
 void
 rectangles (cairo_perf_t *perf, cairo_t *cr, int width, int height)
 {
@@ -67,5 +86,6 @@ rectangles (cairo_perf_t *perf, cairo_t *cr, int width, int height)
         rects[i].height = (rand () % (height / 10)) + 1;
     }
 
-    cairo_perf_run (perf, "rectangles", do_rectangles);
+    MODE (perf, "one-rectangle", do_rectangle);
+    MODE (perf, "rectangles", do_rectangles);
 }
diff --git a/perf/rounded-rectangles.c b/perf/rounded-rectangles.c
new file mode 100644
index 000000000..7d20825d3
--- /dev/null
+++ b/perf/rounded-rectangles.c
@@ -0,0 +1,111 @@
+/*
+ * Copyright © 2005 Owen Taylor
+ * Copyright © 2007 Dan Amelang
+ * Copyright © 2007 Chris Wilson
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * the authors not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. The authors make no representations about the
+ * suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: Chris Wilson <chris@chris-wilson.co.uk>
+ */
+
+/* This perf case is derived from the bug report
+ *   Gradient on 'rounded rectangle' MUCH slower than normal rectangle
+ *   https://bugs.freedesktop.org/show_bug.cgi?id=4263.
+ */
+
+#include "cairo-perf.h"
+
+#define RECTANGLE_COUNT (1000)
+
+#if 0
+#define MODE cairo_perf_run
+#else
+#define MODE cairo_perf_cover_sources_and_operators
+#endif
+
+static struct
+{
+    double x;
+    double y;
+    double width;
+    double height;
+} rects[RECTANGLE_COUNT];
+
+static void
+rounded_rectangle (cairo_t *cr,
+		   double x, double y, double w, double h,
+		   double radius)
+{
+    cairo_move_to (cr, x+radius, y);
+    cairo_arc (cr, x+w-radius, y+radius,   radius, M_PI + M_PI / 2, M_PI * 2        );
+    cairo_arc (cr, x+w-radius, y+h-radius, radius, 0,               M_PI / 2        );
+    cairo_arc (cr, x+radius,   y+h-radius, radius, M_PI/2,          M_PI            );
+    cairo_arc (cr, x+radius,   y+radius,   radius, M_PI,            270 * M_PI / 180);
+}
+
+static cairo_perf_ticks_t
+do_rectangle (cairo_t *cr, int width, int height)
+{
+    cairo_perf_timer_start ();
+
+    rounded_rectangle (cr, 0, 0, width, height, 3.0);
+    cairo_fill (cr);
+
+    cairo_perf_timer_stop ();
+
+    return cairo_perf_timer_elapsed ();
+}
+
+static cairo_perf_ticks_t
+do_rectangles (cairo_t *cr, int width, int height)
+{
+    int i;
+
+    cairo_perf_timer_start ();
+
+    for (i = 0; i < RECTANGLE_COUNT; i++) {
+        rounded_rectangle (cr,
+		           rects[i].x, rects[i].y,
+                           rects[i].width, rects[i].height,
+			   3.0);
+        cairo_fill (cr);
+    }
+
+    cairo_perf_timer_stop ();
+
+    return cairo_perf_timer_elapsed ();
+}
+
+void
+rounded_rectangles (cairo_perf_t *perf, cairo_t *cr, int width, int height)
+{
+    int i;
+
+    srand (8478232);
+    for (i = 0; i < RECTANGLE_COUNT; i++) {
+        rects[i].x = rand () % width;
+        rects[i].y = rand () % height;
+        rects[i].width  = (rand () % (width / 10)) + 1;
+        rects[i].height = (rand () % (height / 10)) + 1;
+    }
+
+    MODE (perf, "one-rounded-rectangle", do_rectangle);
+    MODE (perf, "rounded-rectangles", do_rectangles);
+}