rays/MurmurHash3PHP
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to revision 151 of MurmurHash3

Browse Source
This commit is contained in:
Matthew Crenshaw 2014-01-14 17:13:25 -05:00
parent 9528c230b5
commit df1bfadab7
2 changed files with 53 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
MurmurHash3.cpp
View File

@ -54,7 +54,7 @@
#else // defined(_MSC_VER) #else // defined(_MSC_VER)
#define FORCE_INLINE __attribute__((always_inline)) #define FORCE_INLINE inline __attribute__((always_inline))
inline uint32_t rotl32 ( uint32_t x, int8_t r ) inline uint32_t rotl32 ( uint32_t x, int8_t r )
{ {
@ -77,12 +77,12 @@ inline uint64_t rotl64 ( uint64_t x, int8_t r )
// Block read - if your platform needs to do endian-swapping or can only // Block read - if your platform needs to do endian-swapping or can only
// handle aligned reads, do the conversion here // handle aligned reads, do the conversion here
FORCE_INLINE uint32_t getblock ( const uint32_t * p, int i ) FORCE_INLINE uint32_t getblock32 ( const uint32_t * p, int i )
{ {
return p[i]; return p[i];
} }
FORCE_INLINE uint64_t getblock ( const uint64_t * p, int i ) FORCE_INLINE uint64_t getblock64 ( const uint64_t * p, int i )
{ {
return p[i]; return p[i];
} }
@ -90,7 +90,7 @@ FORCE_INLINE uint64_t getblock ( const uint64_t * p, int i )
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Finalization mix - force all bits of a hash block to avalanche // Finalization mix - force all bits of a hash block to avalanche
FORCE_INLINE uint32_t fmix ( uint32_t h ) FORCE_INLINE uint32_t fmix32 ( uint32_t h )
{ {
h ^= h >> 16; h ^= h >> 16;
h *= 0x85ebca6b; h *= 0x85ebca6b;
@ -103,7 +103,7 @@ FORCE_INLINE uint32_t fmix ( uint32_t h )
//---------- //----------
FORCE_INLINE uint64_t fmix ( uint64_t k ) FORCE_INLINE uint64_t fmix64 ( uint64_t k )
{ {
k ^= k >> 33; k ^= k >> 33;
k *= BIG_CONSTANT(0xff51afd7ed558ccd); k *= BIG_CONSTANT(0xff51afd7ed558ccd);
@ -124,8 +124,8 @@ void MurmurHash3_x86_32 ( const void * key, int len,
uint32_t h1 = seed; uint32_t h1 = seed;
uint32_t c1 = 0xcc9e2d51; const uint32_t c1 = 0xcc9e2d51;
uint32_t c2 = 0x1b873593; const uint32_t c2 = 0x1b873593;
//---------- //----------
// body // body
@ -134,7 +134,7 @@ void MurmurHash3_x86_32 ( const void * key, int len,
for(int i = -nblocks; i; i++) for(int i = -nblocks; i; i++)
{ {
uint32_t k1 = getblock(blocks,i); uint32_t k1 = getblock32(blocks,i);
k1 *= c1; k1 *= c1;
k1 = ROTL32(k1,15); k1 = ROTL32(k1,15);
@ -165,7 +165,7 @@ void MurmurHash3_x86_32 ( const void * key, int len,
h1 ^= len; h1 ^= len;
h1 = fmix(h1); h1 = fmix32(h1);
*(uint32_t*)out = h1; *(uint32_t*)out = h1;
} }
@ -183,10 +183,10 @@ void MurmurHash3_x86_128 ( const void * key, const int len,
uint32_t h3 = seed; uint32_t h3 = seed;
uint32_t h4 = seed; uint32_t h4 = seed;
uint32_t c1 = 0x239b961b; const uint32_t c1 = 0x239b961b;
uint32_t c2 = 0xab0e9789; const uint32_t c2 = 0xab0e9789;
uint32_t c3 = 0x38b34ae5; const uint32_t c3 = 0x38b34ae5;
uint32_t c4 = 0xa1e38b93; const uint32_t c4 = 0xa1e38b93;
//---------- //----------
// body // body
@ -195,10 +195,10 @@ void MurmurHash3_x86_128 ( const void * key, const int len,
for(int i = -nblocks; i; i++) for(int i = -nblocks; i; i++)
{ {
uint32_t k1 = getblock(blocks,i*4+0); uint32_t k1 = getblock32(blocks,i*4+0);
uint32_t k2 = getblock(blocks,i*4+1); uint32_t k2 = getblock32(blocks,i*4+1);
uint32_t k3 = getblock(blocks,i*4+2); uint32_t k3 = getblock32(blocks,i*4+2);
uint32_t k4 = getblock(blocks,i*4+3); uint32_t k4 = getblock32(blocks,i*4+3);
k1 *= c1; k1 = ROTL32(k1,15); k1 *= c2; h1 ^= k1; k1 *= c1; k1 = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
@ -261,10 +261,10 @@ void MurmurHash3_x86_128 ( const void * key, const int len,
h1 += h2; h1 += h3; h1 += h4; h1 += h2; h1 += h3; h1 += h4;
h2 += h1; h3 += h1; h4 += h1; h2 += h1; h3 += h1; h4 += h1;
h1 = fmix(h1); h1 = fmix32(h1);
h2 = fmix(h2); h2 = fmix32(h2);
h3 = fmix(h3); h3 = fmix32(h3);
h4 = fmix(h4); h4 = fmix32(h4);
h1 += h2; h1 += h3; h1 += h4; h1 += h2; h1 += h3; h1 += h4;
h2 += h1; h3 += h1; h4 += h1; h2 += h1; h3 += h1; h4 += h1;
@ -286,8 +286,8 @@ void MurmurHash3_x64_128 ( const void * key, const int len,
uint64_t h1 = seed; uint64_t h1 = seed;
uint64_t h2 = seed; uint64_t h2 = seed;
uint64_t c1 = BIG_CONSTANT(0x87c37b91114253d5); const uint64_t c1 = BIG_CONSTANT(0x87c37b91114253d5);
uint64_t c2 = BIG_CONSTANT(0x4cf5ad432745937f); const uint64_t c2 = BIG_CONSTANT(0x4cf5ad432745937f);
//---------- //----------
// body // body
@ -296,8 +296,8 @@ void MurmurHash3_x64_128 ( const void * key, const int len,
for(int i = 0; i < nblocks; i++) for(int i = 0; i < nblocks; i++)
{ {
uint64_t k1 = getblock(blocks,i*2+0); uint64_t k1 = getblock64(blocks,i*2+0);
uint64_t k2 = getblock(blocks,i*2+1); uint64_t k2 = getblock64(blocks,i*2+1);
k1 *= c1; k1 = ROTL64(k1,31); k1 *= c2; h1 ^= k1; k1 *= c1; k1 = ROTL64(k1,31); k1 *= c2; h1 ^= k1;
@ -318,23 +318,23 @@ void MurmurHash3_x64_128 ( const void * key, const int len,
switch(len & 15) switch(len & 15)
{ {
case 15: k2 ^= uint64_t(tail[14]) << 48; case 15: k2 ^= ((uint64_t)tail[14]) << 48;
case 14: k2 ^= uint64_t(tail[13]) << 40; case 14: k2 ^= ((uint64_t)tail[13]) << 40;
case 13: k2 ^= uint64_t(tail[12]) << 32; case 13: k2 ^= ((uint64_t)tail[12]) << 32;
case 12: k2 ^= uint64_t(tail[11]) << 24; case 12: k2 ^= ((uint64_t)tail[11]) << 24;
case 11: k2 ^= uint64_t(tail[10]) << 16; case 11: k2 ^= ((uint64_t)tail[10]) << 16;
case 10: k2 ^= uint64_t(tail[ 9]) << 8; case 10: k2 ^= ((uint64_t)tail[ 9]) << 8;
case 9: k2 ^= uint64_t(tail[ 8]) << 0; case 9: k2 ^= ((uint64_t)tail[ 8]) << 0;
k2 *= c2; k2 = ROTL64(k2,33); k2 *= c1; h2 ^= k2; k2 *= c2; k2 = ROTL64(k2,33); k2 *= c1; h2 ^= k2;
case 8: k1 ^= uint64_t(tail[ 7]) << 56; case 8: k1 ^= ((uint64_t)tail[ 7]) << 56;
case 7: k1 ^= uint64_t(tail[ 6]) << 48; case 7: k1 ^= ((uint64_t)tail[ 6]) << 48;
case 6: k1 ^= uint64_t(tail[ 5]) << 40; case 6: k1 ^= ((uint64_t)tail[ 5]) << 40;
case 5: k1 ^= uint64_t(tail[ 4]) << 32; case 5: k1 ^= ((uint64_t)tail[ 4]) << 32;
case 4: k1 ^= uint64_t(tail[ 3]) << 24; case 4: k1 ^= ((uint64_t)tail[ 3]) << 24;
case 3: k1 ^= uint64_t(tail[ 2]) << 16; case 3: k1 ^= ((uint64_t)tail[ 2]) << 16;
case 2: k1 ^= uint64_t(tail[ 1]) << 8; case 2: k1 ^= ((uint64_t)tail[ 1]) << 8;
case 1: k1 ^= uint64_t(tail[ 0]) << 0; case 1: k1 ^= ((uint64_t)tail[ 0]) << 0;
k1 *= c1; k1 = ROTL64(k1,31); k1 *= c2; h1 ^= k1; k1 *= c1; k1 = ROTL64(k1,31); k1 *= c2; h1 ^= k1;
}; };
@ -346,8 +346,8 @@ void MurmurHash3_x64_128 ( const void * key, const int len,
h1 += h2; h1 += h2;
h2 += h1; h2 += h1;
h1 = fmix(h1); h1 = fmix64(h1);
h2 = fmix(h2); h2 = fmix64(h2);
h1 += h2; h1 += h2;
h2 += h1; h2 += h1;
@ -358,3 +358,4 @@ void MurmurHash3_x64_128 ( const void * key, const int len,
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

8
MurmurHash3.h
View File

@ -35,19 +35,19 @@
// Microsoft Visual Studio // Microsoft Visual Studio
#if defined(_MSC_VER) #if defined(_MSC_VER) && (_MSC_VER < 1600)
typedef unsigned char uint8_t; typedef unsigned char uint8_t;
typedef unsigned long uint32_t; typedef unsigned int uint32_t;
typedef unsigned __int64 uint64_t; typedef unsigned __int64 uint64_t;
// Other compilers // Other compilers
#else // !defined(_MSC_VER) #else // defined(_MSC_VER)
#include <stdint.h> #include <stdint.h>
#endif #endif // !defined(_MSC_VER)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------