a06a953121
- Propagate a bunch of constant parameters through. - Delete code that's not used when bulk loading. - Allocate all Nodes together. - Stay in SkRect. Doing a single malloc for the nodes can't not have improved memory usage. Looks like this might improve record performance ~5%, probably mostly from staying in SkRects. This finally dethrones building the BBH as the hot spot. (Now it's mapping user bounds back to device bounds and adjusting for paints.) Recording time changes from my MBP: desk_rectangletransition.skp 11.5us -> 11.7us 1x desk_forecastio.skp 115us -> 114us 0.98x desk_booking.skp 550us -> 541us 0.98x tabl_mercurynews.skp 176us -> 173us 0.98x tabl_hsfi.skp 294us -> 287us 0.98x desk_wordpress.skp 351us -> 343us 0.98x tabl_worldjournal.skp 439us -> 426us 0.97x tabl_gmail.skp 20.3us -> 19.7us 0.97x desk_youtubetvvideo.skp 10.8us -> 10.4us 0.97x desk_googleplus.skp 1.1ms -> 1.07ms 0.97x tabl_slashdot.skp 106us -> 103us 0.97x desk_jsfiddlebigcar.skp 26.7us -> 25.7us 0.96x tabl_techmeme.skp 95.4us -> 91.7us 0.96x tabl_deviantart.skp 133us -> 127us 0.96x desk_pinterest.skp 40.6us -> 38.9us 0.96x desk_carsvg.skp 195us -> 187us 0.96x tabl_engadget.skp 376us -> 359us 0.96x tabl_sahadan.skp 60.5us -> 57.5us 0.95x tabl_culturalsolutions.skp 255us -> 242us 0.95x tabl_gspro.skp 58.3us -> 55.5us 0.95x desk_linkedin.skp 146us -> 138us 0.94x desk_ebay.skp 192us -> 181us 0.94x tabl_cnn.skp 467us -> 440us 0.94x desk_jsfiddlehumperclip.skp 29.9us -> 28.1us 0.94x desk_tigersvg.skp 43.2us -> 40.5us 0.94x desk_yahooanswers.skp 131us -> 123us 0.94x desk_googlespreadsheetdashed.skp 1.18ms -> 1.11ms 0.94x desk_blogger.skp 193us -> 181us 0.94x tabl_mozilla.skp 1.82ms -> 1.7ms 0.94x tabl_mlb.skp 145us -> 136us 0.93x mobi_wikipedia.skp 577us -> 539us 0.93x tabl_frantzen.skp 54.1us -> 50.4us 0.93x desk_baidu.skp 87.9us -> 81.9us 0.93x desk_techcrunch.skp 224us -> 209us 0.93x desk_sfgate.skp 206us -> 192us 0.93x tabl_ukwsj.skp 269us -> 250us 0.93x desk_facebook.skp 316us -> 293us 0.93x desk_gmailthread.skp 205us -> 190us 0.93x tabl_googlecalendar.skp 158us -> 147us 0.93x tabl_digg.skp 382us -> 354us 0.93x desk_amazon.skp 106us -> 98.5us 0.93x tabl_androidpolice.skp 693us -> 642us 0.93x tabl_nytimes.skp 206us -> 191us 0.92x desk_gws.skp 124us -> 114us 0.92x desk_youtube.skp 255us -> 235us 0.92x tabl_cuteoverload.skp 583us -> 537us 0.92x desk_oldinboxapp.skp 18us -> 16.6us 0.92x desk_mobilenews.skp 297us -> 273us 0.92x tabl_pravda.skp 168us -> 154us 0.92x tabl_vnexpress.skp 236us -> 217us 0.92x desk_css3gradients.skp 202us -> 185us 0.92x tabl_gamedeksiam.skp 508us -> 464us 0.91x desk_wowwiki.skp 1.02ms -> 929us 0.91x desk_espn.skp 209us -> 191us 0.91x desk_chalkboard.skp 315us -> 284us 0.9x desk_mapsvg.skp 607us -> 543us 0.89x desk_pokemonwiki.skp 5.18ms -> 4.62ms 0.89x desk_samoasvg.skp 335us -> 298us 0.89x desk_youtubetvbrowse.skp 10.1us -> 8.59us 0.85x BUG=skia:3085, skia:2834 Review URL: https://codereview.chromium.org/734723002
139 lines
4.9 KiB
C++
139 lines
4.9 KiB
C++
/*
|
|
* Copyright 2012 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "Benchmark.h"
|
|
#include "SkCanvas.h"
|
|
#include "SkRTree.h"
|
|
#include "SkRandom.h"
|
|
#include "SkString.h"
|
|
|
|
// confine rectangles to a smallish area, so queries generally hit something, and overlap occurs:
|
|
static const SkScalar GENERATE_EXTENTS = 1000.0f;
|
|
static const int NUM_BUILD_RECTS = 500;
|
|
static const int NUM_QUERY_RECTS = 5000;
|
|
static const int GRID_WIDTH = 100;
|
|
|
|
typedef SkRect (*MakeRectProc)(SkRandom&, int, int);
|
|
|
|
// Time how long it takes to build an R-Tree.
|
|
class RTreeBuildBench : public Benchmark {
|
|
public:
|
|
RTreeBuildBench(const char* name, MakeRectProc proc) : fProc(proc) {
|
|
fName.printf("rtree_%s_build", name);
|
|
}
|
|
|
|
virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
|
|
return backend == kNonRendering_Backend;
|
|
}
|
|
|
|
protected:
|
|
virtual const char* onGetName() SK_OVERRIDE {
|
|
return fName.c_str();
|
|
}
|
|
virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
|
|
SkRandom rand;
|
|
SkAutoTMalloc<SkRect> rects(NUM_BUILD_RECTS);
|
|
for (int i = 0; i < NUM_BUILD_RECTS; ++i) {
|
|
rects[i] = fProc(rand, i, NUM_BUILD_RECTS);
|
|
}
|
|
|
|
for (int i = 0; i < loops; ++i) {
|
|
SkRTree tree;
|
|
tree.insert(&rects, NUM_BUILD_RECTS);
|
|
SkASSERT(rects != NULL); // It'd break this bench if the tree took ownership of rects.
|
|
}
|
|
}
|
|
private:
|
|
MakeRectProc fProc;
|
|
SkString fName;
|
|
typedef Benchmark INHERITED;
|
|
};
|
|
|
|
// Time how long it takes to perform queries on an R-Tree.
|
|
class RTreeQueryBench : public Benchmark {
|
|
public:
|
|
RTreeQueryBench(const char* name, MakeRectProc proc) : fProc(proc) {
|
|
fName.printf("rtree_%s_query", name);
|
|
}
|
|
|
|
virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
|
|
return backend == kNonRendering_Backend;
|
|
}
|
|
protected:
|
|
virtual const char* onGetName() SK_OVERRIDE {
|
|
return fName.c_str();
|
|
}
|
|
virtual void onPreDraw() SK_OVERRIDE {
|
|
SkRandom rand;
|
|
SkAutoTMalloc<SkRect> rects(NUM_QUERY_RECTS);
|
|
for (int i = 0; i < NUM_QUERY_RECTS; ++i) {
|
|
rects[i] = fProc(rand, i, NUM_QUERY_RECTS);
|
|
}
|
|
fTree.insert(&rects, NUM_QUERY_RECTS);
|
|
}
|
|
|
|
virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
|
|
SkRandom rand;
|
|
for (int i = 0; i < loops; ++i) {
|
|
SkTDArray<unsigned> hits;
|
|
SkRect query;
|
|
query.fLeft = rand.nextRangeF(0, GENERATE_EXTENTS);
|
|
query.fTop = rand.nextRangeF(0, GENERATE_EXTENTS);
|
|
query.fRight = query.fLeft + 1 + rand.nextRangeF(0, GENERATE_EXTENTS/2);
|
|
query.fBottom = query.fTop + 1 + rand.nextRangeF(0, GENERATE_EXTENTS/2);
|
|
fTree.search(query, &hits);
|
|
}
|
|
}
|
|
private:
|
|
SkRTree fTree;
|
|
MakeRectProc fProc;
|
|
SkString fName;
|
|
typedef Benchmark INHERITED;
|
|
};
|
|
|
|
static inline SkRect make_XYordered_rects(SkRandom& rand, int index, int numRects) {
|
|
SkRect out;
|
|
out.fLeft = SkIntToScalar(index % GRID_WIDTH);
|
|
out.fTop = SkIntToScalar(index / GRID_WIDTH);
|
|
out.fRight = out.fLeft + 1 + rand.nextRangeF(0, GENERATE_EXTENTS/3);
|
|
out.fBottom = out.fTop + 1 + rand.nextRangeF(0, GENERATE_EXTENTS/3);
|
|
return out;
|
|
}
|
|
static inline SkRect make_YXordered_rects(SkRandom& rand, int index, int numRects) {
|
|
SkRect out;
|
|
out.fLeft = SkIntToScalar(index / GRID_WIDTH);
|
|
out.fTop = SkIntToScalar(index % GRID_WIDTH);
|
|
out.fRight = out.fLeft + 1 + rand.nextRangeF(0, GENERATE_EXTENTS/3);
|
|
out.fBottom = out.fTop + 1 + rand.nextRangeF(0, GENERATE_EXTENTS/3);
|
|
return out;
|
|
}
|
|
|
|
static inline SkRect make_random_rects(SkRandom& rand, int index, int numRects) {
|
|
SkRect out;
|
|
out.fLeft = rand.nextRangeF(0, GENERATE_EXTENTS);
|
|
out.fTop = rand.nextRangeF(0, GENERATE_EXTENTS);
|
|
out.fRight = out.fLeft + 1 + rand.nextRangeF(0, GENERATE_EXTENTS/5);
|
|
out.fBottom = out.fTop + 1 + rand.nextRangeF(0, GENERATE_EXTENTS/5);
|
|
return out;
|
|
}
|
|
|
|
static inline SkRect make_concentric_rects(SkRandom&, int index, int numRects) {
|
|
return SkRect::MakeWH(SkIntToScalar(index+1), SkIntToScalar(index+1));
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
DEF_BENCH(return SkNEW_ARGS(RTreeBuildBench, ("XY", &make_XYordered_rects)));
|
|
DEF_BENCH(return SkNEW_ARGS(RTreeBuildBench, ("YX", &make_YXordered_rects)));
|
|
DEF_BENCH(return SkNEW_ARGS(RTreeBuildBench, ("random", &make_random_rects)));
|
|
DEF_BENCH(return SkNEW_ARGS(RTreeBuildBench, ("concentric", &make_concentric_rects)));
|
|
|
|
DEF_BENCH(return SkNEW_ARGS(RTreeQueryBench, ("XY", &make_XYordered_rects)));
|
|
DEF_BENCH(return SkNEW_ARGS(RTreeQueryBench, ("YX", &make_YXordered_rects)));
|
|
DEF_BENCH(return SkNEW_ARGS(RTreeQueryBench, ("random", &make_random_rects)));
|
|
DEF_BENCH(return SkNEW_ARGS(RTreeQueryBench, ("concentric", &make_concentric_rects)));
|