Cleanup res cache bench and split out into a unit test.

bench/GrResourceCacheBench.cpp

Index: bench/GrResourceCacheBench.cpp
diff --git a/bench/GrResourceCacheBench.cpp b/bench/GrResourceCacheBench.cpp
index 272e7bf01eec4a8cdff1738a3dcf20f8a759f7a5..3717dbaa27b1c1fc36002e382c34f8e21dc142bf 100644
--- a/bench/GrResourceCacheBench.cpp
+++ b/bench/GrResourceCacheBench.cpp
@@ -17,165 +17,43 @@
 #include "SkCanvas.h"
 
 enum {
-    CACHE_SIZE_COUNT = 2048,
-    CACHE_SIZE_BYTES = 2 * 1024 * 1024,
+    CACHE_SIZE_COUNT = 4096,
 };
 
-class FooResource : public GrGpuResource {
+class BenchResource : public GrGpuResource {
 public:
-    SK_DECLARE_INST_COUNT(FooResource);
-    FooResource(GrGpu* gpu, int id)
-        : INHERITED(gpu, false)
-        , fID(id) {
+    SK_DECLARE_INST_COUNT(BenchResource);
+    BenchResource (GrGpu* gpu)
+        : INHERITED(gpu, false) {
         this->registerWithCache();
     }
 
-    static GrResourceKey ComputeKey(int width, int height, int sampleCnt) {
+    static GrResourceKey ComputeKey(int i) {
         GrCacheID::Key key;
         memset(&key, 0, sizeof(key));
-        key.fData32[0] = width;
-        key.fData32[1] = height;
-        key.fData32[2] = sampleCnt;
+        key.fData32[0] = i;
         static int gType = GrResourceKey::GenerateResourceType();
         static int gDomain = GrCacheID::GenerateDomain();
         return GrResourceKey(GrCacheID(gDomain, key), gType, 0);
     }
 
-    int fID;
 
 private:

[robertphillips, 2014/11/24 15:51:53]

rm virtual ?

[bsalomon, 2014/11/24 16:04:07]

Done.

-    virtual size_t onGpuMemorySize() const SK_OVERRIDE {
-        return 100 + ((fID % 1 == 0) ? -5 : 6);
-    }
-
-    typedef GrGpuResource INHERITED;
-};
-
-class BarResource : public GrGpuResource {
-public:
-    SK_DECLARE_INST_COUNT(BarResource);
-    BarResource(GrGpu* gpu, int id)
-        : INHERITED(gpu, false)
-        , fID(id) {
-        this->registerWithCache();
-    }
-
-    static GrResourceKey ComputeKey(const GrSurfaceDesc& desc) {
-        GrCacheID::Key key;
-        memset(&key, 0, sizeof(key));
-        key.fData32[0] = (desc.fWidth) | (desc.fHeight << 16);
-        key.fData32[1] = desc.fConfig | desc.fSampleCnt << 16;
-        key.fData32[2] = desc.fFlags;
-        static int gType = GrResourceKey::GenerateResourceType();
-        static int gDomain = GrCacheID::GenerateDomain();
-        return GrResourceKey(GrCacheID(gDomain, key), gType, 0);
-    }
-
-    int fID;
-
-private:
-    virtual size_t onGpuMemorySize() const SK_OVERRIDE {
-        return 100 + ((fID % 1 == 0) ? -40 : 33);
-    }
+    virtual size_t onGpuMemorySize() const SK_OVERRIDE { return 100; }
 
     typedef GrGpuResource INHERITED;
 };
 
-static void get_foo_params(int i, int* w, int* h, int* s) {
-    *w = i % 1024;
-    *h = i * 2 % 1024;
-    *s = i % 2 == 0 ? 0 : 4;
-}
-
-static void get_bar_surf_desc(int i, GrSurfaceDesc* desc) {
-    desc->fFlags = kRenderTarget_GrSurfaceFlag | kNoStencil_GrSurfaceFlag;
-    desc->fWidth  = i % 1024;
-    desc->fHeight = i * 2 % 1024;
-    desc->fConfig = static_cast<GrPixelConfig>(i % (kLast_GrPixelConfig + 1));
-    desc->fSampleCnt = ((i % 2) == 0) ? 0 : 4;
-}
-
 static void populate_cache(GrGpu* gpu, int resourceCount) {
     for (int i = 0; i < resourceCount; ++i) {
-        int w, h, s;
-        get_foo_params(i, &w, &h, &s);
-        GrResourceKey key = FooResource::ComputeKey(w, h, s);
-        GrGpuResource* resource = SkNEW_ARGS(FooResource, (gpu, i));
-        resource->cacheAccess().setContentKey(key);
-        resource->unref();
-    }
-
-    for (int i = 0; i < resourceCount; ++i) {
-        GrSurfaceDesc desc;
-        get_bar_surf_desc(i, &desc);
-        GrResourceKey key =  BarResource::ComputeKey(desc);
-        GrGpuResource* resource = SkNEW_ARGS(BarResource, (gpu, i));
+        GrResourceKey key = BenchResource::ComputeKey(i);
+        GrGpuResource* resource = SkNEW_ARGS(BenchResource, (gpu));
         resource->cacheAccess().setContentKey(key);
         resource->unref();
     }
 }
 
-static void check_cache_contents_or_die(GrResourceCache2* cache, int k) {
-    // Benchmark find calls that succeed.
-    {
-        GrSurfaceDesc desc;
-        get_bar_surf_desc(k, &desc);
-        GrResourceKey key = BarResource::ComputeKey(desc);
-        SkAutoTUnref<GrGpuResource> item(cache->findAndRefContentResource(key));
-        if (!item) {
-            SkFAIL("cache add does not work as expected");
-            return;
-        }
-        if (static_cast<BarResource*>(item.get())->fID != k) {
-            SkFAIL("cache add does not work as expected");
-            return;
-        }
-    }
-    {
-        int w, h, s;
-        get_foo_params(k, &w, &h, &s);
-        GrResourceKey key = FooResource::ComputeKey(w, h, s);
-        SkAutoTUnref<GrGpuResource> item(cache->findAndRefContentResource(key));
-        if (!item) {
-            SkFAIL("cache add does not work as expected");
-            return;
-        }
-        if (static_cast<FooResource*>(item.get())->fID != k) {
-            SkFAIL("cache add does not work as expected");
-            return;
-        }
-    }
-
-    // Benchmark also find calls that always fail.
-    {
-        GrSurfaceDesc desc;
-        get_bar_surf_desc(k, &desc);
-        desc.fHeight |= 1;
-        GrResourceKey key = BarResource::ComputeKey(desc);
-        SkAutoTUnref<GrGpuResource> item(cache->findAndRefContentResource(key));
-        if (item) {
-            SkFAIL("cache add does not work as expected");
-            return;
-        }
-    }
-    {
-        int w, h, s;
-        get_foo_params(k, &w, &h, &s);
-        h |= 1;
-        GrResourceKey key = FooResource::ComputeKey(w, h, s);
-        SkAutoTUnref<GrGpuResource> item(cache->findAndRefContentResource(key));
-        if (item) {
-            SkFAIL("cache add does not work as expected");
-            return;
-        }
-    }
-}
-
 class GrResourceCacheBenchAdd : public Benchmark {
-    enum {
-        RESOURCE_COUNT = CACHE_SIZE_COUNT / 2,
-    };
-
 public:
     virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
         return backend == kNonRendering_Backend;
@@ -192,7 +70,7 @@ protected:
             return;
         }
         // Set the cache budget to be very large so no purging occurs.
-        context->setResourceCacheLimits(2 * RESOURCE_COUNT, 1 << 30);
+        context->setResourceCacheLimits(CACHE_SIZE_COUNT, 1 << 30);
 
         GrResourceCache2* cache2 = context->getResourceCache2();
 
@@ -205,13 +83,7 @@ protected:
         for (int i = 0; i < loops; ++i) {

[robertphillips, 2014/11/24 15:51:53]

How is this assert not firing ?

[bsalomon, 2014/11/24 16:04:07]

Oops, will move out of the loop. nanobench determines that it only needs to run
the loop once :)

             SkASSERT(0 == cache2->getResourceCount() && 0 == cache2->getResourceBytes());
 
-            populate_cache(gpu, RESOURCE_COUNT);
-
-            // Check that cache works.
-            for (int k = 0; k < RESOURCE_COUNT; k += 33) {
-                check_cache_contents_or_die(cache2, k);
-            }
-            cache2->purgeAllUnlocked();
+            populate_cache(gpu, CACHE_SIZE_COUNT);
         }
     }
 
@@ -220,10 +92,6 @@ private:
 };
 
 class GrResourceCacheBenchFind : public Benchmark {
-    enum {
-        RESOURCE_COUNT = CACHE_SIZE_COUNT / 2,
-    };
-
 public:
     virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
         return backend == kNonRendering_Backend;
@@ -240,7 +108,7 @@ protected:
             return;
         }
         // Set the cache budget to be very large so no purging occurs.
-        context->setResourceCacheLimits(2 * RESOURCE_COUNT, 1 << 30);
+        context->setResourceCacheLimits(CACHE_SIZE_COUNT, 1 << 30);
 
         GrResourceCache2* cache2 = context->getResourceCache2();
 
@@ -250,11 +118,13 @@ protected:
 
         GrGpu* gpu = context->getGpu();
 

[robertphillips, 2014/11/24 15:51:53]

Move this to onPreDraw to purify the find timing ?

[bsalomon, 2014/11/24 16:04:07]

Done and it made a huge difference.

-        populate_cache(gpu, RESOURCE_COUNT);
+        populate_cache(gpu, CACHE_SIZE_COUNT);
 
         for (int i = 0; i < loops; ++i) {
-            for (int k = 0; k < RESOURCE_COUNT; ++k) {
-                check_cache_contents_or_die(cache2, k);
+            for (int k = 0; k < CACHE_SIZE_COUNT; ++k) {
+                GrResourceKey key = BenchResource::ComputeKey(i);
+                SkAutoTUnref<GrGpuResource> resource(cache2->findAndRefContentResource(key));
+                SkASSERT(resource);
             }
         }
     }