2460bbdfbb
Reason for revert: Leaks, leaks, leaks. Original issue's description: > SkThreadPool ~~> SkTaskGroup > > 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, reed@google.com, mtklein@chromium.org TBR=bsalomon@google.com, bungeman@google.com, caryclark@google.com, mtklein@chromium.org, reed@google.com NOTREECHECKS=true NOTRY=true BUG=skia: Author: mtklein@google.com Review URL: https://codereview.chromium.org/533393002
104 lines
4.1 KiB
C++
Executable File
104 lines
4.1 KiB
C++
Executable File
/*
|
|
* Copyright 2014 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"
|
|
|
|
static void testOpLoopsMain(PathOpsThreadState* data) {
|
|
#if DEBUG_SHOW_TEST_NAME
|
|
strncpy(DEBUG_FILENAME_STRING, "", DEBUG_FILENAME_STRING_LENGTH);
|
|
#endif
|
|
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) {
|
|
// define 4 points that form two lines that often cross; one line is (a, b) (c, d)
|
|
SkVector v = {SkIntToScalar(a - c), SkIntToScalar(b - d)};
|
|
SkPoint midA = { SkIntToScalar(a * state.fA + c * (6 - state.fA)) / 6,
|
|
SkIntToScalar(b * state.fA + d * (6 - state.fA)) / 6 };
|
|
SkPoint midB = { SkIntToScalar(a * state.fB + c * (6 - state.fB)) / 6,
|
|
SkIntToScalar(b * state.fB + d * (6 - state.fB)) / 6 };
|
|
SkPoint endC = { midA.fX + v.fY * state.fC / 3,
|
|
midA.fY + v.fX * state.fC / 3 };
|
|
SkPoint endD = { midB.fX - v.fY * state.fD / 3,
|
|
midB.fY + v.fX * state.fD / 3 };
|
|
SkPath pathA, pathB;
|
|
if (progress) {
|
|
char* str = pathStr;
|
|
str += sprintf(str, " path.moveTo(%d,%d);\n", a, b);
|
|
str += sprintf(str, " path.cubicTo(%d,%d, %1.9gf,%1.9gf, %1.9gf,%1.9gf);\n",
|
|
c, d, endC.fX, endC.fY, endD.fX, endD.fY);
|
|
str += sprintf(str, " path.close();\n");
|
|
str += sprintf(str, " pathB.moveTo(%d,%d);\n", c, d);
|
|
str += sprintf(str, " pathB.cubicTo(%1.9gf,%1.9gf, %1.9gf,%1.9gf, %d,%d);\n",
|
|
endC.fX, endC.fY, endD.fX, endD.fY, a, b);
|
|
str += sprintf(str, " pathB.close();\n");
|
|
}
|
|
pathA.moveTo(SkIntToScalar(a), SkIntToScalar(b));
|
|
pathA.cubicTo(SkIntToScalar(c), SkIntToScalar(d), endC.fX, endC.fY, endD.fX, endD.fY);
|
|
pathA.close();
|
|
pathB.moveTo(SkIntToScalar(c), SkIntToScalar(d));
|
|
pathB.cubicTo(endC.fX, endC.fY, endD.fX, endD.fY, SkIntToScalar(a), SkIntToScalar(b));
|
|
pathB.close();
|
|
// SkDebugf("%s\n", pathStr);
|
|
if (progress) {
|
|
outputProgress(state.fPathStr, pathStr, kIntersect_PathOp);
|
|
}
|
|
testThreadedPathOp(state.fReporter, pathA, pathB, kIntersect_PathOp, "loops");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
DEF_TEST(PathOpsOpLoopsThreaded, reporter) {
|
|
int threadCount = initializeTests(reporter, "cubicOp");
|
|
PathOpsThreadedTestRunner testRunner(reporter, threadCount);
|
|
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,
|
|
(&testOpLoopsMain, a, b, c, d, &testRunner));
|
|
}
|
|
}
|
|
if (!reporter->allowExtendedTest()) goto finish;
|
|
}
|
|
}
|
|
finish:
|
|
testRunner.render();
|
|
ShowTestArray();
|
|
}
|
|
|
|
DEF_TEST(PathOpsOpLoops, reporter) {
|
|
(void) initializeTests(reporter, "cubicOp");
|
|
PathOpsThreadState state;
|
|
state.fReporter = reporter;
|
|
SkBitmap bitmap;
|
|
state.fBitmap = &bitmap;
|
|
char pathStr[PATH_STR_SIZE];
|
|
state.fPathStr = pathStr;
|
|
for (state.fA = 0; state.fA < 6; ++state.fA) { // outermost
|
|
for (state.fB = state.fA + 1; state.fB < 7; ++state.fB) {
|
|
for (state.fC = 0 ; state.fC < 6; ++state.fC) {
|
|
for (state.fD = state.fC + 1; state.fD < 7; ++state.fD) {
|
|
testOpLoopsMain(&state);
|
|
}
|
|
}
|
|
if (!reporter->allowExtendedTest()) goto finish;
|
|
}
|
|
}
|
|
finish:
|
|
ShowTestArray();
|
|
}
|