From 5412343a77b7b336886ed763a3518ff4602f27aa Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Thu, 5 Oct 2006 12:13:48 -0700 Subject: [PATCH] perf: Add subimage_copy test to demonstrate performance bug found by monty --- perf/Makefile.am | 1 + perf/cairo-perf.c | 1 + perf/cairo-perf.h | 1 + perf/subimage_copy.c | 71 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 74 insertions(+) create mode 100644 perf/subimage_copy.c diff --git a/perf/Makefile.am b/perf/Makefile.am index d96fd63fa..ef6dc739d 100644 --- a/perf/Makefile.am +++ b/perf/Makefile.am @@ -21,6 +21,7 @@ cairo_perf_SOURCES = \ fill.c \ paint.c \ stroke.c \ + subimage_copy.c \ tessellate.c \ text.c diff --git a/perf/cairo-perf.c b/perf/cairo-perf.c index b98382f00..5b9486998 100644 --- a/perf/cairo-perf.c +++ b/perf/cairo-perf.c @@ -238,5 +238,6 @@ cairo_perf_case_t perf_cases[] = { { stroke, 64, 256}, { text, 64, 256}, { tessellate, 100, 100}, + { subimage_copy, 16, 512}, { NULL } }; diff --git a/perf/cairo-perf.h b/perf/cairo-perf.h index b2bcde8a0..cf3d33d96 100644 --- a/perf/cairo-perf.h +++ b/perf/cairo-perf.h @@ -85,6 +85,7 @@ cairo_perf_cover_sources_and_operators (cairo_perf_t *perf, CAIRO_PERF_DECL (fill); CAIRO_PERF_DECL (paint); CAIRO_PERF_DECL (stroke); +CAIRO_PERF_DECL (subimage_copy); CAIRO_PERF_DECL (tessellate); CAIRO_PERF_DECL (text); diff --git a/perf/subimage_copy.c b/perf/subimage_copy.c new file mode 100644 index 000000000..54f596f4f --- /dev/null +++ b/perf/subimage_copy.c @@ -0,0 +1,71 @@ +/* + * Copyright © 2006 Red Hat, Inc. + * + * 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 + * Red Hat, Inc. not be used in advertising or publicity pertaining to + * distribution of the software without specific, written prior + * permission. Red Hat, Inc. makes no representations about the + * suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL RED HAT, INC. 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. + * + * Author: Carl D. Worth + */ + +#include "cairo-perf.h" + +/* This case exposes a performance bug found by Christopher "Monty" + * Montgomery in that copying a tiny portion of an image surface to an + * X surface causes the entire image surface to be copied to an + * intermediate surface. + * + * If the performance bug is fixed, then the time this test takes + * should be independent of the source and destination surface sizes. + */ + +static cairo_perf_ticks_t +do_subimage_copy (cairo_t *cr, int width, int height) +{ + cairo_rectangle (cr, 2, 2, 4, 4); + cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); + + cairo_perf_timer_start (); + + cairo_fill (cr); + + cairo_perf_timer_stop (); + + return cairo_perf_timer_elapsed (); +} + +void +subimage_copy (cairo_perf_t *perf, cairo_t *cr, int width, int height) +{ + cairo_surface_t *image; + cairo_t *cr2; + + cairo_set_source_rgb (cr, 0, 0, 1); /* blue */ + cairo_paint (cr); + + image = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height); + cr2 = cairo_create (image); + cairo_set_source_rgb (cr2, 1, 0, 0); /* red */ + cairo_paint (cr2); + cairo_destroy (cr2); + + cairo_set_source_surface (cr, image, 0, 0); + cairo_surface_destroy (image); + + cairo_perf_run (perf, "subimage_copy", do_subimage_copy); +}