From c289743864e2ab926a95e617a5cd1d29b26d1825 Mon Sep 17 00:00:00 2001 From: "mtklein@google.com" Date: Tue, 10 Sep 2013 19:23:38 +0000 Subject: Major bench refactoring. - Use FLAGS_. - Remove outer repeat loop. - Tune inner loop automatically. BUG=skia:1590 R=epoger@google.com, scroggo@google.com Review URL: https://codereview.chromium.org/23478013 git-svn-id: http://skia.googlecode.com/svn/trunk@11187 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench/RTreeBench.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bench/RTreeBench.cpp') diff --git a/bench/RTreeBench.cpp b/bench/RTreeBench.cpp index 7dc54ca329..99f8ca8f12 100644 --- a/bench/RTreeBench.cpp +++ b/bench/RTreeBench.cpp @@ -16,7 +16,6 @@ static const int GENERATE_EXTENTS = 1000; static const int NUM_BUILD_RECTS = 500; static const int NUM_QUERY_RECTS = 5000; -static const int NUM_QUERIES = 1000; static const int GRID_WIDTH = 100; typedef SkIRect (*MakeRectProc)(SkRandom&, int, int); @@ -47,7 +46,7 @@ protected: } virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkRandom rand; - for (int i = 0; i < SkBENCHLOOP(100); ++i) { + for (int i = 0; i < this->getLoops(); ++i) { for (int j = 0; j < NUM_BUILD_RECTS; ++j) { fTree->insert(reinterpret_cast(j), fProc(rand, j, NUM_BUILD_RECTS), fBulkLoad); @@ -98,16 +97,17 @@ protected: } virtual void onPreDraw() SK_OVERRIDE { SkRandom rand; - for (int j = 0; j < SkBENCHLOOP(NUM_QUERY_RECTS); ++j) { - fTree->insert(reinterpret_cast(j), fProc(rand, j, - SkBENCHLOOP(NUM_QUERY_RECTS)), fBulkLoad); + for (int j = 0; j < NUM_QUERY_RECTS; ++j) { + fTree->insert(reinterpret_cast(j), + fProc(rand, j, NUM_QUERY_RECTS), + fBulkLoad); } fTree->flushDeferredInserts(); } virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkRandom rand; - for (int i = 0; i < SkBENCHLOOP(NUM_QUERIES); ++i) { + for (int i = 0; i < this->getLoops(); ++i) { SkTDArray hits; SkIRect query; switch(fQuery) { -- cgit v1.2.3