Speed up GrResourceCache lookup by inlining GrBinHashKey comparisons

tests/GrUnitTests.cpp

Index: tests/GrUnitTests.cpp
diff --git a/src/gpu/gr_unittests.cpp b/tests/GrUnitTests.cpp
similarity index 64%
rename from src/gpu/gr_unittests.cpp
rename to tests/GrUnitTests.cpp
index ae9f67f28e4c68143bdf1d07c30f1cc922936308..f700a1aaed127e825e92324baba649d7d547cdc0 100644
--- a/src/gpu/gr_unittests.cpp
+++ b/tests/GrUnitTests.cpp
@@ -5,19 +5,19 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
+#include "Test.h"
+#include "TestClassDef.h"
 
+// This is a GPU-backend specific test
+#if SK_SUPPORT_GPU
 #include "GrBinHashKey.h"
 #include "GrDrawTarget.h"
 #include "SkMatrix.h"
 #include "GrRedBlackTree.h"
 
-// FIXME: needs to be in a header
-void gr_run_unittests();
-
 // If we aren't inheriting these as #defines from elsewhere,
 // clang demands they be declared before we #include the template
 // that relies on them.
-#ifdef SK_DEBUG
 static bool LT(const int& elem, int value) {
     return elem < value;
 }
@@ -26,7 +26,8 @@ static bool EQ(const int& elem, int value) {
 }
 #include "GrTBSearch.h"
 
-static void test_bsearch() {
+
+DEF_TEST(GrUnitTests_bsearch, reporter) {
     const int array[] = {
         1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 22, 33, 44, 55, 66, 77, 88, 99
     };
@@ -34,19 +35,14 @@ static void test_bsearch() {
     for (int n = 0; n < static_cast<int>(GR_ARRAY_COUNT(array)); ++n) {
         for (int i = 0; i < n; i++) {
             int index = GrTBSearch<int, int>(array, n, array[i]);
-            SkASSERT(index == (int) i);
+            REPORTER_ASSERT(reporter, index == (int) i);
             index = GrTBSearch<int, int>(array, n, -array[i]);
-            SkASSERT(index < 0);
+            REPORTER_ASSERT(reporter, index < 0);
         }
     }
 }
-#endif
 
-// bogus empty class for GrBinHashKey
-class BogusEntry {};
-
-static void test_binHashKey()
-{
+DEF_TEST(GrUnitTests_binHashKey, reporter) {
     const char* testStringA_ = "abcdABCD";
     const char* testStringB_ = "abcdBBCD";
     const uint32_t* testStringA = reinterpret_cast<const uint32_t*>(testStringA_);
@@ -55,26 +51,26 @@ static void test_binHashKey()
         kDataLenUsedForKey = 8
     };
 
-    GrTBinHashKey<BogusEntry, kDataLenUsedForKey> keyA;
+    GrBinHashKey<kDataLenUsedForKey> keyA;
     keyA.setKeyData(testStringA);
     // test copy constructor and comparison
-    GrTBinHashKey<BogusEntry, kDataLenUsedForKey> keyA2(keyA);
-    SkASSERT(keyA.compare(keyA2) == 0);
-    SkASSERT(keyA.getHash() == keyA2.getHash());
+    GrBinHashKey<kDataLenUsedForKey> keyA2(keyA);
+    REPORTER_ASSERT(reporter, keyA == keyA2);
+    REPORTER_ASSERT(reporter, keyA.getHash() == keyA2.getHash());
     // test re-init
     keyA2.setKeyData(testStringA);
-    SkASSERT(keyA.compare(keyA2) == 0);
-    SkASSERT(keyA.getHash() == keyA2.getHash());
+    REPORTER_ASSERT(reporter, keyA == keyA2);
+    REPORTER_ASSERT(reporter, keyA.getHash() == keyA2.getHash());
     // test sorting
-    GrTBinHashKey<BogusEntry, kDataLenUsedForKey> keyB;
+    GrBinHashKey<kDataLenUsedForKey> keyB;
     keyB.setKeyData(testStringB);
-    SkASSERT(keyA.compare(keyB) < 0);
-    SkASSERT(keyA.getHash() != keyB.getHash());
+    REPORTER_ASSERT(reporter, keyA < keyB);
+    REPORTER_ASSERT(reporter, keyA.getHash() != keyB.getHash());
 }
 
 
-void gr_run_unittests() {
-    SkDEBUGCODE(test_bsearch();)
-    test_binHashKey();
+DEF_TEST(GrUnitTests_redBlackTree, reporter) {
     GrRedBlackTree<int>::UnitTest();

[mtklein, 2013/11/27 14:36:54]

Can you add a little // TODO(mtklein): unwrap this and use reporter  ?

[Kimmo Kinnunen, 2013/11/28 07:38:34]

Done. (Though this TODO can be fixed also by removing the code altogether, since
it's dead code.)

 }
+
+#endif