Skip to content

Commit

Permalink
WIP add aesni-hash-peterrk from smhasher3
Browse files Browse the repository at this point in the history
  • Loading branch information
rurban committed Dec 14, 2024
1 parent a4e9b25 commit 29fc1dd
Show file tree
Hide file tree
Showing 12 changed files with 233 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,6 @@ add_library(
beamsplitter.cpp
discohash_512.cpp
xxhash.c
${GX_SRC}
metrohash/metrohash64.cpp
metrohash/metrohash128.cpp
cmetrohash64.c
Expand All @@ -711,6 +710,7 @@ add_library(
# ${FHTW_OBJ}
${T1HA_SRC}
${SHA_SRC}
${GX_SRC}
mum.cc
jody_hash32.c
jody_hash64.c
Expand Down
2 changes: 2 additions & 0 deletions Hashes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1365,3 +1365,5 @@ void polymur_test ( const void *key, int len, uint32_t seed, void *out) {
*(uint64_t*)out = polymur_hash((const uint8_t*)key, (size_t)len, &g_polymurhashparams,
(uint64_t)seed);
}

#include "aesnihash-peterrk.hpp"
1 change: 1 addition & 0 deletions Hashes.h
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,7 @@ inline void t1ha0_ia32aes_noavx_test(const void * key, int len, uint32_t seed, v
// objsize 0-39d: 925
*(uint64_t*)out = t1ha0_ia32aes_noavx(key, len, seed);
}
void aesnihash_peterrk(const void * in, int len0, uint32_t seed, void * out);
#endif
#if defined(__AVX__)
inline void t1ha0_ia32aes_avx1_test(const void * key, int len, uint32_t seed, void * out)
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ SMhasher
| [t1ha2_stream](doc/t1ha2_stream.txt) | 13673.22 | 81.12 | 263.88 (3) |1665 | Sparse, Permutation, LongNeighbors |
| [t1ha2_stream128](doc/t1ha2_stream128.txt) | 13913.43 | 94.60 | 296.15 (4) |1665 | Sparse, Permutation, LongNeighbors |
| [aesnihash](doc/aesnihash.txt) | 5365.60 | 57.21 | 255.87 (3) |1209 | fails many tests, machine-specific (x64 AES-NI) |
| [aesni-hash-peterrk](doc/aesni-hash-peterrk.txt)| 29107.73 | 28.86 | 217.57 (1) | | fails many tests, machine-specific (x64 AES-NI) |
| [falkhash](doc/falkhash.txt) | 52401.48 | 122.70 | 316.79 (4) | 264 | Sparse, LongNeighbors, machine-specific (x64 AES-NI) |
| [MeowHash](doc/MeowHash.txt) | 29969.81 | 64.90 | 273.79 (8) |1764 | Sparse, invertible, machine-specific (x64 AES-NI) |
| [MeowHash64low](doc/MeowHash64low.txt) | 29438.45 | 63.76 | 269.41 (4) |1764 | Sparse, invertible, machine-specific (x64 AES-NI) |
Expand Down
189 changes: 189 additions & 0 deletions aesnihash-peterrk.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
/*
* aesnihash from the PageBloomFilter project
* Copyright (C) 2023 Frank J. T. Wojcik
* Copyright (C) 2023 Ruan Kunliang
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
*
* 3. Neither the name of the copyright holder nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "Platform.h"

#if defined(HAVE_AESNI)
#include <immintrin.h>

void aesnihash_peterrk(const void * in, int len0, uint32_t seed, void * out) {
auto a = _mm_set1_epi32((uint32_t)seed);
auto b = _mm_set1_epi32((uint32_t)len0);
auto m = _mm_set_epi32(0xdeadbeef, 0xffff0000, 0x01234567, 0x89abcdef);
auto s = _mm_set_epi8(3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12);
const uint8_t * msg = (const uint8_t *)in;
uint32_t len = (uint32_t)len0;

bool greed = (((uintptr_t)msg + (len - 1)) & UINT64_C(0xfff)) >= 15; // do not cross page

if (len > 80) {
auto c = _mm_aesenc_si128(b, m);
auto d = _mm_aesdec_si128(a, m);
a = _mm_aesenc_si128(a, m);
b = _mm_aesdec_si128(b, m);
do {
a = _mm_xor_si128(a, _mm_lddqu_si128((const __m128i *)msg));
b = _mm_xor_si128(b, _mm_lddqu_si128((const __m128i *)(msg + 16)));
c = _mm_xor_si128(c, _mm_lddqu_si128((const __m128i *)(msg + 32)));
d = _mm_xor_si128(d, _mm_lddqu_si128((const __m128i *)(msg + 48)));
a = _mm_shuffle_epi8(_mm_aesenc_si128(a, m), s);
b = _mm_shuffle_epi8(_mm_aesdec_si128(b, m), s);
c = _mm_shuffle_epi8(_mm_aesenc_si128(c, m), s);
d = _mm_shuffle_epi8(_mm_aesdec_si128(d, m), s);
msg += 64;
len -= 64;
} while (len > 80);
c = _mm_aesenc_si128(a, c);
d = _mm_aesdec_si128(b, d);
a = _mm_aesenc_si128(c, d);
b = _mm_aesdec_si128(d, c);
}

auto mix = [&a, &b, m, s]( __m128i x ) {
a = _mm_aesenc_si128(x, a);
a = _mm_aesenc_si128(a, m);
b = _mm_shuffle_epi8(_mm_xor_si128(x, b) , s);
b = _mm_shuffle_epi8(_mm_aesdec_si128(b, m), s);
};

while (len >= 16) {
mix(_mm_lddqu_si128((const __m128i *)msg));
msg += 16;
len -= 16;
}

if (greed) {
#define GREEDILY_READ(n, addr) \
_mm_bsrli_si128(_mm_bslli_si128(_mm_lddqu_si128((const __m128i*)addr), (16-(n))), (16-(n)))

switch (len) {
case 15: mix(GREEDILY_READ(15, msg)); break;
case 14: mix(GREEDILY_READ(14, msg)); break;
case 13: mix(GREEDILY_READ(13, msg)); break;
case 12: mix(GREEDILY_READ(12, msg)); break;
case 11: mix(GREEDILY_READ(11, msg)); break;
case 10: mix(GREEDILY_READ(10, msg)); break;
case 9: mix(GREEDILY_READ(9, msg)); break;
case 8: mix((__m128i)_mm_load_sd((const double *)msg)); break;
case 7: mix(GREEDILY_READ(7, msg)); break;
case 6: mix(GREEDILY_READ(6, msg)); break;
case 5: mix(GREEDILY_READ(5, msg)); break;
case 4: mix((__m128i)_mm_load_ss((const float *)msg)); break;
case 3: mix(GREEDILY_READ(3, msg)); break;
case 2: mix(GREEDILY_READ(2, msg)); break;
case 1: mix(GREEDILY_READ(1, msg)); break;
case 0:
default: // try to keep m & s from register spilling
a = _mm_add_epi8(a, s);
b = _mm_add_epi8(b, m);
}
#undef GREEDILY_READ
} else {
uint64_t x = 0;
switch (len) {
case 15:
x |= ((uint64_t)msg[14]) << 48U; //FALLTHROUGH
case 14:
x |= ((uint64_t)msg[13]) << 40U; //FALLTHROUGH
case 13:
x |= ((uint64_t)msg[12]) << 32U; //FALLTHROUGH
case 12:
x |= *(const uint32_t *)(msg + 8);
mix(_mm_set_epi64x(x, *(const uint64_t *)msg));
break;
case 11:
x |= ((uint32_t)msg[10]) << 16U; //FALLTHROUGH
case 10:
x |= ((uint32_t)msg[ 9]) << 8U; //FALLTHROUGH
case 9:
x |= msg[8]; //FALLTHROUGH
case 8:
mix(_mm_set_epi64x(x, *(const uint64_t *)msg));
break;
case 7:
x |= ((uint64_t)msg[6]) << 48U; //FALLTHROUGH
case 6:
x |= ((uint64_t)msg[5]) << 40U; //FALLTHROUGH
case 5:
x |= ((uint64_t)msg[4]) << 32U; //FALLTHROUGH
case 4:
x |= *(const uint32_t *)msg;
mix(_mm_set_epi64x(0, x));
break;
case 3:
x |= ((uint32_t)msg[2]) << 16U; //FALLTHROUGH
case 2:
x |= ((uint32_t)msg[1]) << 8U; //FALLTHROUGH
case 1:
x |= msg[0];
mix(_mm_set_epi64x(0, x));
break;
case 0:
default: // try to keep m & s from register spilling
a = _mm_add_epi8(a, s);
b = _mm_add_epi8(b, m);
}
}

_mm_storeu_si128((__m128i *)out, _mm_aesenc_si128(a, b));
}

#endif

#ifdef smhasher3
//------------------------------------------------------------
REGISTER_FAMILY(aesnihash_peterrk,
$.src_url = "https://github.com/PeterRK/PageBloomFilter/blob/main/src/aesni-hash.h",
$.src_status = HashFamilyInfo::SRC_ACTIVE
);

REGISTER_HASH(aesnihash_peterrk,
$.desc = "AESNI Hash by PeterRK",
$.impl = "aesni",
$.hash_flags =
FLAG_HASH_AES_BASED |
FLAG_HASH_SMALL_SEED |
FLAG_HASH_ENDIAN_INDEPENDENT,
$.impl_flags =
FLAG_IMPL_READ_PAST_EOB |
FLAG_IMPL_CANONICAL_BOTH |
FLAG_IMPL_LICENSE_BSD,
$.bits = 128,
$.verification_LE = 0xF06DA1B1,
$.verification_BE = 0xF06DA1B1,
$.hashfn_native = aesnihash_peterrk,
$.hashfn_bswap = aesnihash_peterrk
);
#endif
8 changes: 8 additions & 0 deletions doc/epyc.html
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,14 @@ <h1 id="smhasher">SMhasher</h1>
<td align="left">fails many tests, machine-specific (x64 AES-NI)</td>
</tr>
<tr class="poor">
<td align="left"><a href="aesni-hash-peterrk.txt">aesni-hash-peterrk</a></td>
<td align="right">28435.27</td>
<td align="right">28.83</td>
<td align="right">126.43 (2)</td>
<td align="right"></td>
<td align="left">fails many tests, machine-specific (x64 AES-NI)</td>
</tr>
<tr class="poor">
<td align="left"><a href="falkhash.txt">falkhash</a></td>
<td align="right">66674.45</td>
<td align="right">83.69</td>
Expand Down
8 changes: 8 additions & 0 deletions doc/i7.html
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,14 @@ <h1 id="smhasher">SMhasher</h1>
<td align="left">fails many tests, machine-specific (x64 AES-NI)</td>
</tr>
<tr class="poor">
<td align="left"><a href="aesni-hash-peterrk.txt">aesni-hash-peterrk</a></td>
<td align="right">32644.92</td>
<td align="right">22.28</td>
<td align="right">126.19 (3)</td>
<td align="right"></td>
<td align="left">fails many tests, machine-specific (x64 AES-NI)</td>
</tr>
<tr class="poor">
<td align="left"><a href="falkhash.txt">falkhash</a></td>
<td align="right">46580.43</td>
<td align="right">84.93</td>
Expand Down
8 changes: 8 additions & 0 deletions doc/ryzen3.html
Original file line number Diff line number Diff line change
Expand Up @@ -1016,6 +1016,14 @@ <h1 id="smhasher">SMhasher</h1>
<td align="left">fails many tests, machine-specific (x64 AES-NI)</td>
</tr>
<tr class="poor">
<td align="left"><a href="aesni-hash-peterrk.txt">aesni-hash-peterrk</a></td>
<td align="right">35244.97</td>
<td align="right">23.99</td>
<td align="right">481.13 (26)</td>
<td align="right"></td>
<td align="left">fails many tests, machine-specific (x64 AES-NI)</td>
</tr>
<tr class="poor">
<td align="left"><a href="falkhash.txt">falkhash</a></td>
<td align="right">62025.17</td>
<td align="right">128.28</td>
Expand Down
8 changes: 8 additions & 0 deletions doc/table.html
Original file line number Diff line number Diff line change
Expand Up @@ -1000,6 +1000,14 @@ <h1 id="smhasher">SMhasher</h1>
<td align="left">fails many tests, machine-specific (x64 AES-NI)</td>
</tr>
<tr class="poor">
<td align="left"><a href="aesni-hash-peterrk.txt">aesni-hash-peterrk</a></td>
<td align="right">29107.73</td>
<td align="right">28.86</td>
<td align="right">217.57 (1)</td>
<td align="right"></td>
<td align="left">fails many tests, machine-specific (x64 AES-NI)</td>
</tr>
<tr class="poor">
<td align="left"><a href="falkhash.txt">falkhash</a></td>
<td align="right">52401.48</td>
<td align="right">122.70</td>
Expand Down
2 changes: 1 addition & 1 deletion main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ HashInfo g_hashes[] =
#if defined(HAVE_SSE2) && defined(HAVE_AESNI) && !defined(_MSC_VER)
{ aesnihash_test, 64, 0xA68E0D42, "aesnihash", "majek's seeded aesnihash with aesenc, 64-bit for x64", POOR,
{0x70736575} },

{ aesnihash_peterrk, 128, 0xF06DA1B1, "aesni-hash-peterrk", "PeterRK's seeded aesnihash with aesenc, 128-bit for x64", POOR, {} },
{ aesni128_test, 128, 0xF06DA1B1, "aesni", "aesni 128bit", GOOD,{} },
{ aesni64_test, 64, 0x3AA1A480, "aesni-low","aesni 64bit", GOOD,{} },
#endif
Expand Down
10 changes: 5 additions & 5 deletions testspeed-i7.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
make -C build
./start-bench.sh
if [ -z "$1" ]; then
test -f log.speed-i7-6820 && mv log.speed-i7-6820 log.speed-i7-6820.bak
test -f log.speed-i7 && mv log.speed-i7 log.speed-i7.bak
(for g in `build/SMHasher --listnames`; do \
build/SMHasher --test=Speed,Hashmap $g 2>&1; done) | tee log.speed-i7-6820
./speed.pl -h=doc/i7 log.speed-i7-6820
build/SMHasher --test=Speed,Hashmap $g 2>&1; done) | tee log.speed-i7
./speed.pl -h=doc/i7 log.speed-i7
else
for g in `build/SMHasher --listnames`; do
for p in $@; do
if [[ $g =~ $p.* ]]; then
build/SMHasher --test=Speed,Hashmap $g 2>&1
fi
done
done | tee "log.speed-i7-6820-$1"
./speed.pl -h=doc/i7 "log.speed-i7-6820-$1"
done | tee "log.speed-i7-$1"
./speed.pl -h=doc/i7 "log.speed-i7-$1"
fi
./stop-bench.sh
2 changes: 1 addition & 1 deletion testspeed.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
hname="`hostname`"
if [ x$hname = xe495 ]; then
if [ x$hname = xe495-reini ] || [ x$hname = xe495 ]; then
./testspeed-ryzen3.sh $@
exit
fi
Expand Down

0 comments on commit 29fc1dd

Please sign in to comment.