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
87 lines
2.7 KiB
C++
87 lines
2.7 KiB
C++
#include "DMBenchTask.h"
|
|
#include "DMUtil.h"
|
|
#include "SkSurface.h"
|
|
|
|
namespace DM {
|
|
|
|
static SkString bench_name(const char* name, const char* config) {
|
|
SkString result("bench ");
|
|
result.appendf("%s_%s", name, config);
|
|
return result;
|
|
}
|
|
|
|
NonRenderingBenchTask::NonRenderingBenchTask(const char* config,
|
|
Reporter* reporter,
|
|
TaskRunner* tasks,
|
|
BenchRegistry::Factory factory)
|
|
: CpuTask(reporter, tasks)
|
|
, fBench(factory(NULL))
|
|
, fName(bench_name(fBench->getName(), config)) {}
|
|
|
|
CpuBenchTask::CpuBenchTask(const char* config,
|
|
Reporter* reporter,
|
|
TaskRunner* tasks,
|
|
BenchRegistry::Factory factory,
|
|
SkColorType colorType)
|
|
: CpuTask(reporter, tasks)
|
|
, fBench(factory(NULL))
|
|
, fName(bench_name(fBench->getName(), config))
|
|
, fColorType(colorType) {}
|
|
|
|
GpuBenchTask::GpuBenchTask(const char* config,
|
|
Reporter* reporter,
|
|
TaskRunner* tasks,
|
|
BenchRegistry::Factory factory,
|
|
GrContextFactory::GLContextType contextType,
|
|
int sampleCount)
|
|
: GpuTask(reporter, tasks)
|
|
, fBench(factory(NULL))
|
|
, fName(bench_name(fBench->getName(), config))
|
|
, fContextType(contextType)
|
|
, fSampleCount(sampleCount) {}
|
|
|
|
bool NonRenderingBenchTask::shouldSkip() const {
|
|
return !fBench->isSuitableFor(SkBenchmark::kNonRendering_Backend);
|
|
}
|
|
|
|
bool CpuBenchTask::shouldSkip() const {
|
|
return !fBench->isSuitableFor(SkBenchmark::kRaster_Backend);
|
|
}
|
|
|
|
bool GpuBenchTask::shouldSkip() const {
|
|
return !fBench->isSuitableFor(SkBenchmark::kGPU_Backend);
|
|
}
|
|
|
|
static void draw_raster(SkBenchmark* bench, SkColorType colorType) {
|
|
SkBitmap bitmap;
|
|
SetupBitmap(colorType, bench, &bitmap);
|
|
SkCanvas canvas(bitmap);
|
|
|
|
bench->preDraw();
|
|
bench->draw(1, &canvas);
|
|
bench->postDraw();
|
|
}
|
|
|
|
void NonRenderingBenchTask::draw() {
|
|
draw_raster(fBench.get(), kPMColor_SkColorType);
|
|
}
|
|
|
|
void CpuBenchTask::draw() {
|
|
draw_raster(fBench.get(), fColorType);
|
|
}
|
|
|
|
void GpuBenchTask::draw(GrContextFactory* grFactory) {
|
|
SkImageInfo info = SkImageInfo::Make(fBench->getSize().x(),
|
|
fBench->getSize().y(),
|
|
kPMColor_SkColorType,
|
|
kPremul_SkAlphaType);
|
|
SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(
|
|
grFactory->get(fContextType), info, fSampleCount));
|
|
|
|
fBench->preDraw();
|
|
fBench->draw(1, surface->getCanvas());
|
|
fBench->postDraw();
|
|
}
|
|
|
|
} // namespace DM
|