406654be7a
SkTaskGroup is like SkThreadPool except the threads stay in one global pool. Each SkTaskGroup itself is tiny (4 bytes) and its wait() method applies only to tasks add()ed to that instance, not the whole thread pool. This means we don't need to bring up new thread pools when tests themselves want to use multithreading (e.g. pathops, quilt). We just create a new SkTaskGroup and wait for that to complete. This should be more efficient, and allow us to expand where we use threads to really latency sensitive places. E.g. we can probably now use these in nanobench for CPU .skp rendering. Now that all threads are sharing the same pool, I think we can remove most of the custom mechanism pathops tests use to control threading. They'll just ride on the global pool with all other tests now. This (temporarily?) removes the GPU multithreading feature from DM, which we don't use. On my desktop, DM runs a little faster (57s -> 55s) in Debug, and a lot faster in Release (36s -> 24s). The bots show speedups of similar proportions, cutting more than a minute off the N4/Release and Win7/Debug runtimes. BUG=skia: Committed: https://skia.googlesource.com/skia/+/9c7207b5dc71dc5a96a2eb107d401133333d5b6f R=caryclark@google.com, bsalomon@google.com, bungeman@google.com, mtklein@google.com, reed@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/531653002
93 lines
3.9 KiB
C++
93 lines
3.9 KiB
C++
/*
|
|
* Copyright 2012 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
#include "PathOpsExtendedTest.h"
|
|
#include "PathOpsThreadedCommon.h"
|
|
|
|
// four rects, of four sizes
|
|
// for 3 smaller sizes, tall, wide
|
|
// top upper mid lower bottom aligned (3 bits, 5 values)
|
|
// same with x (3 bits, 5 values)
|
|
// not included, square, tall, wide (2 bits)
|
|
// cw or ccw (1 bit)
|
|
|
|
static void testPathOpsRectsMain(PathOpsThreadState* data)
|
|
{
|
|
SkASSERT(data);
|
|
PathOpsThreadState& state = *data;
|
|
char pathStr[1024]; // gdb: set print elements 400
|
|
bool progress = state.fReporter->verbose(); // FIXME: break out into its own parameter?
|
|
if (progress) {
|
|
sk_bzero(pathStr, sizeof(pathStr));
|
|
}
|
|
for (int a = 0 ; a < 6; ++a) {
|
|
for (int b = a + 1 ; b < 7; ++b) {
|
|
for (int c = 0 ; c < 6; ++c) {
|
|
for (int d = c + 1 ; d < 7; ++d) {
|
|
for (int e = SkPath::kWinding_FillType ; e <= SkPath::kEvenOdd_FillType; ++e) {
|
|
for (int f = SkPath::kWinding_FillType ; f <= SkPath::kEvenOdd_FillType; ++f) {
|
|
if (progress) {
|
|
char* str = pathStr;
|
|
str += sprintf(str, " path.setFillType(SkPath::k%s_FillType);\n",
|
|
e == SkPath::kWinding_FillType ? "Winding" : e == SkPath::kEvenOdd_FillType
|
|
? "EvenOdd" : "?UNDEFINED");
|
|
str += sprintf(str, " path.addRect(%d, %d, %d, %d,"
|
|
" SkPath::kCW_Direction);\n", state.fA, state.fA, state.fB, state.fB);
|
|
str += sprintf(str, " path.addRect(%d, %d, %d, %d,"
|
|
" SkPath::kCW_Direction);\n", state.fC, state.fC, state.fD, state.fD);
|
|
str += sprintf(str, " pathB.setFillType(SkPath::k%s_FillType);\n",
|
|
f == SkPath::kWinding_FillType ? "Winding" : f == SkPath::kEvenOdd_FillType
|
|
? "EvenOdd" : "?UNDEFINED");
|
|
str += sprintf(str, " pathB.addRect(%d, %d, %d, %d,"
|
|
" SkPath::kCW_Direction);\n", a, a, b, b);
|
|
str += sprintf(str, " pathB.addRect(%d, %d, %d, %d,"
|
|
" SkPath::kCW_Direction);\n", c, c, d, d);
|
|
}
|
|
SkPath pathA, pathB;
|
|
pathA.setFillType((SkPath::FillType) e);
|
|
pathA.addRect(SkIntToScalar(state.fA), SkIntToScalar(state.fA), SkIntToScalar(state.fB),
|
|
SkIntToScalar(state.fB), SkPath::kCW_Direction);
|
|
pathA.addRect(SkIntToScalar(state.fC), SkIntToScalar(state.fC), SkIntToScalar(state.fD),
|
|
SkIntToScalar(state.fD), SkPath::kCW_Direction);
|
|
pathA.close();
|
|
pathB.setFillType((SkPath::FillType) f);
|
|
pathB.addRect(SkIntToScalar(a), SkIntToScalar(a), SkIntToScalar(b),
|
|
SkIntToScalar(b), SkPath::kCW_Direction);
|
|
pathB.addRect(SkIntToScalar(c), SkIntToScalar(c), SkIntToScalar(d),
|
|
SkIntToScalar(d), SkPath::kCW_Direction);
|
|
pathB.close();
|
|
for (int op = 0 ; op <= kXOR_PathOp; ++op) {
|
|
if (progress) {
|
|
outputProgress(state.fPathStr, pathStr, (SkPathOp) op);
|
|
}
|
|
testThreadedPathOp(state.fReporter, pathA, pathB, (SkPathOp) op, "rects");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
DEF_TEST(PathOpsRectsThreaded, reporter) {
|
|
initializeTests(reporter, "testOp");
|
|
PathOpsThreadedTestRunner testRunner(reporter);
|
|
for (int a = 0; a < 6; ++a) { // outermost
|
|
for (int b = a + 1; b < 7; ++b) {
|
|
for (int c = 0 ; c < 6; ++c) {
|
|
for (int d = c + 1; d < 7; ++d) {
|
|
*testRunner.fRunnables.append() = SkNEW_ARGS(PathOpsThreadedRunnable,
|
|
(&testPathOpsRectsMain, a, b, c, d, &testRunner));
|
|
}
|
|
}
|
|
if (!reporter->allowExtendedTest()) goto finish;
|
|
}
|
|
}
|
|
finish:
|
|
testRunner.render();
|
|
}
|