Make GrResourceCache perf less sensitive to key length change

bench/GrResourceCacheBench.cpp

Index: bench/GrResourceCacheBench.cpp
diff --git a/bench/GrResourceCacheBench.cpp b/bench/GrResourceCacheBench.cpp
index 5807654ca9ff6609057e89120867b773f8e485d9..8ef20f9b3b4a2b721478da46f262da6c4e0d4a1c 100644
--- a/bench/GrResourceCacheBench.cpp
+++ b/bench/GrResourceCacheBench.cpp
@@ -24,28 +24,31 @@ enum {
 class BenchResource : public GrGpuResource {
 public:
     SK_DECLARE_INST_COUNT(BenchResource);
-    BenchResource (GrGpu* gpu)
-        : INHERITED(gpu, kCached_LifeCycle) {
+    BenchResource (GrGpu* gpu, int keyData32Count)
+        : INHERITED(gpu, kCached_LifeCycle)
+        , fKeyData32Count(keyData32Count) {
         this->registerWithCache();
     }
 
-    static void ComputeKey(int i, GrUniqueKey* key) {
+    static void ComputeKey(int i, int keyData32Count, GrUniqueKey* key) {
         static GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
-        GrUniqueKey::Builder builder(key, kDomain, 1);
-        builder[0] = i;
+        GrUniqueKey::Builder builder(key, kDomain, keyData32Count);
+        for (int j = 0; j < keyData32Count; ++j) {
+            builder[j] = i + j;
+        }
     }
 
 private:
     size_t onGpuMemorySize() const override { return 100; }
-
+    int fKeyData32Count;
     typedef GrGpuResource INHERITED;
 };
 
-static void populate_cache(GrGpu* gpu, int resourceCount) {
+static void populate_cache(GrGpu* gpu, int resourceCount, int keyData32Count) {
     for (int i = 0; i < resourceCount; ++i) {
         GrUniqueKey key;
-        BenchResource::ComputeKey(i, &key);
-        GrGpuResource* resource = SkNEW_ARGS(BenchResource, (gpu));
+        BenchResource::ComputeKey(i, keyData32Count, &key);
+        GrGpuResource* resource = SkNEW_ARGS(BenchResource, (gpu, keyData32Count));
         resource->resourcePriv().setUniqueKey(key);
         resource->unref();
     }
@@ -53,13 +56,20 @@ static void populate_cache(GrGpu* gpu, int resourceCount) {
 
 class GrResourceCacheBenchAdd : public Benchmark {
 public:
+    GrResourceCacheBenchAdd(int keyData32Count)
+        : fFullName("grresourcecache_add")
+        , fKeyData32Count(keyData32Count) {
+        if (keyData32Count > 1) {
+            fFullName.appendf("_%d", fKeyData32Count);
+        }
+    }
+
     bool isSuitableFor(Backend backend) override {
         return backend == kNonRendering_Backend;
     }
-
 protected:
     const char* onGetName() override {
-        return "grresourcecache_add";
+        return fFullName.c_str();
     }
 
     void onDraw(const int loops, SkCanvas* canvas) override {
@@ -79,24 +89,33 @@ protected:
         GrGpu* gpu = context->getGpu();
 
         for (int i = 0; i < loops; ++i) {
-            populate_cache(gpu, CACHE_SIZE_COUNT);
+            populate_cache(gpu, CACHE_SIZE_COUNT, fKeyData32Count);
             SkASSERT(CACHE_SIZE_COUNT == cache->getResourceCount());
         }
     }
 
 private:
+    SkString fFullName;
+    int fKeyData32Count;
     typedef Benchmark INHERITED;
 };
 
 class GrResourceCacheBenchFind : public Benchmark {
 public:
+    GrResourceCacheBenchFind(int keyData32Count)
+        : fFullName("grresourcecache_find")
+        , fKeyData32Count(keyData32Count) {
+        if (keyData32Count > 1) {
+            fFullName.appendf("_%d", fKeyData32Count);
+        }
+    }
+
     bool isSuitableFor(Backend backend) override {
         return backend == kNonRendering_Backend;
     }
-
 protected:
     const char* onGetName() override {
-        return "grresourcecache_find";
+        return fFullName.c_str();
     }
 
     void onPreDraw() override {
@@ -115,7 +134,7 @@ protected:
 
         GrGpu* gpu = fContext->getGpu();
 
-        populate_cache(gpu, CACHE_SIZE_COUNT);
+        populate_cache(gpu, CACHE_SIZE_COUNT, fKeyData32Count);
     }
 
     void onDraw(const int loops, SkCanvas* canvas) override {
@@ -127,7 +146,7 @@ protected:
         for (int i = 0; i < loops; ++i) {
             for (int k = 0; k < CACHE_SIZE_COUNT; ++k) {
                 GrUniqueKey key;
-                BenchResource::ComputeKey(k, &key);
+                BenchResource::ComputeKey(k, fKeyData32Count, &key);
                 SkAutoTUnref<GrGpuResource> resource(cache->findAndRefUniqueResource(key));
                 SkASSERT(resource);
             }
@@ -136,10 +155,36 @@ protected:
 
 private:
     SkAutoTUnref<GrContext> fContext;
+    SkString fFullName;
+    int fKeyData32Count;
     typedef Benchmark INHERITED;
 };
 
-DEF_BENCH( return new GrResourceCacheBenchAdd(); )
-DEF_BENCH( return new GrResourceCacheBenchFind(); )
+DEF_BENCH( return new GrResourceCacheBenchAdd(1); )
+#ifdef SK_RELEASE
+// Only on release because on debug the SkTDynamicHash validation is too slow.

[mtklein, 2015/05/15 12:43:06]

I'd be okay with #if-0'ing out the validation code in SkTDynamicHash.  It's
important when making changes to SkTDynamicHash, but that code has been
practically unchanged for about a year now.

+DEF_BENCH( return new GrResourceCacheBenchAdd(2); )
+DEF_BENCH( return new GrResourceCacheBenchAdd(3); )
+DEF_BENCH( return new GrResourceCacheBenchAdd(4); )
+DEF_BENCH( return new GrResourceCacheBenchAdd(5); )
+DEF_BENCH( return new GrResourceCacheBenchAdd(10); )
+DEF_BENCH( return new GrResourceCacheBenchAdd(25); )
+DEF_BENCH( return new GrResourceCacheBenchAdd(54); )
+DEF_BENCH( return new GrResourceCacheBenchAdd(55); )
+DEF_BENCH( return new GrResourceCacheBenchAdd(56); )
+#endif
+
+DEF_BENCH( return new GrResourceCacheBenchFind(1); )
+#ifdef SK_RELEASE
+DEF_BENCH( return new GrResourceCacheBenchFind(2); )
+DEF_BENCH( return new GrResourceCacheBenchFind(3); )
+DEF_BENCH( return new GrResourceCacheBenchFind(4); )
+DEF_BENCH( return new GrResourceCacheBenchFind(5); )
+DEF_BENCH( return new GrResourceCacheBenchFind(10); )
+DEF_BENCH( return new GrResourceCacheBenchFind(25); )
+DEF_BENCH( return new GrResourceCacheBenchFind(54); )
+DEF_BENCH( return new GrResourceCacheBenchFind(55); )
+DEF_BENCH( return new GrResourceCacheBenchFind(56); )
+#endif
 
 #endif