Revert "Use scratch keys for stencil buffers."

This reverts commit 91175f19664a62851da4ca4e0984a7c7c45b258f.

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

This reverts commit 4e4303f002c5958c6c958e7ba8e49b24c25f0b22.

Revert "rebaselines"

This reverts commit 65ba7b57759bfca60b24bc34dc46fc8caaf146f0.

TBR=tomhudson@google.com

Review URL: https://codereview.chromium.org/752233002

1 files changed, 156 insertions, 37 deletions

diff --git a/bench/GrResourceCacheBench.cpp b/bench/GrResourceCacheBench.cpp
index e30dd3052f..e1ec90d511 100644
--- a/bench/GrResourceCacheBench.cpp
+++ b/bench/GrResourceCacheBench.cpp
@@ -14,63 +14,181 @@
 #include "GrContext.h"
 #include "GrGpu.h"
 #include "GrResourceCache2.h"
+#include "GrStencilBuffer.h"
+#include "GrTexture.h"
+#include "GrTexturePriv.h"
 #include "SkCanvas.h"
 
 enum {
-    CACHE_SIZE_COUNT = 4096,
+    CACHE_SIZE_COUNT = 2048,
+    CACHE_SIZE_BYTES = 2 * 1024 * 1024,
 };
 
-class BenchResource : public GrGpuResource {
+class StencilResource : public GrGpuResource {
 public:
-    SK_DECLARE_INST_COUNT(BenchResource);
-    BenchResource (GrGpu* gpu)
-        : INHERITED(gpu, false) {
+    SK_DECLARE_INST_COUNT(StencilResource);
+    StencilResource(GrGpu* gpu, int id)
+        : INHERITED(gpu, false)
+        , fID(id) {
         this->registerWithCache();
     }
 
-    static GrResourceKey ComputeKey(int i) {
+    static GrResourceKey ComputeKey(int width, int height, int sampleCnt) {
+        return GrStencilBuffer::ComputeKey(width, height, sampleCnt);
+    }
+
+    int fID;
+
+private:
+    virtual size_t onGpuMemorySize() const SK_OVERRIDE {
+        return 100 + ((fID % 1 == 0) ? -5 : 6);
+    }
+
+    typedef GrGpuResource INHERITED;
+};
+
+class TextureResource : public GrGpuResource {
+public:
+    SK_DECLARE_INST_COUNT(TextureResource);
+    TextureResource(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] = i;
+        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:
-    size_t onGpuMemorySize() const SK_OVERRIDE { return 100; }
+    virtual size_t onGpuMemorySize() const SK_OVERRIDE {
+        return 100 + ((fID % 1 == 0) ? -40 : 33);
+    }
 
     typedef GrGpuResource INHERITED;
 };
 
+static void get_stencil(int i, int* w, int* h, int* s) {
+    *w = i % 1024;
+    *h = i * 2 % 1024;
+    *s = i % 1 == 0 ? 0 : 4;
+}
+
+static void get_texture_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) {
-        GrResourceKey key = BenchResource::ComputeKey(i);
-        GrGpuResource* resource = SkNEW_ARGS(BenchResource, (gpu));
+        int w, h, s;
+        get_stencil(i, &w, &h, &s);
+        GrResourceKey key = GrStencilBuffer::ComputeKey(w, h, s);
+        GrGpuResource* resource = SkNEW_ARGS(StencilResource, (gpu, i));
         resource->cacheAccess().setContentKey(key);
         resource->unref();
     }
+
+    for (int i = 0; i < resourceCount; ++i) {
+        GrSurfaceDesc desc;
+        get_texture_desc(i, &desc);
+        GrResourceKey key =  TextureResource::ComputeKey(desc);
+        GrGpuResource* resource = SkNEW_ARGS(TextureResource, (gpu, i));
+        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_texture_desc(k, &desc);
+        GrResourceKey key = TextureResource::ComputeKey(desc);
+        SkAutoTUnref<GrGpuResource> item(cache->findAndRefContentResource(key));
+        if (!item) {
+            SkFAIL("cache add does not work as expected");
+            return;
+        }
+        if (static_cast<TextureResource*>(item.get())->fID != k) {
+            SkFAIL("cache add does not work as expected");
+            return;
+        }
+    }
+    {
+        int w, h, s;
+        get_stencil(k, &w, &h, &s);
+        GrResourceKey key = StencilResource::ComputeKey(w, h, s);
+        SkAutoTUnref<GrGpuResource> item(cache->findAndRefContentResource(key));
+        if (!item) {
+            SkFAIL("cache add does not work as expected");
+            return;
+        }
+        if (static_cast<TextureResource*>(item.get())->fID != k) {
+            SkFAIL("cache add does not work as expected");
+            return;
+        }
+    }
+
+    // Benchmark also find calls that always fail.
+    {
+        GrSurfaceDesc desc;
+        get_texture_desc(k, &desc);
+        desc.fHeight |= 1;
+        GrResourceKey key = TextureResource::ComputeKey(desc);
+        SkAutoTUnref<GrGpuResource> item(cache->findAndRefContentResource(key));
+        if (item) {
+            SkFAIL("cache add does not work as expected");
+            return;
+        }
+    }
+    {
+        int w, h, s;
+        get_stencil(k, &w, &h, &s);
+        h |= 1;
+        GrResourceKey key = StencilResource::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:
-    bool isSuitableFor(Backend backend) SK_OVERRIDE {
+    virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
         return backend == kNonRendering_Backend;
     }
 
 protected:
-    const char* onGetName() SK_OVERRIDE {
+    virtual const char* onGetName() SK_OVERRIDE {
         return "grresourcecache_add";
     }
 
-    void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
         SkAutoTUnref<GrContext> context(GrContext::CreateMockContext());
         if (NULL == context) {
             return;
         }
         // Set the cache budget to be very large so no purging occurs.
-        context->setResourceCacheLimits(CACHE_SIZE_COUNT, 1 << 30);
+        context->setResourceCacheLimits(2 * RESOURCE_COUNT, 1 << 30);
 
         GrResourceCache2* cache2 = context->getResourceCache2();
 
@@ -81,8 +199,15 @@ protected:
         GrGpu* gpu = context->getGpu();
 
         for (int i = 0; i < loops; ++i) {
-            populate_cache(gpu, CACHE_SIZE_COUNT);
-            SkASSERT(CACHE_SIZE_COUNT == cache2->getResourceCount());
+            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();
         }
     }
 
@@ -91,52 +216,46 @@ private:
 };
 
 class GrResourceCacheBenchFind : public Benchmark {
+    enum {
+        RESOURCE_COUNT = CACHE_SIZE_COUNT / 2,
+    };
+
 public:
-    bool isSuitableFor(Backend backend) SK_OVERRIDE {
+    virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
         return backend == kNonRendering_Backend;
     }
 
 protected:
-    const char* onGetName() SK_OVERRIDE {
+    virtual const char* onGetName() SK_OVERRIDE {
         return "grresourcecache_find";
     }
 
-    void onPreDraw() SK_OVERRIDE {
-        fContext.reset(GrContext::CreateMockContext());
-        if (!fContext) {
+    virtual void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+        SkAutoTUnref<GrContext> context(GrContext::CreateMockContext());
+        if (NULL == context) {
             return;
         }
         // Set the cache budget to be very large so no purging occurs.
-        fContext->setResourceCacheLimits(CACHE_SIZE_COUNT, 1 << 30);
+        context->setResourceCacheLimits(2 * RESOURCE_COUNT, 1 << 30);
 
-        GrResourceCache2* cache2 = fContext->getResourceCache2();
+        GrResourceCache2* cache2 = context->getResourceCache2();
 
         // Make sure the cache is empty.
         cache2->purgeAllUnlocked();
         SkASSERT(0 == cache2->getResourceCount() && 0 == cache2->getResourceBytes());
 
-        GrGpu* gpu = fContext->getGpu();
+        GrGpu* gpu = context->getGpu();
 
-        populate_cache(gpu, CACHE_SIZE_COUNT);
-    }
+        populate_cache(gpu, RESOURCE_COUNT);
 
-    void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
-        if (!fContext) {
-            return;
-        }
-        GrResourceCache2* cache2 = fContext->getResourceCache2();
-        SkASSERT(CACHE_SIZE_COUNT == cache2->getResourceCount());
         for (int i = 0; i < loops; ++i) {
-            for (int k = 0; k < CACHE_SIZE_COUNT; ++k) {
-                GrResourceKey key = BenchResource::ComputeKey(k);
-                SkAutoTUnref<GrGpuResource> resource(cache2->findAndRefContentResource(key));
-                SkASSERT(resource);
+            for (int k = 0; k < RESOURCE_COUNT; ++k) {
+                check_cache_contents_or_die(cache2, k);
             }
         }
     }
 
 private:
-    SkAutoTUnref<GrContext> fContext;
     typedef Benchmark INHERITED;
 };