summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-05-15Merge from Chromium at DEPS revision r200144android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-cts-releasekitkat-cts-devTorne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I2afcdc01d55e6ea26ef1e5786baa671efae8164f
2013-05-13Merge third_party/smhasher/src from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/smhasher.git at 6f63a4882e6b2cf87e8eec1a3ef8644e0d963283 This commit was generated by merge_from_chromium.py. Change-Id: Iad27471ee24ed16659190bc72ebb1f10748a990c
2013-05-10Add required 'inline' keyword to FORCE_INLINE macros.tanjent@gmail.com
git-svn-id: http://smhasher.googlecode.com/svn/trunk@149 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2013-05-09Merge from Chromium at DEPS revision r198571Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I44585d5d2c69fb28fb8907c2d5eb61016187472f
2013-04-22Merge third_party/smhasher/src from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/smhasher.git at 8adb1336422e3ad4d78ba54fb56692f2ed07124c This commit was generated by merge_from_chromium.py. Change-Id: I48bddcadccb4817edd8a80498e7f4d7ead9efeae
2013-04-19City.cpp/h was using the _mm_crc32_u64 intrinsic, which is only supported on ↵tanjent@gmail.com
x64 platforms - see https://bugs.gentoo.org/show_bug.cgi?id=459126 for details. git-svn-id: http://smhasher.googlecode.com/svn/trunk@148 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2013-03-28Merge from Chromium at DEPS revision r190564Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I20a54b5e45485697d76d5c01fb80a594dbcd44c5
2012-11-16Merge third_party/smhasher/src from ↵Torne (Richard Coles)
http://git.chromium.org/external/smhasher.git at e813f9b95be7adad5a2e441f4484278c453e5261 This commit was generated by merge_from_chromium.py. Change-Id: I8e7730921277cfe612e33ed76d46df6669469078
2012-10-08Merge third_party/smhasher/src from ↵Torne (Richard Coles)
http://git.chromium.org/external/smhasher.git at 6895dced6534c9a041ceba5cabed231d3b2d8518 This commit was generated by merge-from-chromium.py. Change-Id: I8aa753d00542890bb4efe5bc2635f7e04213b9a1
2012-10-03Initial empty repositoryChad Jones
2012-05-11Minor fixes & tweaks.tanjent@gmail.com
git-svn-id: http://smhasher.googlecode.com/svn/trunk@147 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2012-05-11Merge in PMurHash by Shane Day, a MurmurHash3_x86_32 implementation that ↵tanjent@gmail.com
should work on virtually all platforms regardless of endian-ness or alignment issues. git-svn-id: http://smhasher.googlecode.com/svn/trunk@146 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2012-03-01Add #include "Platform.h" to fix Windows buildtanjent@gmail.com
remove CXX_FLAGS, which make Visual Studio complain Widen sanity test out of paranoia. Fix typo in g_hashes reference to SpookyHash Remove Visual Studio-specific .sln & .vcproj files git-svn-id: http://smhasher.googlecode.com/svn/trunk@145 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2012-03-01Merge branch chandlerc_devtanjent@gmail.com
git-svn-id: http://smhasher.googlecode.com/svn/trunk@144 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-05-20Fix typo in rotation constant for Murmur3_x86_32's tail, update verification ↵tanjent@gmail.com
value. git-svn-id: http://smhasher.googlecode.com/svn/trunk@136 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-13more size_t warningstanjent@gmail.com
git-svn-id: http://smhasher.googlecode.com/svn/trunk@135 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-13and fix corresponding build breakages under Windowstanjent@gmail.com
git-svn-id: http://smhasher.googlecode.com/svn/trunk@134 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-13Enable all gcc warnings except strict aliasing, fix build issuesaappleby@google.com
git-svn-id: http://smhasher.googlecode.com/svn/trunk@133 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-12Add Google's open-source CityHashtanjent@gmail.com
Fix build breakage on Cygwin git-svn-id: http://smhasher.googlecode.com/svn/trunk@132 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-11Make verification failure print the hash namestanjent@gmail.com
Fix typo in murmur3f (rotl values didn't match) git-svn-id: http://smhasher.googlecode.com/svn/trunk@131 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-08Fix typosaappleby@google.com
git-svn-id: http://smhasher.googlecode.com/svn/trunk@130 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-08Remove dead files, make Murmur1/2/3 all have explicit public domain ↵aappleby@google.com
licensing & no external dependencies git-svn-id: http://smhasher.googlecode.com/svn/trunk@129 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-08Build fixes for clang, etcaappleby@google.com
git-svn-id: http://smhasher.googlecode.com/svn/trunk@128 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-08gcc complains about multiply defined symbols, move rotl macros back to ↵aappleby@google.com
source file git-svn-id: http://smhasher.googlecode.com/svn/trunk@127 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-08Remove platform.h dependency from MurmurHash3.h, move platform #ifdefs to headertanjent@gmail.com
git-svn-id: http://smhasher.googlecode.com/svn/trunk@126 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-05make murmurhash3 compile standalone on Visual Studiotanjent@gmail.com
make speedtest allocate 256-byte aligned blocks git-svn-id: http://smhasher.googlecode.com/svn/trunk@125 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-05Make MurmurHash3.cpp compile standalone on GCCaappleby@google.com
git-svn-id: http://smhasher.googlecode.com/svn/trunk@124 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-04Add CPU affinity to gcc buildaappleby@google.com
git-svn-id: http://smhasher.googlecode.com/svn/trunk@123 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-04fix cpu affinity masktanjent@gmail.com
git-svn-id: http://smhasher.googlecode.com/svn/trunk@122 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-04and of course gcc complains about missing "typename" specifier and missing ↵aappleby@google.com
typecasts git-svn-id: http://smhasher.googlecode.com/svn/trunk@121 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-04some test code for collision reportingtanjent@gmail.com
cleanup murmur3, fix len-collision issue make main thread high priority on windows fix missing typecast in SpeedTest.cpp, increase bulk speed test reps remove reference to old file git-svn-id: http://smhasher.googlecode.com/svn/trunk@120 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-04Add improved timing code that attempts to filter out spurious timing resultsaappleby@google.com
git-svn-id: http://smhasher.googlecode.com/svn/trunk@119 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-04Add #include <stdio.h> to Types.cppaappleby@google.com
git-svn-id: http://smhasher.googlecode.com/svn/trunk@118 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-03Final final final Murmur3, all variants. I am tired of working on it. :)tanjent@gmail.com
Unified, simplified, optimized implementation that works well on all platforms and is easy to extend to larger/smaller hash sizes and streaming implementations if needed. git-svn-id: http://smhasher.googlecode.com/svn/trunk@107 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-02faster bmix64, 7.5 gigs/sec, passes all teststanjent@gmail.com
make speed test do more reps git-svn-id: http://smhasher.googlecode.com/svn/trunk@106 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-01Fix self-test valuestanjent@gmail.com
Remove reference to experiments.cpp git-svn-id: http://smhasher.googlecode.com/svn/trunk@105 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-01simpler block mix for murmur3ctanjent@gmail.com
add mix-constant-generator code tweak constants for 3c and 3f git-svn-id: http://smhasher.googlecode.com/svn/trunk@104 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-01Add missing <memory.h> to fix gcc buildstanjent@gmail.com
git-svn-id: http://smhasher.googlecode.com/svn/trunk@103 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-04-01Tweak to Murmur3a (yeah, even though I said it was finalized...)tanjent@gmail.com
Added key-processing callback experiments, may move all keyset tests to use it git-svn-id: http://smhasher.googlecode.com/svn/trunk@102 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-03-31Add TwoBytes test (not on by default)tanjent@gmail.com
Remove hash list duplication from collision test so we don't use so much RAM git-svn-id: http://smhasher.googlecode.com/svn/trunk@101 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-03-28Add faster BICTest variantstanjent@gmail.com
Add simpler differential distribution test Add Crap8 hash for testing Include seed value in verification test Test Murmur3_x86_32 by default git-svn-id: http://smhasher.googlecode.com/svn/trunk@100 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-03-21verification code workaappleby@google.com
git-svn-id: http://smhasher.googlecode.com/svn/trunk@96 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-03-21Start work on verification codestanjent@gmail.com
git-svn-id: http://smhasher.googlecode.com/svn/trunk@95 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-03-20Remove stub filetanjent@gmail.com
git-svn-id: http://smhasher.googlecode.com/svn/trunk@94 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-03-20And add stdio.h so SuperFastHash has a reference to NULLtanjent@gmail.com
git-svn-id: http://smhasher.googlecode.com/svn/trunk@93 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-03-20Remove leftover references to pstdint.h that break Ubuntu buildtanjent@gmail.com
git-svn-id: http://smhasher.googlecode.com/svn/trunk@92 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-03-20Fix rdtsc errors from core hopping causing bad timing resultstanjent@gmail.com
git-svn-id: http://smhasher.googlecode.com/svn/trunk@91 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-03-19Add startup self-testtanjent@gmail.com
Remove randhash (will fail self-test) Remove QuickBrownFox (replaced by VerificationTest) De-tabulate all files git-svn-id: http://smhasher.googlecode.com/svn/trunk@90 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-03-19Fix x86_64 gcc 4.4.1 build errors:McKay.Davis@gmail.com
/smhasher/MurmurHash1.cpp: In function ‘unsigned int MurmurHash1Aligned(const void*, int, unsigned int)’: /smhasher/MurmurHash1.cpp:82: error: cast from ‘const unsigned char*’ to ‘int’ loses precision /smhasher/MurmurHash2.cpp: In function ‘uint32_t MurmurHashAligned2(const void*, int, uint32_t)’: /smhasher/MurmurHash2.cpp:382: error: cast from ‘const unsigned char*’ to ‘int’ loses precision git-svn-id: http://smhasher.googlecode.com/svn/trunk@89 77a7d1d3-4c08-bdc2-d393-d5859734b01a
2011-03-19Initial commit of CMake file. Builds SMHasherSupport lib and SMHasher ↵McKay.Davis@gmail.com
executable. git-svn-id: http://smhasher.googlecode.com/svn/trunk@88 77a7d1d3-4c08-bdc2-d393-d5859734b01a