[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.

33 files changed, 46 insertions, 43 deletions

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
index f2699feb4..f2699feb4 100644
--- a/perf/cairo-perf.c
+++ b/perf/cairo-perf-micro.c
diff --git a/perf/box-outline.c b/perf/micro/box-outline.c
index e216b79a1..e216b79a1 100644
--- a/perf/box-outline.c
+++ b/perf/micro/box-outline.c
diff --git a/perf/cairo-perf-cover.c b/perf/micro/cairo-perf-cover.c
index 48f13a8b4..48f13a8b4 100644
--- a/perf/cairo-perf-cover.c
+++ b/perf/micro/cairo-perf-cover.c
diff --git a/perf/composite-checker.c b/perf/micro/composite-checker.c
index 0e61ec8d3..0e61ec8d3 100644
--- a/perf/composite-checker.c
+++ b/perf/micro/composite-checker.c
diff --git a/perf/dragon.c b/perf/micro/dragon.c
index eb8251c86..eb8251c86 100644
--- a/perf/dragon.c
+++ b/perf/micro/dragon.c
diff --git a/perf/fill.c b/perf/micro/fill.c
index c65a649d5..c65a649d5 100644
--- a/perf/fill.c
+++ b/perf/micro/fill.c
diff --git a/perf/glyphs.c b/perf/micro/glyphs.c
index 25175d547..25175d547 100644
--- a/perf/glyphs.c
+++ b/perf/micro/glyphs.c
diff --git a/perf/intersections.c b/perf/micro/intersections.c
index 0418ee319..0418ee319 100644
--- a/perf/intersections.c
+++ b/perf/micro/intersections.c
diff --git a/perf/long-dashed-lines.c b/perf/micro/long-dashed-lines.c
index c4de24f57..c4de24f57 100644
--- a/perf/long-dashed-lines.c
+++ b/perf/micro/long-dashed-lines.c
diff --git a/perf/long-lines.c b/perf/micro/long-lines.c
index 2b72879c1..2b72879c1 100644
--- a/perf/long-lines.c
+++ b/perf/micro/long-lines.c
diff --git a/perf/mask.c b/perf/micro/mask.c
index 3050b447a..3050b447a 100644
--- a/perf/mask.c
+++ b/perf/micro/mask.c
diff --git a/perf/mosaic.c b/perf/micro/mosaic.c
index b76210576..b76210576 100644
--- a/perf/mosaic.c
+++ b/perf/micro/mosaic.c
diff --git a/perf/mosaic.h b/perf/micro/mosaic.h
index e106864a3..e106864a3 100644
--- a/perf/mosaic.h
+++ b/perf/micro/mosaic.h
diff --git a/perf/paint-with-alpha.c b/perf/micro/paint-with-alpha.c
index 5c23fe456..5c23fe456 100644
--- a/perf/paint-with-alpha.c
+++ b/perf/micro/paint-with-alpha.c
diff --git a/perf/paint.c b/perf/micro/paint.c
index bdc014c76..bdc014c76 100644
--- a/perf/paint.c
+++ b/perf/micro/paint.c
diff --git a/perf/pattern_create_radial.c b/perf/micro/pattern_create_radial.c
index 2959e7400..2959e7400 100644
--- a/perf/pattern_create_radial.c
+++ b/perf/micro/pattern_create_radial.c
diff --git a/perf/pythagoras-tree.c b/perf/micro/pythagoras-tree.c
index f2200c98b..f2200c98b 100644
--- a/perf/pythagoras-tree.c
+++ b/perf/micro/pythagoras-tree.c
diff --git a/perf/rectangles.c b/perf/micro/rectangles.c
index 601a0c594..601a0c594 100644
--- a/perf/rectangles.c
+++ b/perf/micro/rectangles.c
diff --git a/perf/rounded-rectangles.c b/perf/micro/rounded-rectangles.c
index 477abf2c9..477abf2c9 100644
--- a/perf/rounded-rectangles.c
+++ b/perf/micro/rounded-rectangles.c
diff --git a/perf/spiral.c b/perf/micro/spiral.c
index 046351c0a..046351c0a 100644
--- a/perf/spiral.c
+++ b/perf/micro/spiral.c
diff --git a/perf/stroke.c b/perf/micro/stroke.c
index 660dce574..660dce574 100644
--- a/perf/stroke.c
+++ b/perf/micro/stroke.c
diff --git a/perf/subimage_copy.c b/perf/micro/subimage_copy.c
index 0bfad80ce..0bfad80ce 100644
--- a/perf/subimage_copy.c
+++ b/perf/micro/subimage_copy.c
diff --git a/perf/tessellate.c b/perf/micro/tessellate.c
index 9debc539f..9debc539f 100644
--- a/perf/tessellate.c
+++ b/perf/micro/tessellate.c
diff --git a/perf/text.c b/perf/micro/text.c
index 827bb8830..827bb8830 100644
--- a/perf/text.c
+++ b/perf/micro/text.c
diff --git a/perf/twin.c b/perf/micro/twin.c
index b2c37a25d..b2c37a25d 100644
--- a/perf/twin.c
+++ b/perf/micro/twin.c
diff --git a/perf/unaligned-clip.c b/perf/micro/unaligned-clip.c
index 284c832a2..284c832a2 100644
--- a/perf/unaligned-clip.c
+++ b/perf/micro/unaligned-clip.c
diff --git a/perf/world-map.c b/perf/micro/world-map.c
index 2a455002c..2a455002c 100644
--- a/perf/world-map.c
+++ b/perf/micro/world-map.c
diff --git a/perf/world-map.h b/perf/micro/world-map.h
index af58b80f1..af58b80f1 100644
--- a/perf/world-map.h
+++ b/perf/micro/world-map.h
diff --git a/perf/zrusin-another.h b/perf/micro/zrusin-another.h
index f6e72aed4..f6e72aed4 100644
--- a/perf/zrusin-another.h
+++ b/perf/micro/zrusin-another.h
diff --git a/perf/zrusin.c b/perf/micro/zrusin.c
index 24aff142d..24aff142d 100644
--- a/perf/zrusin.c
+++ b/perf/micro/zrusin.c