jodyhash v6 result updates

darkk · Apr 18, 2023 · 805809e · 805809e
1 parent b1925fb
commit 805809e
Show file tree

Hide file tree

Showing 7 changed files with 920 additions and 934 deletions.
diff --git a/README.md b/README.md
@@ -88,8 +88,8 @@ SMhasher
 | [farsh64](doc/farsh64.txt)                    |     13742.68 |   114.13 | 331.15 (5) | 944 | insecure: AppendedZeroes, collisions+bias, MomentChi2, LongNeighbors |
 | [farsh128](doc/farsh128.txt)                  |      6915.41 |   234.60 | 401.77 (4) | 944 | insecure: AppendedZeroes, collisions+bias, permut,combin,2bytes,zeroes,PerlinNoise |
 | [farsh256](doc/farsh256.txt)                  |      3411.21 |   451.97 | 628.91 (3) | 944 | insecure: AppendedZeroes, collisions+bias, permut,combin,2bytes,zeroes,PerlinNoise |
-| [jodyhash32](doc/jodyhash32.txt)              |      1758.56 |    41.88 | 249.24 (5) | 102 | bias, collisions, distr, BIC LongNeighbors |
-| [jodyhash64](doc/jodyhash64.txt)              |      3482.23 |    30.03 | 244.51 (6) | 118 | bias, collisions, distr, BIC, LongNeighbors |
+| [jodyhash32](doc/jodyhash32.txt)              |      1740.84 |    42.30 | 266.04 (19)| 102 | bias, collisions, distr, BIC LongNeighbors |
+| [jodyhash64](doc/jodyhash64.txt)              |      1572.69 |    28.57 | 227.79 (8) | 118 | bias, collisions, distr, BIC, LongNeighbors |
 | [lookup3](doc/lookup3.txt)                    |      2467.12 |    39.90 | 247.48 (6) | 341 | UB, 28% bias, collisions, 30% distr, BIC  |
 | [superfast](doc/superfast.txt)                |      2062.25 |    49.52 | 247.20 (4) | 210 | UB, bad seed 0, 91% bias, 5273.01x collisions, 37% distr, BIC |
 | [MurmurOAAT](doc/MurmurOAAT.txt)              |       507.14 |   103.15 | 246.66 (6) |  47 | bad seed 0, collisions, 99.998% distr., BIC, LongNeighbors |

diff --git a/doc/jodyhash32.txt b/doc/jodyhash32.txt
diff --git a/doc/jodyhash64.txt b/doc/jodyhash64.txt
diff --git a/doc/ryzen3.html b/doc/ryzen3.html
@@ -657,17 +657,17 @@ <h1 id="smhasher">SMhasher</h1>
 </tr>
 <tr class="poor">
 <td align="left"><a href="jodyhash32.txt">jodyhash32</a></td>
-<td align="right">2200.53</td>
-<td align="right">33.68</td>
-<td align="right">457.88 (2)</td>
+<td align="right">2168.74</td>
+<td align="right">33.57</td>
+<td align="right">530.77 (15)</td>
 <td align="right">102</td>
 <td align="left">bias, collisions, distr, LongNeighbors</td>
 </tr>
 <tr class="poor">
 <td align="left"><a href="jodyhash64.txt">jodyhash64</a></td>
-<td align="right">4400.35</td>
-<td align="right">23.08</td>
-<td align="right">418.87 (1)</td>
+<td align="right">1551.09</td>
+<td align="right">22.48</td>
+<td align="right">520.87 (13)</td>
 <td align="right">118</td>
 <td align="left">bias, collisions, distr, LongNeighbors</td>
 </tr>

diff --git a/doc/table.html b/doc/table.html
@@ -673,17 +673,17 @@ <h1 id="smhasher">SMhasher</h1>
 </tr>
 <tr class="poor">
 <td align="left"><a href="jodyhash32.txt">jodyhash32</a></td>
-<td align="right">1758.56</td>
-<td align="right">41.88</td>
-<td align="right">249.24 (5)</td>
+<td align="right">1740.84</td>
+<td align="right">42.30</td>
+<td align="right">266.04 (19)</td>
 <td align="right">102</td>
 <td align="left">bias, collisions, distr, LongNeighbors</td>
 </tr>
 <tr class="poor">
 <td align="left"><a href="jodyhash64.txt">jodyhash64</a></td>
-<td align="right">3482.23</td>
-<td align="right">30.03</td>
-<td align="right">244.51 (6)</td>
+<td align="right">1572.69</td>
+<td align="right">28.57</td>
+<td align="right">227.79 (8)</td>
 <td align="right">118</td>
 <td align="left">bias, collisions, distr, LongNeighbors</td>
 </tr>

diff --git a/main.cpp b/main.cpp
@@ -305,9 +305,9 @@ HashInfo g_hashes[] =
   { farsh128_test,       128, 0x82B6CBEC, "farsh128",    "FARSH 128bit", POOR, {} },
   { farsh256_test,       256, 0xFEBEA0BC, "farsh256",    "FARSH 256bit", POOR, {} },
 #endif
-  { jodyhash32_test,      32, 0xA2AEFC60, "jodyhash32",  "jodyhash, 32-bit (v5)", POOR, {} },
+  { jodyhash32_test,      32, 0xA2AEFC60, "jodyhash32",  "jodyhash, 32-bit (v6)", POOR, {} },
 #ifdef HAVE_INT64
-  { jodyhash64_test,      64, 0x68AA2026, "jodyhash64",  "jodyhash, 64-bit (v5)", POOR, {} },
+  { jodyhash64_test,      64, 0x68AA2026, "jodyhash64",  "jodyhash, 64-bit (v6)", POOR, {} },
 #endif
   { lookup3_test,         32, 0x3D83917A, "lookup3",     "Bob Jenkins' lookup3", POOR, {0x21524101} /* !! */},
 #ifdef __aarch64__

diff --git a/testall.sh b/testall.sh
@@ -7,7 +7,7 @@ if [ -z "$@" ]; then
     test -f log.hashes && mv log.hashes log.hashes.bak
     (for g in `build/SMHasher --listnames`; do build/SMHasher $g | tee doc/$g.txt; done) | tee log.hashes
 else
-    for g in `build/SMHasher --listnames | egrep "$@"`; do
+    for g in $@; do
         build/SMHasher $g | tee doc/$g.txt
         ./speed.pl doc/$g.txt && \
             ./fixupdocspeeds.pl doc/$g.txt