2013-10-16 13:02:15 +00:00
|
|
|
#ifndef DMTask_DEFINED
|
|
|
|
#define DMTask_DEFINED
|
|
|
|
|
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
|
|
|
#include "DMGpuSupport.h"
|
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, mtklein@google.com, reed@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/531653002
2014-09-03 22:34:37 +00:00
|
|
|
#include "DMReporter.h"
|
2013-10-16 13:02:15 +00:00
|
|
|
#include "SkRunnable.h"
|
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, mtklein@google.com, reed@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/531653002
2014-09-03 22:34:37 +00:00
|
|
|
#include "SkTaskGroup.h"
|
2014-03-03 15:44:56 +00:00
|
|
|
#include "SkTime.h"
|
2013-10-16 13:02:15 +00:00
|
|
|
|
2014-02-28 20:31:31 +00:00
|
|
|
// DM will run() these tasks on one of two threadpools.
|
|
|
|
// Subclasses can call fail() to mark this task as failed, or make any number of spawnChild() calls
|
|
|
|
// to kick off dependent tasks.
|
2013-10-16 13:02:15 +00:00
|
|
|
//
|
2014-02-28 20:31:31 +00:00
|
|
|
// Tasks delete themselves when run.
|
2013-10-16 13:02:15 +00:00
|
|
|
|
|
|
|
namespace DM {
|
|
|
|
|
|
|
|
class TaskRunner;
|
|
|
|
|
2014-02-28 20:31:31 +00:00
|
|
|
class CpuTask;
|
2013-10-16 13:02:15 +00:00
|
|
|
|
2014-02-28 20:31:31 +00:00
|
|
|
class Task {
|
|
|
|
public:
|
2013-10-16 13:02:15 +00:00
|
|
|
virtual bool shouldSkip() const = 0;
|
|
|
|
virtual SkString name() const = 0;
|
|
|
|
|
2013-12-02 13:50:38 +00:00
|
|
|
// Returns the number of parents above this task.
|
|
|
|
// Top-level tasks return 0, their children 1, and so on.
|
|
|
|
int depth() const { return fDepth; }
|
|
|
|
|
2013-10-16 13:02:15 +00:00
|
|
|
protected:
|
2014-02-28 20:31:31 +00:00
|
|
|
Task(Reporter* reporter, TaskRunner* taskRunner);
|
|
|
|
Task(const Task& parent);
|
2014-05-29 20:14:48 +00:00
|
|
|
virtual ~Task();
|
2013-10-16 13:02:15 +00:00
|
|
|
|
2014-03-03 15:44:56 +00:00
|
|
|
void start();
|
2014-02-28 20:31:31 +00:00
|
|
|
void fail(const char* msg = NULL);
|
|
|
|
void finish();
|
2014-03-03 15:44:56 +00:00
|
|
|
|
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, mtklein@google.com, reed@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/531653002
2014-09-03 22:34:37 +00:00
|
|
|
void reallySpawnChild(CpuTask* task); // For now we don't allow GPU child tasks.
|
2014-02-26 23:01:57 +00:00
|
|
|
|
2013-10-16 13:02:15 +00:00
|
|
|
private:
|
2014-02-28 20:31:31 +00:00
|
|
|
Reporter* fReporter; // Unowned.
|
|
|
|
TaskRunner* fTaskRunner; // Unowned.
|
2013-12-02 13:50:38 +00:00
|
|
|
int fDepth;
|
2014-03-03 15:44:56 +00:00
|
|
|
SkMSec fStart;
|
2014-02-28 20:31:31 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
class CpuTask : public Task, public SkRunnable {
|
|
|
|
public:
|
|
|
|
CpuTask(Reporter* reporter, TaskRunner* taskRunner);
|
|
|
|
CpuTask(const Task& parent);
|
|
|
|
virtual ~CpuTask() {}
|
|
|
|
|
|
|
|
void run() SK_OVERRIDE;
|
|
|
|
virtual void draw() = 0;
|
2014-04-30 20:47:30 +00:00
|
|
|
|
|
|
|
void spawnChild(CpuTask* task);
|
2014-02-28 20:31:31 +00:00
|
|
|
};
|
|
|
|
|
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, mtklein@google.com, reed@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/531653002
2014-09-03 22:34:37 +00:00
|
|
|
class GpuTask : public Task {
|
2014-02-28 20:31:31 +00:00
|
|
|
public:
|
|
|
|
GpuTask(Reporter* reporter, TaskRunner* taskRunner);
|
|
|
|
virtual ~GpuTask() {}
|
2013-11-20 16:44:59 +00:00
|
|
|
|
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, mtklein@google.com, reed@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/531653002
2014-09-03 22:34:37 +00:00
|
|
|
void run(GrContextFactory*);
|
2014-02-28 20:31:31 +00:00
|
|
|
virtual void draw(GrContextFactory*) = 0;
|
2014-04-30 20:47:30 +00:00
|
|
|
|
|
|
|
void spawnChild(CpuTask* task);
|
2013-10-16 13:02:15 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
} // namespace DM
|
|
|
|
|
|
|
|
#endif // DMTask_DEFINED
|