[cairo-commit] perf/cairo-perf.h perf/cairo-perf-micro.c perf/micro

[Chris Wilson]

 perf/cairo-perf-micro.c     |    1 
 perf/cairo-perf.h           |    1 
 perf/micro/Makefile.sources |    1 
 perf/micro/many-strokes.c   |   75 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 78 insertions(+)

New commits:
commit d953161f881d1e5646574362d296a80afc0ff6e2
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Aug 7 12:12:10 2011 +0100

    perf: Add many-strokes
    
    An intersection variant to exercise the stroker with many, many lines. A
    silly benchmark, but a popular one in the wild.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/perf/cairo-perf-micro.c b/perf/cairo-perf-micro.c
index ca447de..b62a2ce 100644
--- a/perf/cairo-perf-micro.c
+++ b/perf/cairo-perf-micro.c
@@ -564,6 +564,7 @@ const cairo_perf_case_t perf_cases[] = {
     { dragon, 1024, 1024 },
     { pythagoras_tree, 768, 768 },
     { intersections, 512, 512 },
+    { many_strokes, 64, 512 },
     { spiral, 512, 512 },
     { wave, 500, 500 },
     { NULL }
diff --git a/perf/cairo-perf.h b/perf/cairo-perf.h
index 32edc74..a1ce17e 100644
--- a/perf/cairo-perf.h
+++ b/perf/cairo-perf.h
@@ -211,5 +211,6 @@ CAIRO_PERF_DECL (pythagoras_tree);
 CAIRO_PERF_DECL (intersections);
 CAIRO_PERF_DECL (spiral);
 CAIRO_PERF_DECL (wave);
+CAIRO_PERF_DECL (many_strokes);
 
 #endif
diff --git a/perf/micro/Makefile.sources b/perf/micro/Makefile.sources
index 90f4bb6..ee8cc57 100644
--- a/perf/micro/Makefile.sources
+++ b/perf/micro/Makefile.sources
@@ -28,6 +28,7 @@ libcairo_perf_micro_sources = \
 	dragon.c		\
 	pythagoras-tree.c	\
 	intersections.c		\
+	many-strokes.c		\
 	spiral.c		\
 	$(NULL)
 
diff --git a/perf/micro/many-strokes.c b/perf/micro/many-strokes.c
new file mode 100644
index 0000000..b6211f2
--- /dev/null
+++ b/perf/micro/many-strokes.c
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2011 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Author: Chris Wilson <chris at chris-wilson.co.uk>
+ */
+
+#include "cairo-perf.h"
+
+static uint32_t state;
+
+static double
+uniform_random (double minval, double maxval)
+{
+    static uint32_t const poly = 0x9a795537U;
+    uint32_t n = 32;
+    while (n-->0)
+	state = 2*state < state ? (2*state ^ poly) : 2*state;
+    return minval + state * (maxval - minval) / 4294967296.0;
+}
+
+static cairo_perf_ticks_t
+do_many_strokes (cairo_t *cr, int width, int height, int loops)
+{
+    int count;
+
+    /* lots and lots of overlapping strokes */
+    state = 0xc0ffee;
+    for (count = 0; count < 1000; count++) {
+	cairo_line_to (cr,
+		       uniform_random (0, width),
+		       uniform_random (0, height));
+    }
+
+    cairo_set_line_width (cr, 2.);
+
+    cairo_perf_timer_start ();
+
+    while (loops--)
+	cairo_stroke_preserve (cr);
+
+    cairo_perf_timer_stop ();
+
+    cairo_new_path (cr);
+
+    return cairo_perf_timer_elapsed ();
+}
+
+void
+many_strokes (cairo_perf_t *perf, cairo_t *cr, int width, int height)
+{
+    if (! cairo_perf_can_run (perf, "many-strokes", NULL))
+	return;
+
+    cairo_perf_run (perf, "many-strokes", do_many_strokes, NULL);
+}