In bench_pictures --multi, maintain thread local caches.
Builds on https://codereview.appspot.com/6718046/ by mtklein.
Previously, each iteration of drawing a picture started new threads to draw the picture. Since each thread is using thread local storage for the font cache, this means that each iteration had to start with an empty font cache.
The newly added MultiCorePictureRenderer, separated from TiledPictureRenderer, now starts the drawing threads at the beginning of the test using an SkThreadPool, and keeps them alive through all iterations, so the font cache can be reused.
For now, I have removed the pipe version of the threaded renderer.
Updated bench_pictures_main and render_pictures_main to use the new
renderer, and to unref a renderer before early exit.
Review URL: https://codereview.appspot.com/6777063
git-svn-id: http://skia.googlecode.com/svn/trunk@6285 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tools/render_pictures_main.cpp b/tools/render_pictures_main.cpp
index ae9e94d..521bbf8 100644
--- a/tools/render_pictures_main.cpp
+++ b/tools/render_pictures_main.cpp
@@ -63,7 +63,7 @@
SkDebugf(
" --multi count : Set the number of threads for multi threaded drawing. Must be greater\n"
" than 1. Only works with tiled rendering.\n"
-" --pipe: Benchmark SkGPipe rendering. Compatible with tiled, multithreaded rendering.\n");
+" --pipe: Benchmark SkGPipe rendering. Currently incompatible with \"mode\".\n");
SkDebugf(
" --device bitmap"
#if SK_SUPPORT_GPU
@@ -174,7 +174,12 @@
for (++argv; argv < stop; ++argv) {
if (0 == strcmp(*argv, "--mode")) {
- SkDELETE(renderer);
+ if (renderer != NULL) {
+ renderer->unref();
+ SkDebugf("Cannot combine modes.\n");
+ usage(argv0);
+ exit(-1);
+ }
++argv;
if (argv >= stop) {
@@ -218,12 +223,14 @@
} else if (0 == strcmp(*argv, "--multi")) {
++argv;
if (argv >= stop) {
+ SkSafeUnref(renderer);
SkDebugf("Missing arg for --multi\n");
usage(argv0);
exit(-1);
}
numThreads = atoi(*argv);
if (numThreads < 2) {
+ SkSafeUnref(renderer);
SkDebugf("Number of threads must be at least 2.\n");
usage(argv0);
exit(-1);
@@ -231,6 +238,7 @@
} else if (0 == strcmp(*argv, "--device")) {
++argv;
if (argv >= stop) {
+ SkSafeUnref(renderer);
SkDebugf("Missing mode for --device\n");
usage(argv0);
exit(-1);
@@ -245,13 +253,14 @@
}
#endif
else {
+ SkSafeUnref(renderer);
SkDebugf("%s is not a valid mode for --device\n", *argv);
usage(argv0);
exit(-1);
}
} else if ((0 == strcmp(*argv, "-h")) || (0 == strcmp(*argv, "--help"))) {
- SkDELETE(renderer);
+ SkSafeUnref(renderer);
usage(argv0);
exit(-1);
} else if (0 == strcmp(*argv, "-w")) {
@@ -268,6 +277,7 @@
}
if (numThreads > 1 && !useTiles) {
+ SkSafeUnref(renderer);
SkDebugf("Multithreaded drawing requires tiled rendering.\n");
usage(argv0);
exit(-1);
@@ -275,7 +285,12 @@
if (useTiles) {
SkASSERT(NULL == renderer);
- sk_tools::TiledPictureRenderer* tiledRenderer = SkNEW(sk_tools::TiledPictureRenderer);
+ sk_tools::TiledPictureRenderer* tiledRenderer;
+ if (numThreads > 1) {
+ tiledRenderer = SkNEW_ARGS(sk_tools::MultiCorePictureRenderer, (numThreads));
+ } else {
+ tiledRenderer = SkNEW(sk_tools::TiledPictureRenderer);
+ }
if (isPowerOf2Mode) {
int minWidth = atoi(widthString);
if (!SkIsPow2(minWidth) || minWidth < 0) {
@@ -332,16 +347,24 @@
exit(-1);
}
#endif
- tiledRenderer->setNumberOfThreads(numThreads);
}
- tiledRenderer->setUsePipe(usePipe);
renderer = tiledRenderer;
+ if (usePipe) {
+ SkDebugf("Pipe rendering is currently not compatible with tiling.\n"
+ "Turning off pipe.\n");
+ }
} else if (usePipe) {
+ if (renderer != NULL) {
+ renderer->unref();
+ SkDebugf("Pipe is incompatible with other modes.\n");
+ usage(argv0);
+ exit(-1);
+ }
renderer = SkNEW(sk_tools::PipePictureRenderer);
}
if (inputs->empty()) {
- SkDELETE(renderer);
+ SkSafeUnref(renderer);
if (NULL != outputDir) {
SkDELETE(outputDir);
}