From 3c2d32b8e27820a6e149d9ded67cbdf2411cc5c9 Mon Sep 17 00:00:00 2001 From: mtklein Date: Mon, 16 Nov 2015 11:01:18 -0800 Subject: Revert of Switch uses of SkChecksum::Compute to Murmur3. (patchset #2 id:20001 of https://codereview.chromium.org/1436973003/ ) Reason for revert: gotta put back *compute = 0. Original issue's description: > Switch uses of SkChecksum::Compute to Murmur3. > > SkChecksum::Compute is a very, very poorly distributed hash function. > This replaces all remaining uses with Murmur3. > > The only interesting stuff is in src/gpu. > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/1d024a3c909ae5cefa5e8b339e2b52dc73ee85ac > > Committed: https://skia.googlesource.com/skia/+/540e95483d285b555e9b1a73d18c16e7d7c0deba TBR=bsalomon@google.com,mtklein@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1448023005 --- bench/ChecksumBench.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'bench/ChecksumBench.cpp') diff --git a/bench/ChecksumBench.cpp b/bench/ChecksumBench.cpp index 92e7da662f..a2c282435e 100644 --- a/bench/ChecksumBench.cpp +++ b/bench/ChecksumBench.cpp @@ -13,6 +13,7 @@ #include "SkTemplates.h" enum ChecksumType { + kChecksum_ChecksumType, kMD5_ChecksumType, kSHA1_ChecksumType, kMurmur3_ChecksumType, @@ -41,6 +42,7 @@ public: protected: const char* onGetName() override { switch (fType) { + case kChecksum_ChecksumType: return "compute_checksum"; case kMD5_ChecksumType: return "compute_md5"; case kSHA1_ChecksumType: return "compute_sha1"; case kMurmur3_ChecksumType: return "compute_murmur3"; @@ -51,6 +53,12 @@ protected: void onDraw(int loops, SkCanvas*) override { switch (fType) { + case kChecksum_ChecksumType: { + for (int i = 0; i < loops; i++) { + volatile uint32_t result = SkChecksum::Compute(fData, sizeof(fData)); + sk_ignore_unused_variable(result); + } + } break; case kMD5_ChecksumType: { for (int i = 0; i < loops; i++) { SkMD5 md5; @@ -83,6 +91,7 @@ private: /////////////////////////////////////////////////////////////////////////////// +DEF_BENCH( return new ComputeChecksumBench(kChecksum_ChecksumType); ) DEF_BENCH( return new ComputeChecksumBench(kMD5_ChecksumType); ) DEF_BENCH( return new ComputeChecksumBench(kSHA1_ChecksumType); ) DEF_BENCH( return new ComputeChecksumBench(kMurmur3_ChecksumType); ) -- cgit v1.2.3