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
119 lines
2.9 KiB
C++
119 lines
2.9 KiB
C++
/*
|
|
* Copyright 2011 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "Test.h"
|
|
|
|
#include "SkCommandLineFlags.h"
|
|
#include "SkError.h"
|
|
#include "SkString.h"
|
|
#include "SkTArray.h"
|
|
#include "SkTime.h"
|
|
|
|
#if SK_SUPPORT_GPU
|
|
#include "GrContext.h"
|
|
#include "gl/SkNativeGLContext.h"
|
|
#else
|
|
class GrContext;
|
|
#endif
|
|
|
|
DEFINE_string2(tmpDir, t, NULL, "tmp directory for tests to use.");
|
|
|
|
using namespace skiatest;
|
|
|
|
Reporter::Reporter() : fTestCount(0) {
|
|
}
|
|
|
|
void Reporter::startTest(Test* test) {
|
|
this->onStart(test);
|
|
}
|
|
|
|
void Reporter::reportFailed(const SkString& desc) {
|
|
this->onReportFailed(desc);
|
|
}
|
|
|
|
void Reporter::endTest(Test* test) {
|
|
this->onEnd(test);
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
Test::Test() : fReporter(NULL), fPassed(true) {}
|
|
|
|
Test::~Test() {
|
|
SkSafeUnref(fReporter);
|
|
}
|
|
|
|
void Test::setReporter(Reporter* r) {
|
|
SkRefCnt_SafeAssign(fReporter, r);
|
|
}
|
|
|
|
const char* Test::getName() {
|
|
if (fName.size() == 0) {
|
|
this->onGetName(&fName);
|
|
}
|
|
return fName.c_str();
|
|
}
|
|
|
|
class LocalReporter : public Reporter {
|
|
public:
|
|
explicit LocalReporter(Reporter* reporterToMimic) : fReporter(reporterToMimic) {}
|
|
|
|
int numFailures() const { return fFailures.count(); }
|
|
const SkString& failure(int i) const { return fFailures[i]; }
|
|
|
|
protected:
|
|
virtual void onReportFailed(const SkString& desc) SK_OVERRIDE {
|
|
fFailures.push_back(desc);
|
|
}
|
|
|
|
// Proxy down to fReporter. We assume these calls are threadsafe.
|
|
virtual bool allowExtendedTest() const SK_OVERRIDE {
|
|
return fReporter->allowExtendedTest();
|
|
}
|
|
|
|
virtual void bumpTestCount() SK_OVERRIDE {
|
|
fReporter->bumpTestCount();
|
|
}
|
|
|
|
virtual bool verbose() const SK_OVERRIDE {
|
|
return fReporter->verbose();
|
|
}
|
|
|
|
private:
|
|
Reporter* fReporter; // Unowned.
|
|
SkTArray<SkString> fFailures;
|
|
};
|
|
|
|
void Test::run() {
|
|
// Clear the Skia error callback before running any test, to ensure that tests
|
|
// don't have unintended side effects when running more than one.
|
|
SkSetErrorCallback( NULL, NULL );
|
|
|
|
// Tell (likely shared) fReporter that this test has started.
|
|
fReporter->startTest(this);
|
|
|
|
const SkMSec start = SkTime::GetMSecs();
|
|
// Run the test into a LocalReporter so we know if it's passed or failed without interference
|
|
// from other tests that might share fReporter.
|
|
LocalReporter local(fReporter);
|
|
this->onRun(&local);
|
|
fPassed = local.numFailures() == 0;
|
|
fElapsed = SkTime::GetMSecs() - start;
|
|
|
|
// Now tell fReporter about any failures and wrap up.
|
|
for (int i = 0; i < local.numFailures(); i++) {
|
|
fReporter->reportFailed(local.failure(i));
|
|
}
|
|
fReporter->endTest(this);
|
|
|
|
}
|
|
|
|
SkString Test::GetTmpDir() {
|
|
const char* tmpDir = FLAGS_tmpDir.isEmpty() ? NULL : FLAGS_tmpDir[0];
|
|
return SkString(tmpDir);
|
|
}
|