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
62 lines
1.4 KiB
C++
62 lines
1.4 KiB
C++
#ifndef DMTestTask_DEFINED
|
|
#define DMTestTask_DEFINED
|
|
|
|
#include "DMReporter.h"
|
|
#include "DMTask.h"
|
|
#include "DMTaskRunner.h"
|
|
#include "SkString.h"
|
|
#include "SkTemplates.h"
|
|
#include "Test.h"
|
|
|
|
// Runs a unit test.
|
|
namespace DM {
|
|
|
|
class TestReporter : public skiatest::Reporter {
|
|
public:
|
|
TestReporter() {}
|
|
|
|
const char* failure() const { return fFailure.c_str(); }
|
|
|
|
private:
|
|
virtual bool allowExtendedTest() const SK_OVERRIDE;
|
|
virtual bool verbose() const SK_OVERRIDE;
|
|
|
|
virtual void onReportFailed(const SkString& desc) SK_OVERRIDE {
|
|
fFailure = desc;
|
|
}
|
|
|
|
SkString fFailure;
|
|
};
|
|
|
|
class CpuTestTask : public CpuTask {
|
|
public:
|
|
CpuTestTask(Reporter*, TaskRunner*, skiatest::TestRegistry::Factory);
|
|
|
|
virtual void draw() SK_OVERRIDE;
|
|
virtual bool shouldSkip() const SK_OVERRIDE { return false; }
|
|
virtual SkString name() const SK_OVERRIDE { return fName; }
|
|
|
|
private:
|
|
TestReporter fTestReporter;
|
|
SkAutoTDelete<skiatest::Test> fTest;
|
|
const SkString fName;
|
|
};
|
|
|
|
class GpuTestTask : public GpuTask {
|
|
public:
|
|
GpuTestTask(Reporter*, TaskRunner*, skiatest::TestRegistry::Factory);
|
|
|
|
virtual void draw(GrContextFactory*) SK_OVERRIDE;
|
|
virtual bool shouldSkip() const SK_OVERRIDE;
|
|
virtual SkString name() const SK_OVERRIDE { return fName; }
|
|
|
|
private:
|
|
TestReporter fTestReporter;
|
|
SkAutoTDelete<skiatest::Test> fTest;
|
|
const SkString fName;
|
|
};
|
|
|
|
} // namespace DM
|
|
|
|
#endif // DMTestTask_DEFINED
|