Replace int Benchmark::calculateLoops(int) with bool Benchmark::shoul…

…dLoop(). Given that this method and all its overrides return either 1 or the given number of loops, let's replace it with a method that returns a boolean. Motivation: - Less confusing. - Simplifies the BenchmarkBazelRunner.cpp program I'm working on (see https://skia-review.googlesource.com/c/skia/+/762118). Bug: b/40045301 Change-Id: I8b2a35c525d3945218b6ae3020a92a8230ac124a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/761737 Reviewed-by: John Stiles <[email protected]> Commit-Queue: Leandro Lovisolo <[email protected]> Auto-Submit: Leandro Lovisolo <[email protected]>
HistoryFork · Oct 3, 2023 · c66c89c · c66c89c
1 parent b708dd7
commit c66c89c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/bench/Benchmark.h b/bench/Benchmark.h
@@ -59,8 +59,9 @@ class Benchmark : public SkRefCnt {
     // Allows a benchmark to override options used to construct the GrContext.
     virtual void modifyGrContextOptions(GrContextOptions*) {}
 
-    virtual int calculateLoops(int defaultLoops) const {
-        return defaultLoops;
+    // Whether or not this benchmark requires multiple samples to get a meaningful result.
+    virtual bool shouldLoop() const {
+        return true;
     }
 
     // Call before draw, allows the benchmark to do setup work outside of the

diff --git a/bench/SKPBench.h b/bench/SKPBench.h
@@ -24,8 +24,8 @@ class SKPBench : public Benchmark {
              bool doLooping);
     ~SKPBench() override;
 
-    int calculateLoops(int defaultLoops) const override {
-        return fDoLooping ? defaultLoops : 1;
+    bool shouldLoop() const override {
+        return fDoLooping;
     }
 
     void getGpuStats(SkCanvas*,

diff --git a/bench/SkSLBench.cpp b/bench/SkSLBench.cpp
@@ -710,8 +710,8 @@ class SkSLModuleLoaderBench : public Benchmark {
         return backend == kNonRendering_Backend;
     }
 
-    int calculateLoops(int defaultLoops) const override {
-        return 1;
+    bool shouldLoop() const override {
+        return false;
     }
 
     void onPreDraw(SkCanvas*) override {

diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
@@ -467,7 +467,7 @@ static int setup_cpu_bench(const double overhead, Target* target, Benchmark* ben
     // First figure out approximately how many loops of bench it takes to make overhead negligible.
     double bench_plus_overhead = 0.0;
     int round = 0;
-    int loops = bench->calculateLoops(FLAGS_loops);
+    int loops = bench->shouldLoop() ? FLAGS_loops : 1;
     if (kAutoTuneLoops == loops) {
         while (bench_plus_overhead < overhead) {
             if (round++ == FLAGS_maxCalibrationAttempts) {
@@ -509,7 +509,7 @@ static int setup_cpu_bench(const double overhead, Target* target, Benchmark* ben
 
 static int setup_gpu_bench(Target* target, Benchmark* bench, int maxGpuFrameLag) {
     // First, figure out how many loops it'll take to get a frame up to FLAGS_gpuMs.
-    int loops = bench->calculateLoops(FLAGS_loops);
+    int loops = bench->shouldLoop() ? FLAGS_loops : 1;
     if (kAutoTuneLoops == loops) {
         loops = 1;
         double elapsed = 0;