Clean up some benches that answer questions we're no longer asking.

bench/MemoryBench.cpp

Index: bench/MemoryBench.cpp
diff --git a/bench/MemoryBench.cpp b/bench/MemoryBench.cpp
index f8af1683b02f2bff2a58af1d83edb172310b490b..05ec83b3e0a1437bfa9795d3c9c408c5383d2f58 100644
--- a/bench/MemoryBench.cpp
+++ b/bench/MemoryBench.cpp
@@ -56,110 +56,3 @@ private:
 DEF_BENCH( return new ChunkAllocBench(64); )
 DEF_BENCH( return new ChunkAllocBench(8*1024); )
 
-static int* calloc(size_t num) {
-    return (int*)sk_calloc_throw(num*sizeof(int));
-}
-
-static int* malloc_bzero(size_t num) {
-    const size_t bytes = num*sizeof(int);
-    int* ints = (int*)sk_malloc_throw(bytes);
-    sk_bzero(ints, bytes);
-    return ints;
-}
-
-class ZerosBench : public Benchmark {
-    size_t   fNum;
-    bool     fRead;
-    bool     fWrite;
-    bool     fUseCalloc;
-    SkString fName;
-public:
-    ZerosBench(size_t num, bool read, bool write, bool useCalloc)
-        : fNum(num)
-        , fRead(read)
-        , fWrite(write)
-        , fUseCalloc(useCalloc) {
-        fName.printf("memory_%s", useCalloc ? "calloc" : "malloc_bzero");
-        if (read && write) {
-            fName.appendf("_rw");
-        } else if (read) {
-            fName.appendf("_r");
-        } else if (write) {
-            fName.appendf("_w");
-        }
-        fName.appendf("_" SK_SIZE_T_SPECIFIER, num);
-    }
-
-    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*) SK_OVERRIDE {
-        for (int i = 0; i < loops; i++) {
-            int* zeros = fUseCalloc ? calloc(fNum) : malloc_bzero(fNum);
-            if (fRead) {
-                volatile int x = 15;
-                for (size_t j = 0; j < fNum; j++) {
-                    x ^= zeros[j];
-                }
-            }
-            if (fWrite) {
-                for (size_t j = 0; j < fNum; j++) {
-                    zeros[j] = 15;
-                }
-            }
-            sk_free(zeros);
-        }
-    }
-};
-
-//                             zero count  r  w  useCalloc?
-DEF_BENCH(return new ZerosBench(1024*1024, 0, 0, 0))
-DEF_BENCH(return new ZerosBench(1024*1024, 0, 0, 1))
-DEF_BENCH(return new ZerosBench(1024*1024, 0, 1, 0))
-DEF_BENCH(return new ZerosBench(1024*1024, 0, 1, 1))
-DEF_BENCH(return new ZerosBench(1024*1024, 1, 0, 0))
-DEF_BENCH(return new ZerosBench(1024*1024, 1, 0, 1))
-DEF_BENCH(return new ZerosBench(1024*1024, 1, 1, 0))
-DEF_BENCH(return new ZerosBench(1024*1024, 1, 1, 1))
-
-DEF_BENCH(return new ZerosBench(256*1024, 0, 0, 0))
-DEF_BENCH(return new ZerosBench(256*1024, 0, 0, 1))
-DEF_BENCH(return new ZerosBench(256*1024, 0, 1, 0))
-DEF_BENCH(return new ZerosBench(256*1024, 0, 1, 1))
-DEF_BENCH(return new ZerosBench(256*1024, 1, 0, 0))
-DEF_BENCH(return new ZerosBench(256*1024, 1, 0, 1))
-DEF_BENCH(return new ZerosBench(256*1024, 1, 1, 0))
-DEF_BENCH(return new ZerosBench(256*1024, 1, 1, 1))
-
-DEF_BENCH(return new ZerosBench(4*1024, 0, 0, 0))
-DEF_BENCH(return new ZerosBench(4*1024, 0, 0, 1))
-DEF_BENCH(return new ZerosBench(4*1024, 0, 1, 0))
-DEF_BENCH(return new ZerosBench(4*1024, 0, 1, 1))
-DEF_BENCH(return new ZerosBench(4*1024, 1, 0, 0))
-DEF_BENCH(return new ZerosBench(4*1024, 1, 0, 1))
-DEF_BENCH(return new ZerosBench(4*1024, 1, 1, 0))
-DEF_BENCH(return new ZerosBench(4*1024, 1, 1, 1))
-
-DEF_BENCH(return new ZerosBench(300, 0, 0, 0))
-DEF_BENCH(return new ZerosBench(300, 0, 0, 1))
-DEF_BENCH(return new ZerosBench(300, 0, 1, 0))
-DEF_BENCH(return new ZerosBench(300, 0, 1, 1))
-DEF_BENCH(return new ZerosBench(300, 1, 0, 0))
-DEF_BENCH(return new ZerosBench(300, 1, 0, 1))
-DEF_BENCH(return new ZerosBench(300, 1, 1, 0))
-DEF_BENCH(return new ZerosBench(300, 1, 1, 1))
-
-DEF_BENCH(return new ZerosBench(4, 0, 0, 0))
-DEF_BENCH(return new ZerosBench(4, 0, 0, 1))
-DEF_BENCH(return new ZerosBench(4, 0, 1, 0))
-DEF_BENCH(return new ZerosBench(4, 0, 1, 1))
-DEF_BENCH(return new ZerosBench(4, 1, 0, 0))
-DEF_BENCH(return new ZerosBench(4, 1, 0, 1))
-DEF_BENCH(return new ZerosBench(4, 1, 1, 0))
-DEF_BENCH(return new ZerosBench(4, 1, 1, 1))