Update komihash to v5.0

darkk · Jun 14, 2023 · 1cd6613 · 1cd6613
1 parent 22aaa2b
commit 1cd6613
Show file tree

Hide file tree

Showing 7 changed files with 576 additions and 565 deletions.
diff --git a/Hashes.h b/Hashes.h
@@ -1234,7 +1234,12 @@ inline void prvhash64s_128test ( const void * key, int len, unsigned seed, void
 // objsize: 188d0 - 18ba8: 728
 inline void komihash_test ( const void * key, int len, unsigned seed, void * out )
 {
-  *(uint64_t*)out = komihash ((const uint8_t *)key, len, (uint64_t)seed);
+#if 0
+  *(uint64_t*)out = komihash_stream_oneshot ((const uint8_t *)key, (const size_t)len,
+                                             (uint64_t)seed);
+#else
+  *(uint64_t*)out = komihash ((const uint8_t *)key, (size_t)len, (uint64_t)seed);
+#endif
 }
 
 // objsize: 408dd0 - 4090ae: 734

diff --git a/README.md b/README.md
@@ -209,7 +209,7 @@ SMhasher
 | [nmhash32x](doc/nmhash32x.txt)                |     12702.23 |    42.94 | 261.02 (5) |1494 |                            |
 | [k-hashv32](doc/k-hashv32.txt)                |      9044.40 |    53.38 | 259.25 (5) |1280 |                            |
 | [k-hashv64](doc/k-hashv32.txt)                |      7850.92 |    46.94 | 193.94 (1) |1279 |                            |
-| [komihash](doc/komihash.txt)                  |     12339.00 |    33.52 | 245.07 (4) | 728 |                            |
+| [komihash](doc/komihash.txt)                  |     12343.33 |    32.64 | 225.97 (2) | 728 |                            |
 
 The sortable table variants:
 

diff --git a/doc/i686.html b/doc/i686.html
@@ -961,9 +961,9 @@ <h1 id="smhasher">SMhasher</h1>
 </tr>
 <tr class="good">
 <td align="left"><a href="komihash.txt">komihash</a></td>
-<td align="right">1356.26</td>
-<td align="right">155.49</td>
-<td align="right">285.70 (1)</td>
+<td align="right">2116.01</td>
+<td align="right">138.11</td>
+<td align="right">315.80 (2)</td>
 <td align="right">2799</td>
 <td align="left"></td>
 </tr>

diff --git a/doc/komihash.txt b/doc/komihash.txt
diff --git a/doc/table.html b/doc/table.html
@@ -1673,9 +1673,9 @@ <h1 id="smhasher">SMhasher</h1>
 </tr>
 <tr class="good">
 <td align="left"><a href="komihash.txt">komihash</a></td>
-<td align="right">12339.00</td>
-<td align="right">33.52</td>
-<td align="right">245.07 (4)</td>
+<td align="right">12343.33</td>
+<td align="right">32.64</td>
+<td align="right">225.97 (2)</td>
 <td align="right">728</td>
 <td align="left"></td>
 </tr>

diff --git a/komihash b/komihash
diff --git a/main.cpp b/main.cpp
@@ -419,7 +419,7 @@ HashInfo g_hashes[] =
   { prvhash64s_64test,    64, 0x891521D6, "prvhash64s_64", "prvhash64s 4.3 64bit", GOOD, {} }, // seed changes
   { prvhash64s_128test,  128, 0x0199728A, "prvhash64s_128","prvhash64s 4.3 128bit", GOOD, {} }, // seed compiler-specific
 #endif
-  { komihash_test,        64, 0x703624A4, "komihash",      "komihash 4.5", GOOD, {} },
+  { komihash_test,        64, 0x8157FF6D, "komihash",      "komihash 5.0", GOOD, {} },
   // as in rust and swift:
   { siphash13_test,       64, 0x29C010BF, "SipHash13",   "SipHash 1-3 - SSSE3 optimized", GOOD, {} },
 #ifndef _MSC_VER