ef57b7e653
The main meat of things is in SkThreadPool. We can now give SkThreadPool a type for each thread to create and destroy on its local stack. It's TLS without going through SkTLS. I've split the DM tasks into CpuTasks that run on threads with no TLS, and GpuTasks that run on threads with a thread local GrContextFactory. The old CpuTask and GpuTask have been renamed to CpuGMTask and GpuGMTask. Upshot: default run of out/Debug/dm goes from ~45 seconds to ~20 seconds. BUG=skia: R=bsalomon@google.com, mtklein@google.com, reed@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/179233005 git-svn-id: http://skia.googlecode.com/svn/trunk@13632 2bbb7eff-a529-9590-31e7-b0007b416f81
54 lines
1.6 KiB
C++
54 lines
1.6 KiB
C++
#include "DMTestTask.h"
|
|
#include "DMUtil.h"
|
|
#include "SkCommandLineFlags.h"
|
|
|
|
DEFINE_bool2(pathOpsExtended, x, false, "Run extended pathOps tests.");
|
|
DEFINE_bool2(pathOpsSingleThread, z, false, "Disallow pathOps tests from using threads.");
|
|
DEFINE_bool2(pathOpsVerbose, V, false, "Tell pathOps tests to be verbose.");
|
|
|
|
namespace DM {
|
|
|
|
bool TestReporter::allowExtendedTest() const { return FLAGS_pathOpsExtended; }
|
|
bool TestReporter::allowThreaded() const { return !FLAGS_pathOpsSingleThread; }
|
|
bool TestReporter::verbose() const { return FLAGS_pathOpsVerbose; }
|
|
|
|
static SkString test_name(const char* name) {
|
|
SkString result("test ");
|
|
result.append(name);
|
|
return result;
|
|
}
|
|
|
|
CpuTestTask::CpuTestTask(Reporter* reporter,
|
|
TaskRunner* taskRunner,
|
|
skiatest::TestRegistry::Factory factory)
|
|
: CpuTask(reporter, taskRunner)
|
|
, fTest(factory(NULL))
|
|
, fName(test_name(fTest->getName())) {}
|
|
|
|
GpuTestTask::GpuTestTask(Reporter* reporter,
|
|
TaskRunner* taskRunner,
|
|
skiatest::TestRegistry::Factory factory)
|
|
: GpuTask(reporter, taskRunner)
|
|
, fTest(factory(NULL))
|
|
, fName(test_name(fTest->getName())) {}
|
|
|
|
|
|
void CpuTestTask::draw() {
|
|
fTest->setReporter(&fTestReporter);
|
|
fTest->run();
|
|
if (!fTest->passed()) {
|
|
this->fail(fTestReporter.failure());
|
|
}
|
|
}
|
|
|
|
void GpuTestTask::draw(GrContextFactory* grFactory) {
|
|
fTest->setGrContextFactory(grFactory);
|
|
fTest->setReporter(&fTestReporter);
|
|
fTest->run();
|
|
if (!fTest->passed()) {
|
|
this->fail(fTestReporter.failure());
|
|
}
|
|
}
|
|
|
|
} // namespace DM
|