2013-04-08 11:50:46 +00:00
|
|
|
/*
|
|
|
|
* 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"
|
2013-04-10 15:55:37 +00:00
|
|
|
#include "PathOpsThreadedCommon.h"
|
2013-04-08 11:50:46 +00:00
|
|
|
|
2013-04-10 15:55:37 +00:00
|
|
|
static void testSimplifyTrianglesMain(PathOpsThreadState* data) {
|
2013-04-08 11:50:46 +00:00
|
|
|
SkASSERT(data);
|
2013-04-10 15:55:37 +00:00
|
|
|
PathOpsThreadState& state = *data;
|
2013-04-08 11:50:46 +00:00
|
|
|
char pathStr[1024];
|
2013-07-16 16:11:16 +00:00
|
|
|
bool progress = state.fReporter->verbose(); // FIXME: break out into its own parameter?
|
|
|
|
if (progress) {
|
|
|
|
sk_bzero(pathStr, sizeof(pathStr));
|
|
|
|
}
|
2013-04-18 15:58:21 +00:00
|
|
|
state.fKey = "?";
|
2013-04-10 15:55:37 +00:00
|
|
|
int ax = state.fA & 0x03;
|
|
|
|
int ay = state.fA >> 2;
|
|
|
|
int bx = state.fB & 0x03;
|
|
|
|
int by = state.fB >> 2;
|
|
|
|
int cx = state.fC & 0x03;
|
|
|
|
int cy = state.fC >> 2;
|
|
|
|
for (int d = 0; d < 15; ++d) {
|
|
|
|
int dx = d & 0x03;
|
|
|
|
int dy = d >> 2;
|
|
|
|
for (int e = d + 1; e < 16; ++e) {
|
|
|
|
int ex = e & 0x03;
|
|
|
|
int ey = e >> 2;
|
|
|
|
for (int f = d + 1; f < 16; ++f) {
|
|
|
|
if (e == f) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
int fx = f & 0x03;
|
|
|
|
int fy = f >> 2;
|
|
|
|
if ((ex - dx) * (fy - dy) == (ey - dy) * (fx - dx)) {
|
|
|
|
continue;
|
2013-04-08 11:50:46 +00:00
|
|
|
}
|
2013-04-10 15:55:37 +00:00
|
|
|
SkPath path, out;
|
|
|
|
path.setFillType(SkPath::kWinding_FillType);
|
|
|
|
path.moveTo(SkIntToScalar(ax), SkIntToScalar(ay));
|
|
|
|
path.lineTo(SkIntToScalar(bx), SkIntToScalar(by));
|
|
|
|
path.lineTo(SkIntToScalar(cx), SkIntToScalar(cy));
|
|
|
|
path.close();
|
|
|
|
path.moveTo(SkIntToScalar(dx), SkIntToScalar(dy));
|
|
|
|
path.lineTo(SkIntToScalar(ex), SkIntToScalar(ey));
|
|
|
|
path.lineTo(SkIntToScalar(fx), SkIntToScalar(fy));
|
|
|
|
path.close();
|
2013-07-16 16:11:16 +00:00
|
|
|
if (progress) {
|
|
|
|
char* str = pathStr;
|
|
|
|
str += sprintf(str, " path.moveTo(%d, %d);\n", ax, ay);
|
|
|
|
str += sprintf(str, " path.lineTo(%d, %d);\n", bx, by);
|
|
|
|
str += sprintf(str, " path.lineTo(%d, %d);\n", cx, cy);
|
|
|
|
str += sprintf(str, " path.close();\n");
|
|
|
|
str += sprintf(str, " path.moveTo(%d, %d);\n", dx, dy);
|
|
|
|
str += sprintf(str, " path.lineTo(%d, %d);\n", ex, ey);
|
|
|
|
str += sprintf(str, " path.lineTo(%d, %d);\n", fx, fy);
|
|
|
|
str += sprintf(str, " path.close();\n");
|
|
|
|
outputProgress(state.fPathStr, pathStr, SkPath::kWinding_FillType);
|
|
|
|
}
|
2013-04-18 15:58:21 +00:00
|
|
|
ShowTestName(&state, d, e, f, 0);
|
2013-04-10 15:55:37 +00:00
|
|
|
testSimplify(path, false, out, state, pathStr);
|
|
|
|
path.setFillType(SkPath::kEvenOdd_FillType);
|
2013-07-16 16:11:16 +00:00
|
|
|
if (progress) {
|
|
|
|
outputProgress(state.fPathStr, pathStr, SkPath::kEvenOdd_FillType);
|
|
|
|
}
|
2013-04-18 15:58:21 +00:00
|
|
|
ShowTestName(&state, d, e, f, 1);
|
2013-04-10 15:55:37 +00:00
|
|
|
testSimplify(path, true, out, state, pathStr);
|
2013-04-08 11:50:46 +00:00
|
|
|
}
|
|
|
|
}
|
2013-04-10 15:55:37 +00:00
|
|
|
}
|
2013-04-08 11:50:46 +00:00
|
|
|
}
|
|
|
|
|
2014-01-02 21:45:03 +00:00
|
|
|
DEF_TEST(PathOpsSimplifyTrianglesThreaded, reporter) {
|
Revert of SkThreadPool ~~> SkTaskGroup (patchset #4 id:60001 of https://codereview.chromium.org/531653002/)
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
2014-09-03 21:17:48 +00:00
|
|
|
int threadCount = initializeTests(reporter, "testTriangles");
|
|
|
|
PathOpsThreadedTestRunner testRunner(reporter, threadCount);
|
2013-04-08 11:50:46 +00:00
|
|
|
for (int a = 0; a < 15; ++a) {
|
|
|
|
int ax = a & 0x03;
|
|
|
|
int ay = a >> 2;
|
|
|
|
for (int b = a + 1; b < 16; ++b) {
|
|
|
|
int bx = b & 0x03;
|
|
|
|
int by = b >> 2;
|
|
|
|
for (int c = a + 1; c < 16; ++c) {
|
|
|
|
if (b == c) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
int cx = c & 0x03;
|
|
|
|
int cy = c >> 2;
|
|
|
|
if ((bx - ax) * (cy - ay) == (by - ay) * (cx - ax)) {
|
|
|
|
continue;
|
|
|
|
}
|
2013-04-10 15:55:37 +00:00
|
|
|
*testRunner.fRunnables.append() = SkNEW_ARGS(PathOpsThreadedRunnable,
|
|
|
|
(&testSimplifyTrianglesMain, a, b, c, 0, &testRunner));
|
2013-04-08 11:50:46 +00:00
|
|
|
}
|
2013-04-10 15:55:37 +00:00
|
|
|
if (!reporter->allowExtendedTest()) goto finish;
|
2013-04-08 11:50:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
finish:
|
2013-04-10 15:55:37 +00:00
|
|
|
testRunner.render();
|
2013-04-08 11:50:46 +00:00
|
|
|
}
|