[cairo-commit] 2 commits - perf/box-outline.c perf/cairo-perf.c perf/cairo-perf.h perf/Makefile.am

Carl Worth cworth at kemper.freedesktop.org
Fri Nov 17 19:41:27 PST 2006


 perf/Makefile.am   |    1 
 perf/box-outline.c |   93 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 perf/cairo-perf.c  |    7 +++
 perf/cairo-perf.h  |    2 +
 4 files changed, 102 insertions(+), 1 deletion(-)

New commits:
diff-tree 1ed3811338a03068b7ce60f83fdd23fe01fec972 (from a8faa0aef11abbd743ac9dc0b3127f9384325ee2)
Author: Carl Worth <cworth at cworth.org>
Date:   Fri Nov 17 17:50:14 2006 -0800

    perf: Add box_outline test case.
    
    This test shows that drawing a 100x100 single-pixel wide box outline is
    currently 5 to 16 times slower when using the natural cairo_stroke() as
    compared to a rather awkward cairo_fill() of two rectangles.
    
    [ # ]  backend-content                    test-size min(ticks)  min(ms) median(ms) stddev. iterations
    [  0]    image-rgba         box-outline-stroke-100     301321    0.218    0.219  0.39%   5
    [  1]    image-rgba           box-outline-fill-100      18178    0.013    0.013  0.43%   5
    [  0]     xlib-rgba         box-outline-stroke-100     379177    0.275    0.276  1.39%   6
    [  1]     xlib-rgba           box-outline-fill-100      83355    0.060    0.060  0.17%   5

diff --git a/perf/Makefile.am b/perf/Makefile.am
index 4fa086b..27316ec 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -18,6 +18,7 @@ cairo_perf_SOURCES =		\
 	cairo-perf-cover.c	\
 	cairo-stats.c		\
 	cairo-stats.h		\
+	box-outline.c		\
 	fill.c			\
 	paint.c			\
 	stroke.c		\
diff --git a/perf/box-outline.c b/perf/box-outline.c
new file mode 100644
index 0000000..74dd19a
--- /dev/null
+++ b/perf/box-outline.c
@@ -0,0 +1,93 @@
+/*
+ * Copyright © 2006 Red Hat, Inc.
+ *
+ *
+ * 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: Carl D. Worth <cworth at cworth.org>
+ */
+
+#include "cairo-perf.h"
+
+/* This test case is designed to illustrate a performance bug that
+ * exists in cairo in which using cairo_stroke is much slower than
+ * cairo_fill to draw an identical figure, (and in particular a figure
+ * that is much more natural to draw with cairo_stroke). The figure is
+ * a 100x100 square outline 1-pixel wide, nicely pixel aligned.
+ *
+ * The performance bug should affect any path whose resulting contour
+ * consists only of pixel-aligned horizontal and vertical elements.
+ *
+ * Initial testing on on machine shows stroke as 5x slower than fill
+ * for the xlib backend and 16x slower for the image backend.
+ */
+
+static cairo_perf_ticks_t
+box_outline_stroke (cairo_t *cr, int width, int height)
+{
+    cairo_set_source_rgb (cr, 0, 0, 1); /* blue */
+    cairo_paint (cr);
+
+    cairo_rectangle (cr,
+		     1.5, 1.5,
+		     width - 3, height - 3);
+    cairo_set_line_width (cr, 1.0);
+    cairo_set_source_rgb (cr, 1, 0, 0); /* red */
+
+    cairo_perf_timer_start ();
+
+    cairo_stroke (cr);
+
+    cairo_perf_timer_stop ();
+
+    return cairo_perf_timer_elapsed ();
+}
+
+static cairo_perf_ticks_t
+box_outline_fill (cairo_t *cr, int width, int height)
+{
+    cairo_set_source_rgb (cr, 0, 0, 1); /* blue */
+    cairo_paint (cr);
+
+    cairo_rectangle (cr,
+		     1.0, 1.0,
+		     width - 2, height - 2);
+    cairo_rectangle (cr,
+		     2.0, 2.0,
+		     width - 4, height - 4);
+    cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
+    cairo_set_source_rgb (cr, 0, 1, 0); /* green */
+
+    cairo_perf_timer_start ();
+
+    cairo_fill (cr);
+
+    cairo_perf_timer_stop ();
+
+    return cairo_perf_timer_elapsed ();
+}
+
+void
+box_outline (cairo_perf_t *perf, cairo_t *cr, int width, int height)
+{
+    cairo_perf_run (perf, "box-outline-stroke", box_outline_stroke);
+    cairo_perf_run (perf, "box-outline-fill", box_outline_fill);
+}
diff --git a/perf/cairo-perf.c b/perf/cairo-perf.c
index 4c70b4b..a65ca33 100644
--- a/perf/cairo-perf.c
+++ b/perf/cairo-perf.c
@@ -325,5 +325,6 @@ cairo_perf_case_t perf_cases[] = {
     { pattern_create_radial, 16, 16},
     { zrusin, 415, 415},
     { world_map, 800, 800},
+    { box_outline, 100, 100},
     { NULL }
 };
diff --git a/perf/cairo-perf.h b/perf/cairo-perf.h
index aef9a48..d28cc65 100644
--- a/perf/cairo-perf.h
+++ b/perf/cairo-perf.h
@@ -64,6 +64,7 @@ cairo_perf_yield (void);
 typedef struct _cairo_perf {
     /* Options from command-line */
     unsigned int iterations;
+    cairo_bool_t exact_iterations;
     cairo_bool_t raw;
     cairo_bool_t list_only;
     char **names;
@@ -100,5 +101,6 @@ CAIRO_PERF_DECL (text);
 CAIRO_PERF_DECL (pattern_create_radial);
 CAIRO_PERF_DECL (zrusin);
 CAIRO_PERF_DECL (world_map);
+CAIRO_PERF_DECL (box_outline);
 
 #endif
diff-tree a8faa0aef11abbd743ac9dc0b3127f9384325ee2 (from a97b697d8fbba4ffc5a45a256603232ab5a4e86d)
Author: Carl Worth <cworth at cworth.org>
Date:   Fri Nov 17 17:48:39 2006 -0800

    cairo-perf: When iteration count is given on command-line, never execute fewer

diff --git a/perf/cairo-perf.c b/perf/cairo-perf.c
index 850a057..4c70b4b 100644
--- a/perf/cairo-perf.c
+++ b/perf/cairo-perf.c
@@ -157,7 +157,9 @@ cairo_perf_run (cairo_perf_t		*perf,
 	    if (i > 0) {
 		_cairo_stats_compute (&stats, times, i+1);
 
-		if (stats.std_dev <= CAIRO_PERF_LOW_STD_DEV) {
+		if (stats.std_dev <= CAIRO_PERF_LOW_STD_DEV &&
+		    ! perf->exact_iterations)
+		{
 		    low_std_dev_count++;
 		    if (low_std_dev_count >= CAIRO_PERF_STABLE_STD_DEV_COUNT)
 			break;
@@ -215,6 +217,7 @@ parse_options (cairo_perf_t *perf, int a
 	perf->iterations = strtol(getenv("CAIRO_PERF_ITERATIONS"), NULL, 0);
     else
 	perf->iterations = CAIRO_PERF_ITERATIONS_DEFAULT;
+    perf->exact_iterations = 0;
 
     perf->raw = FALSE;
     perf->list_only = FALSE;
@@ -228,6 +231,7 @@ parse_options (cairo_perf_t *perf, int a
 
 	switch (c) {
 	case 'i':
+	    perf->exact_iterations = TRUE;
 	    perf->iterations = strtoul (optarg, &end, 10);
 	    if (*end != '\0') {
 		fprintf (stderr, "Invalid argument for -i (not an integer): %s\n",


More information about the cairo-commit mailing list