Added MurmurHash3.

This commit is contained in:
Бранимир Караџић
2023-10-21 11:07:25 -07:00
parent 97332257ff
commit ac1401faad
4 changed files with 339 additions and 92 deletions

View File

@@ -32,22 +32,23 @@ struct HashTest
uint32_t crc32[bx::HashCrc32::Count];
uint32_t adler32;
uint32_t murmur2a;
uint32_t murmur3;
const char* input;
};
const HashTest s_hashTest[] =
{
// Crc32 | Adler32 | Murmur2A | Input
// Ieee Castagnoli Koopman | | |
{ { 0, 0, 0 }, 1, 0, "" },
{ { 0xe8b7be43, 0xc1d04330, 0x0da2aa8a }, 0x00620062, 0x0803888b, "a" },
{ { 0x9e83486d, 0xe2a22936, 0x31ec935a }, 0x012600c4, 0x618515af, "ab" },
{ { 0xc340daab, 0x49e1b6e3, 0x945a1e78 }, 0x06060205, 0x94e3dc4d, "abvgd" },
{ { 0x07642fe2, 0x45a04162, 0x3d4bf72d }, 0x020a00d6, 0xe602fc07, "1389" },
{ { 0x26d75737, 0xb73d7b80, 0xd524eb40 }, 0x04530139, 0x58d37863, "555333" },
// Crc32 | Adler32 | Murmur2A | Murmur3 | Input
// Ieee Castagnoli Koopman | | | |
{ { 0, 0, 0 }, 1, 0, 0, "" },
{ { 0xe8b7be43, 0xc1d04330, 0x0da2aa8a }, 0x00620062, 0x0803888b, 0x3c2569b2, "a" },
{ { 0x9e83486d, 0xe2a22936, 0x31ec935a }, 0x012600c4, 0x618515af, 0x9bbfd75f, "ab" },
{ { 0xc340daab, 0x49e1b6e3, 0x945a1e78 }, 0x06060205, 0x94e3dc4d, 0x1e661875, "abvgd" },
{ { 0x07642fe2, 0x45a04162, 0x3d4bf72d }, 0x020a00d6, 0xe602fc07, 0x7af40d31, "1389" },
{ { 0x26d75737, 0xb73d7b80, 0xd524eb40 }, 0x04530139, 0x58d37863, 0x0c090160, "555333" },
};
TEST_CASE("HashCrc32", "")
TEST_CASE("HashCrc32", "[hash]")
{
#if 0
makeCrcTable(0xedb88320);
@@ -71,7 +72,7 @@ TEST_CASE("HashCrc32", "")
}
}
TEST_CASE("HashAdler32", "")
TEST_CASE("HashAdler32", "[hash]")
{
for (uint32_t ii = 0; ii < BX_COUNTOF(s_hashTest); ++ii)
{
@@ -84,6 +85,9 @@ TEST_CASE("HashAdler32", "")
}
}
namespace
{
/*-----------------------------------------------------------------------------
// MurmurHash2A, by Austin Appleby
//
@@ -96,8 +100,6 @@ TEST_CASE("HashAdler32", "")
// more amenable to incremental implementations.
*/
#define mmix(h,k) { k *= m; k ^= k >> r; k *= m; h *= m; h ^= k; }
uint32_t MurmurHash2A(const void * key, int len, uint32_t seed = 0)
{
const uint32_t m = 0x5bd1e995;
@@ -108,6 +110,8 @@ uint32_t MurmurHash2A(const void * key, int len, uint32_t seed = 0)
uint32_t h = seed;
#define mmix(h,k) { k *= m; k ^= k >> r; k *= m; h *= m; h ^= k; }
while(len >= 4)
{
uint32_t k = *(uint32_t*)data;
@@ -130,6 +134,8 @@ uint32_t MurmurHash2A(const void * key, int len, uint32_t seed = 0)
mmix(h,t);
mmix(h,l);
#undef mmix
h ^= h >> 13;
h *= m;
h ^= h >> 15;
@@ -137,7 +143,9 @@ uint32_t MurmurHash2A(const void * key, int len, uint32_t seed = 0)
return h;
}
TEST_CASE("HashMurmur2A", "")
} // namespace
TEST_CASE("HashMurmur2A", "[hash]")
{
uint32_t seed = 0;
@@ -154,11 +162,117 @@ TEST_CASE("HashMurmur2A", "")
}
}
TEST_CASE("HashMurmur2A-Separate-Add", "")
TEST_CASE("HashMurmur2A-Separate-Add", "[hash]")
{
bx::HashMurmur2A hash;
hash.begin();
hash.add("0123456789");
hash.add("abvgd012345");
REQUIRE(MurmurHash2A("0123456789abvgd012345", 21) == hash.end() );
hash.add("1389");
hash.add("555333");
REQUIRE(MurmurHash2A("0123456789abvgd0123451389555333", 31) == hash.end() );
}
namespace
{
BX_FORCE_INLINE uint32_t fmix32 ( uint32_t h )
{
h ^= h >> 16;
h *= 0x85ebca6b;
h ^= h >> 13;
h *= 0xc2b2ae35;
h ^= h >> 16;
return h;
}
inline uint32_t rotl32 ( uint32_t x, int8_t r )
{
return (x << r) | (x >> (32 - r));
}
uint32_t MurmurHash3_x86_32(const void * key, int len, uint32_t seed)
{
const uint8_t * data = (const uint8_t*)key;
const int nblocks = len / 4;
uint32_t h1 = seed;
const uint32_t c1 = 0xcc9e2d51;
const uint32_t c2 = 0x1b873593;
//----------
// body
const uint32_t * blocks = (const uint32_t *)(data + nblocks*4);
for(int i = -nblocks; i; i++)
{
uint32_t k1 = blocks[i];
k1 *= c1;
k1 = rotl32(k1,15);
k1 *= c2;
h1 ^= k1;
h1 = rotl32(h1,13);
h1 = h1*5+0xe6546b64;
}
//----------
// tail
const uint8_t * tail = (const uint8_t*)(data + nblocks*4);
uint32_t k1 = 0;
switch(len & 3)
{
case 3: k1 ^= tail[2] << 16; BX_FALLTHROUGH;
case 2: k1 ^= tail[1] << 8; BX_FALLTHROUGH;
case 1: k1 ^= tail[0];
k1 *= c1; k1 = rotl32(k1,15); k1 *= c2; h1 ^= k1;
};
//----------
// finalization
h1 ^= len;
h1 = fmix32(h1);
return h1;
}
} // namespace
TEST_CASE("HashMurmur3", "[hash]")
{
uint32_t seed = 0;
for (uint32_t ii = 0; ii < BX_COUNTOF(s_hashTest); ++ii)
{
const HashTest& test = s_hashTest[ii];
bx::HashMurmur3 hash;
hash.begin(seed);
hash.add(test.input, bx::strLen(test.input) );
const uint32_t result = hash.end();
const uint32_t sanity = MurmurHash3_x86_32(test.input, bx::strLen(test.input), seed);
REQUIRE(test.murmur3 == result);
REQUIRE(test.murmur3 == sanity);
}
}
TEST_CASE("HashMurmur3-Separate-Add", "[hash]")
{
bx::HashMurmur3 hash;
hash.begin();
hash.add("0123456789");
hash.add("abvgd012345");
hash.add("1389");
hash.add("555333");
REQUIRE(MurmurHash3_x86_32("0123456789abvgd0123451389555333", 31, 0) == hash.end() );
}