[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

@@ -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

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_micro_SOURCES =		\
-	cairo-perf.c		\
+	cairo-perf-micro.c	\
 	cairo-perf.h		\
-	cairo-perf-cover.c	\
+	micro/cairo-perf-cover.c	\
-	box-outline.c		\
+	micro/box-outline.c		\
-	composite-checker.c	\
+	micro/composite-checker.c	\
-	fill.c			\
+	micro/fill.c			\
-	long-lines.c		\
+	micro/long-lines.c		\
-	mosaic.c		\
+	micro/mosaic.c		\
-	mosaic.h		\
+	micro/mosaic.h		\
-	paint.c			\
+	micro/paint.c			\
-	paint-with-alpha.c	\
+	micro/paint-with-alpha.c	\
-	mask.c			\
+	micro/mask.c			\
-	pattern_create_radial.c \
+	micro/pattern_create_radial.c \
-	rectangles.c		\
+	micro/rectangles.c		\
-	rounded-rectangles.c	\
+	micro/rounded-rectangles.c	\
-	stroke.c		\
+	micro/stroke.c		\
-	subimage_copy.c		\
+	micro/subimage_copy.c		\
-	tessellate.c		\
+	micro/tessellate.c		\
-	text.c			\
+	micro/text.c			\
-	glyphs.c		\
+	micro/glyphs.c		\
-	twin.c			\
+	micro/twin.c			\
-	unaligned-clip.c	\
+	micro/unaligned-clip.c	\
-	world-map.c		\
+	micro/world-map.c		\
-	world-map.h		\
+	micro/world-map.h		\
-	zrusin.c		\
+	micro/zrusin.c		\
-	zrusin-another.h	\
+	micro/zrusin-another.h	\
-	long-dashed-lines.c	\
+	micro/long-dashed-lines.c	\
-	dragon.c		\
+	micro/dragon.c		\
-	pythagoras-tree.c	\
+	micro/pythagoras-tree.c	\
-	intersections.c		\
+	micro/intersections.c		\
-	spiral.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_micro_LDADD = $(LDADD)
-cairo_perf_DEPENDENCIES = \
+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)
+perf: cairo-perf-micro$(EXEEXT) cairo-perf-trace$(EXEEXT)
-	-$(CAIRO_PERF_ENVIRONMENT) ./cairo-perf$(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

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