From ccf84a8883ebb8d2ee8f55eb53da4dfc96887de0 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue, 15 Sep 2009 14:22:57 +0100
Subject: [PATCH] [perf] Reorganise cairo-perf

In preparation to creating a new hub to control performance measuring
and reporting, move the current cairo-perf out of the way.
---
 perf/.gitignore                           |  3 +
 perf/Makefile.am                          | 84 +++++++++++------------
 perf/cairo-perf-diff                      |  2 +-
 perf/{cairo-perf.c => cairo-perf-micro.c} |  0
 perf/{ => micro}/box-outline.c            |  0
 perf/{ => micro}/cairo-perf-cover.c       |  0
 perf/{ => micro}/composite-checker.c      |  0
 perf/{ => micro}/dragon.c                 |  0
 perf/{ => micro}/fill.c                   |  0
 perf/{ => micro}/glyphs.c                 |  0
 perf/{ => micro}/intersections.c          |  0
 perf/{ => micro}/long-dashed-lines.c      |  0
 perf/{ => micro}/long-lines.c             |  0
 perf/{ => micro}/mask.c                   |  0
 perf/{ => micro}/mosaic.c                 |  0
 perf/{ => micro}/mosaic.h                 |  0
 perf/{ => micro}/paint-with-alpha.c       |  0
 perf/{ => micro}/paint.c                  |  0
 perf/{ => micro}/pattern_create_radial.c  |  0
 perf/{ => micro}/pythagoras-tree.c        |  0
 perf/{ => micro}/rectangles.c             |  0
 perf/{ => micro}/rounded-rectangles.c     |  0
 perf/{ => micro}/spiral.c                 |  0
 perf/{ => micro}/stroke.c                 |  0
 perf/{ => micro}/subimage_copy.c          |  0
 perf/{ => micro}/tessellate.c             |  0
 perf/{ => micro}/text.c                   |  0
 perf/{ => micro}/twin.c                   |  0
 perf/{ => micro}/unaligned-clip.c         |  0
 perf/{ => micro}/world-map.c              |  0
 perf/{ => micro}/world-map.h              |  0
 perf/{ => micro}/zrusin-another.h         |  0
 perf/{ => micro}/zrusin.c                 |  0
 33 files changed, 46 insertions(+), 43 deletions(-)
 rename perf/{cairo-perf.c => cairo-perf-micro.c} (100%)
 rename perf/{ => micro}/box-outline.c (100%)
 rename perf/{ => micro}/cairo-perf-cover.c (100%)
 rename perf/{ => micro}/composite-checker.c (100%)
 rename perf/{ => micro}/dragon.c (100%)
 rename perf/{ => micro}/fill.c (100%)
 rename perf/{ => micro}/glyphs.c (100%)
 rename perf/{ => micro}/intersections.c (100%)
 rename perf/{ => micro}/long-dashed-lines.c (100%)
 rename perf/{ => micro}/long-lines.c (100%)
 rename perf/{ => micro}/mask.c (100%)
 rename perf/{ => micro}/mosaic.c (100%)
 rename perf/{ => micro}/mosaic.h (100%)
 rename perf/{ => micro}/paint-with-alpha.c (100%)
 rename perf/{ => micro}/paint.c (100%)
 rename perf/{ => micro}/pattern_create_radial.c (100%)
 rename perf/{ => micro}/pythagoras-tree.c (100%)
 rename perf/{ => micro}/rectangles.c (100%)
 rename perf/{ => micro}/rounded-rectangles.c (100%)
 rename perf/{ => micro}/spiral.c (100%)
 rename perf/{ => micro}/stroke.c (100%)
 rename perf/{ => micro}/subimage_copy.c (100%)
 rename perf/{ => micro}/tessellate.c (100%)
 rename perf/{ => micro}/text.c (100%)
 rename perf/{ => micro}/twin.c (100%)
 rename perf/{ => micro}/unaligned-clip.c (100%)
 rename perf/{ => micro}/world-map.c (100%)
 rename perf/{ => micro}/world-map.h (100%)
 rename perf/{ => micro}/zrusin-another.h (100%)
 rename perf/{ => micro}/zrusin.c (100%)

diff --git a/perf/.gitignore b/perf/.gitignore
index f85268067..1e0fea3f9 100644
--- a/perf/.gitignore
+++ b/perf/.gitignore
@@ -1,6 +1,7 @@
 TAGS
 tags
 cairo-perf
+cairo-perf-micro
 cairo-perf-trace
 cairo-perf-compare-backends
 cairo-perf-diff-files
@@ -9,6 +10,8 @@ cairo-traces
 valgrind-log
 callgrind.out.*
 index.html
+*.png
+*.perf
 *.o
 *.gcda
 *.gcno
diff --git a/perf/Makefile.am b/perf/Makefile.am
index 4f433722d..809f2d54d 100644
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -10,7 +10,7 @@ AM_CPPFLAGS =					\
 
 AM_LDFLAGS = $(CAIRO_LDFLAGS)
 
-EXTRA_PROGRAMS += cairo-perf \
+EXTRA_PROGRAMS += cairo-perf-micro \
 		  cairo-perf-trace \
 		  cairo-perf-diff-files \
 		  cairo-perf-print \
@@ -25,50 +25,50 @@ LDADD = libcairoperf.la \
 	$(top_builddir)/src/libcairo.la \
 	$(CAIROPERF_LIBS)
 
-cairo_perf_SOURCES =		\
-	cairo-perf.c		\
+cairo_perf_micro_SOURCES =		\
+	cairo-perf-micro.c	\
 	cairo-perf.h		\
-	cairo-perf-cover.c	\
-	box-outline.c		\
-	composite-checker.c	\
-	fill.c			\
-	long-lines.c		\
-	mosaic.c		\
-	mosaic.h		\
-	paint.c			\
-	paint-with-alpha.c	\
-	mask.c			\
-	pattern_create_radial.c \
-	rectangles.c		\
-	rounded-rectangles.c	\
-	stroke.c		\
-	subimage_copy.c		\
-	tessellate.c		\
-	text.c			\
-	glyphs.c		\
-	twin.c			\
-	unaligned-clip.c	\
-	world-map.c		\
-	world-map.h		\
-	zrusin.c		\
-	zrusin-another.h	\
-	long-dashed-lines.c	\
-	dragon.c		\
-	pythagoras-tree.c	\
-	intersections.c		\
-	spiral.c
+	micro/cairo-perf-cover.c	\
+	micro/box-outline.c		\
+	micro/composite-checker.c	\
+	micro/fill.c			\
+	micro/long-lines.c		\
+	micro/mosaic.c		\
+	micro/mosaic.h		\
+	micro/paint.c			\
+	micro/paint-with-alpha.c	\
+	micro/mask.c			\
+	micro/pattern_create_radial.c \
+	micro/rectangles.c		\
+	micro/rounded-rectangles.c	\
+	micro/stroke.c		\
+	micro/subimage_copy.c		\
+	micro/tessellate.c		\
+	micro/text.c			\
+	micro/glyphs.c		\
+	micro/twin.c			\
+	micro/unaligned-clip.c	\
+	micro/world-map.c		\
+	micro/world-map.h		\
+	micro/zrusin.c		\
+	micro/zrusin-another.h	\
+	micro/long-dashed-lines.c	\
+	micro/dragon.c		\
+	micro/pythagoras-tree.c	\
+	micro/intersections.c		\
+	micro/spiral.c
 
 if CAIRO_HAS_WIN32_SURFACE
-cairo_perf_SOURCES += cairo-perf-win32.c
+cairo_perf_micro_SOURCES += cairo-perf-win32.c
 else
 if CAIRO_HAS_OS2_SURFACE
-cairo_perf_SOURCES += cairo-perf-os2.c
+cairo_perf_micro_SOURCES += cairo-perf-os2.c
 else
-cairo_perf_SOURCES += cairo-perf-posix.c
+cairo_perf_micro_SOURCES += cairo-perf-posix.c
 endif
 endif
-cairo_perf_LDADD = $(LDADD)
-cairo_perf_DEPENDENCIES = \
+cairo_perf_micro_LDADD = $(LDADD)
+cairo_perf_micro_DEPENDENCIES = \
         $(top_builddir)/boilerplate/libcairoboilerplate.la	\
 	$(top_builddir)/src/libcairo.la \
 	libcairoperf.la
@@ -140,17 +140,17 @@ CAIRO_PERF_ENVIRONMENT = CAIRO_PERF_ITERATIONS="$(ITERS)" CAIRO_TEST_TARGET="$(T
 # Cap the maximum number of iterations during 'make check'
 TESTS_ENVIRONMENT = CAIRO_TEST_TARGET="$(TARGETS)" CAIRO_PERF_ITERATIONS="10"
 
-TESTS += cairo-perf$(EXEEXT)
+TESTS += cairo-perf-micro$(EXEEXT)
 
-perf: cairo-perf$(EXEEXT) cairo-perf-trace$(EXEEXT)
-	-$(CAIRO_PERF_ENVIRONMENT) ./cairo-perf$(EXEEXT)
+perf: cairo-perf-micro$(EXEEXT) cairo-perf-trace$(EXEEXT)
+	-$(CAIRO_PERF_ENVIRONMENT) ./cairo-perf-micro$(EXEEXT)
 	-$(CAIRO_PERF_ENVIRONMENT) ./cairo-perf-trace$(EXEEXT)
 
 html-local: index.html
 
-perf-tag.html : cairo-perf${EXEEXT}
+perf-tag.html : cairo-perf-micro${EXEEXT}
 	$(CAIRO_PERF_ENVIRONMENT) ./cairo-perf-diff -t -h $@ `git describe --abbrev=0` HEAD
-perf-commit.html : cairo-perf${EXEEXT}
+perf-commit.html : cairo-perf-micro${EXEEXT}
 	$(CAIRO_PERF_ENVIRONMENT) ./cairo-perf-diff -t -h $@ HEAD
 
 # Summarise changes in index.html, with details in links
diff --git a/perf/cairo-perf-diff b/perf/cairo-perf-diff
index 52c6d80a3..436f149ea 100755
--- a/perf/cairo-perf-diff
+++ b/perf/cairo-perf-diff
@@ -52,7 +52,7 @@ END
     exit 1
 }
 
-benchmarks="cairo-perf"
+benchmarks="cairo-perf-micro"
 
 # First, pull off any known options
 while true; do
diff --git a/perf/cairo-perf.c b/perf/cairo-perf-micro.c
similarity index 100%
rename from perf/cairo-perf.c
rename to perf/cairo-perf-micro.c
diff --git a/perf/box-outline.c b/perf/micro/box-outline.c
similarity index 100%
rename from perf/box-outline.c
rename to perf/micro/box-outline.c
diff --git a/perf/cairo-perf-cover.c b/perf/micro/cairo-perf-cover.c
similarity index 100%
rename from perf/cairo-perf-cover.c
rename to perf/micro/cairo-perf-cover.c
diff --git a/perf/composite-checker.c b/perf/micro/composite-checker.c
similarity index 100%
rename from perf/composite-checker.c
rename to perf/micro/composite-checker.c
diff --git a/perf/dragon.c b/perf/micro/dragon.c
similarity index 100%
rename from perf/dragon.c
rename to perf/micro/dragon.c
diff --git a/perf/fill.c b/perf/micro/fill.c
similarity index 100%
rename from perf/fill.c
rename to perf/micro/fill.c
diff --git a/perf/glyphs.c b/perf/micro/glyphs.c
similarity index 100%
rename from perf/glyphs.c
rename to perf/micro/glyphs.c
diff --git a/perf/intersections.c b/perf/micro/intersections.c
similarity index 100%
rename from perf/intersections.c
rename to perf/micro/intersections.c
diff --git a/perf/long-dashed-lines.c b/perf/micro/long-dashed-lines.c
similarity index 100%
rename from perf/long-dashed-lines.c
rename to perf/micro/long-dashed-lines.c
diff --git a/perf/long-lines.c b/perf/micro/long-lines.c
similarity index 100%
rename from perf/long-lines.c
rename to perf/micro/long-lines.c
diff --git a/perf/mask.c b/perf/micro/mask.c
similarity index 100%
rename from perf/mask.c
rename to perf/micro/mask.c
diff --git a/perf/mosaic.c b/perf/micro/mosaic.c
similarity index 100%
rename from perf/mosaic.c
rename to perf/micro/mosaic.c
diff --git a/perf/mosaic.h b/perf/micro/mosaic.h
similarity index 100%
rename from perf/mosaic.h
rename to perf/micro/mosaic.h
diff --git a/perf/paint-with-alpha.c b/perf/micro/paint-with-alpha.c
similarity index 100%
rename from perf/paint-with-alpha.c
rename to perf/micro/paint-with-alpha.c
diff --git a/perf/paint.c b/perf/micro/paint.c
similarity index 100%
rename from perf/paint.c
rename to perf/micro/paint.c
diff --git a/perf/pattern_create_radial.c b/perf/micro/pattern_create_radial.c
similarity index 100%
rename from perf/pattern_create_radial.c
rename to perf/micro/pattern_create_radial.c
diff --git a/perf/pythagoras-tree.c b/perf/micro/pythagoras-tree.c
similarity index 100%
rename from perf/pythagoras-tree.c
rename to perf/micro/pythagoras-tree.c
diff --git a/perf/rectangles.c b/perf/micro/rectangles.c
similarity index 100%
rename from perf/rectangles.c
rename to perf/micro/rectangles.c
diff --git a/perf/rounded-rectangles.c b/perf/micro/rounded-rectangles.c
similarity index 100%
rename from perf/rounded-rectangles.c
rename to perf/micro/rounded-rectangles.c
diff --git a/perf/spiral.c b/perf/micro/spiral.c
similarity index 100%
rename from perf/spiral.c
rename to perf/micro/spiral.c
diff --git a/perf/stroke.c b/perf/micro/stroke.c
similarity index 100%
rename from perf/stroke.c
rename to perf/micro/stroke.c
diff --git a/perf/subimage_copy.c b/perf/micro/subimage_copy.c
similarity index 100%
rename from perf/subimage_copy.c
rename to perf/micro/subimage_copy.c
diff --git a/perf/tessellate.c b/perf/micro/tessellate.c
similarity index 100%
rename from perf/tessellate.c
rename to perf/micro/tessellate.c
diff --git a/perf/text.c b/perf/micro/text.c
similarity index 100%
rename from perf/text.c
rename to perf/micro/text.c
diff --git a/perf/twin.c b/perf/micro/twin.c
similarity index 100%
rename from perf/twin.c
rename to perf/micro/twin.c
diff --git a/perf/unaligned-clip.c b/perf/micro/unaligned-clip.c
similarity index 100%
rename from perf/unaligned-clip.c
rename to perf/micro/unaligned-clip.c
diff --git a/perf/world-map.c b/perf/micro/world-map.c
similarity index 100%
rename from perf/world-map.c
rename to perf/micro/world-map.c
diff --git a/perf/world-map.h b/perf/micro/world-map.h
similarity index 100%
rename from perf/world-map.h
rename to perf/micro/world-map.h
diff --git a/perf/zrusin-another.h b/perf/micro/zrusin-another.h
similarity index 100%
rename from perf/zrusin-another.h
rename to perf/micro/zrusin-another.h
diff --git a/perf/zrusin.c b/perf/micro/zrusin.c
similarity index 100%
rename from perf/zrusin.c
rename to perf/micro/zrusin.c