Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ahasher2 #2

Merged
merged 7 commits into from
Dec 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 31 additions & 2 deletions Benchmark/BenchmarkAHash.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
using BenchmarkDotNet.Attributes;
using BenchmarkDotNet.Diagnostics.Windows.Configs;
using BetterCollections.Cryptography;
#if NET8_0_OR_GREATER
using BetterCollections.Cryptography.AHasherImpl;
#endif

namespace Benchmark;

Expand All @@ -9,19 +12,45 @@ namespace Benchmark;
[DisassemblyDiagnoser]
public class BenchmarkAHash
{
private readonly AHasher AHasher = new();
private readonly AHasherLegacy aHasherLegacy = new();

[Benchmark]
public ulong AHash()
{
var r = 0ul;
for (int i = 0; i < 1000; i++)
{
r += AHasher.Hash((ulong)i);
r += aHasherLegacy.Hash((ulong)i);
}
return r;
}

#if NET8_0_OR_GREATER
[Benchmark]
public int AHash2()
{
var r = 0;
for (int i = 0; i < 1000; i++)
{
r += AHasher.Combine(i);
}
return r;
}

[Benchmark]
public int AHash3()
{
var r = 0;
for (int i = 0; i < 1000; i++)
{
var hasher = AesHasher.Create(AHasher.GlobalRandomState);
hasher = AesHasher.Add(hasher, i);
r += AesHasher.ToHashCode(hasher);
}
return r;
}
#endif

[Benchmark(Baseline = true)]
public int HashCodeCombine()
{
Expand Down
58 changes: 58 additions & 0 deletions Benchmark/BenchmarkAHashString.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
using System.Runtime.InteropServices;
using BenchmarkDotNet.Attributes;
using BenchmarkDotNet.Diagnostics.Windows.Configs;
using BetterCollections.Cryptography;
#if NET8_0_OR_GREATER
using BetterCollections.Cryptography.AHasherImpl;
#endif

namespace Benchmark;

[MemoryDiagnoser]
[JitStatsDiagnoser]
[DisassemblyDiagnoser]
public class BenchmarkAHashString
{
[Params("asd", "1234567890", "1234567890_1234567890_1234567890_1234567890",
"1234567890_1234567890_1234567890_1234567890_1234567890_1234567890_1234567890_1234567890")]
public string Str;

Check warning on line 18 in Benchmark/BenchmarkAHashString.cs

View workflow job for this annotation

GitHub Actions / build

Non-nullable field 'Str' must contain a non-null value when exiting constructor. Consider declaring the field as nullable.

Check warning on line 18 in Benchmark/BenchmarkAHashString.cs

View workflow job for this annotation

GitHub Actions / build

Non-nullable field 'Str' must contain a non-null value when exiting constructor. Consider declaring the field as nullable.

Check warning on line 18 in Benchmark/BenchmarkAHashString.cs

View workflow job for this annotation

GitHub Actions / build

Non-nullable field 'Str' must contain a non-null value when exiting constructor. Consider declaring the field as nullable.

Check warning on line 18 in Benchmark/BenchmarkAHashString.cs

View workflow job for this annotation

GitHub Actions / build

Non-nullable field 'Str' must contain a non-null value when exiting constructor. Consider declaring the field as nullable.

Check warning on line 18 in Benchmark/BenchmarkAHashString.cs

View workflow job for this annotation

GitHub Actions / build

Non-nullable field 'Str' must contain a non-null value when exiting constructor. Consider declaring the field as nullable.

Check warning on line 18 in Benchmark/BenchmarkAHashString.cs

View workflow job for this annotation

GitHub Actions / build

Non-nullable field 'Str' must contain a non-null value when exiting constructor. Consider declaring the field as nullable.

#if NET8_0_OR_GREATER
[Benchmark]
public int AHash_AddString_1()
{
var hasher = AHasher.Global;
hasher.AddString(Str);
return hasher.ToHashCode();
}

[Benchmark]
public int AHash_AddString_2()
{
var hasher = AesHasher.Create(AHasher.GlobalRandomState);
hasher = AesHasher.AddString(hasher, Str);
return AesHasher.ToHashCode(hasher);
}

[Benchmark]
public int Soft_AddString1()
{
var r = 0;
for (int i = 0; i < 1000; i++)
{
var hasher = SoftHasher.Create(AHasher.GlobalRandomState);
hasher = SoftHasher.AddString(hasher, Str);
r += SoftHasher.ToHashCode(hasher);
}
return r;
}
#endif

[Benchmark(Baseline = true)]
public int HashCode_AddBytes()
{
var hasher = new HashCode();
hasher.AddBytes(MemoryMarshal.AsBytes(Str.AsSpan()));
return hasher.ToHashCode();
}
}
216 changes: 216 additions & 0 deletions BetterCollections/Cryptography/AHasher/AHasher.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,216 @@
#if NET8_0_OR_GREATER
using System;
using System.Collections.Generic;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using BetterCollections.Cryptography.AHasherImpl;

namespace BetterCollections.Cryptography;

// reference https://github.com/tkaitchuck/aHash/tree/master

/// <summary>
/// A hasher that ensures even distribution of each bit
/// <para>If possible use Aes SIMD acceleration (.net7+)</para>
/// </summary>
public struct AHasher : IHasher
{
#region GlobalRandomState

public static AHasherRandomState GlobalRandomState
{
[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
get => _globalRandomState;
}

public static readonly AHasherRandomState _globalRandomState = GenerateRandomState();

[ThreadStatic]
private static AHasherRandomState _threadCurrentRandomState;
[ThreadStatic]
private static bool _threadCurrentHas;

public static AHasherRandomState ThreadCurrentRandomState
{
[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
get
{
if (!_threadCurrentHas)
{
_threadCurrentRandomState = GenerateRandomState();
_threadCurrentHas = true;
}
return _threadCurrentRandomState;
}
}

#endregion

#region RandomState

[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
public static AHasherRandomState GenerateRandomState()
{
var rand = Random.Shared;
Unsafe.SkipInit(out AHasherRandomState state);
rand.NextBytes(MemoryMarshal.Cast<ulong, byte>(state.UnsafeAsMutableSpan()));
return state;
}

#endregion


#region Create

public static AHasher Global
{
[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
get;
} = new(GlobalRandomState);

public static AHasher ThreadCurrent
{
[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
get;
} = new(ThreadCurrentRandomState);

[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
public static AHasher CreateRandom() => new(GenerateRandomState());

#endregion

#region Impl

private AHasher2Data data;

[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
public AHasher(AHasherRandomState randomState)
{
Unsafe.SkipInit(out this);
data = AesHasher.IsSupported ? AesHasher.Create(randomState) : SoftHasher.Create(randomState);
}

#region IHasher

[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
public void Add(int value)
{
data = AesHasher.IsSupported ? AesHasher.Add(data, value) : SoftHasher.Add(data, value);
}

[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
public void Add(long value)
{
data = AesHasher.IsSupported ? AesHasher.Add(data, value) : SoftHasher.Add(data, value);
}

[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
public void Add<T>(T value)
{
data = AesHasher.IsSupported ? AesHasher.Add(data, value) : SoftHasher.Add(data, value);
}

[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
public void Add<T>(T value, IEqualityComparer<T>? comparer)
{
data = AesHasher.IsSupported ? AesHasher.Add(data, value, comparer) : SoftHasher.Add(data, value, comparer);
}

[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
public void AddBytes(ReadOnlySpan<byte> value)
{
data = AesHasher.IsSupported ? AesHasher.AddBytes(data, value) : SoftHasher.AddBytes(data, value);
}

[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
public void AddString(ReadOnlySpan<byte> value)
{
data = AesHasher.IsSupported ? AesHasher.AddString(data, value) : SoftHasher.AddString(data, value);
}

[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
public void AddString(ReadOnlySpan<char> value)
{
data = AesHasher.IsSupported ? AesHasher.AddString(data, value) : SoftHasher.AddString(data, value);
}

[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
public int ToHashCode() =>
AesHasher.IsSupported ? AesHasher.ToHashCode(data) : SoftHasher.ToHashCode(data);

[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
public long ToHashCodeLong() =>
AesHasher.IsSupported ? AesHasher.ToHashCodeLong(data) : SoftHasher.ToHashCodeLong(data);

#endregion

#endregion

#region Combine

[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
public static int Combine<T1>(T1 value1)
{
return AesHasher.IsSupported ? AesHasher.Combine(value1) : SoftHasher.Combine(value1);
}

[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
public static int Combine<T1, T2>(T1 value1, T2 value2)
{
return AesHasher.IsSupported ? AesHasher.Combine(value1, value2) : SoftHasher.Combine(value1, value2);
}

[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
public static int Combine<T1, T2, T3>(T1 value1, T2 value2, T3 value3)
{
return AesHasher.IsSupported
? AesHasher.Combine(value1, value2, value3)
: SoftHasher.Combine(value1, value2, value3);
}

[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
public static int Combine<T1, T2, T3, T4>(T1 value1, T2 value2, T3 value3, T4 value4)
{
return AesHasher.IsSupported
? AesHasher.Combine(value1, value2, value3, value4)
: SoftHasher.Combine(value1, value2, value3, value4);
}

[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
public static int Combine<T1, T2, T3, T4, T5>(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5)
{
return AesHasher.IsSupported
? AesHasher.Combine(value1, value2, value3, value4, value5)
: SoftHasher.Combine(value1, value2, value3, value4, value5);
}

[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
public static int Combine<T1, T2, T3, T4, T5, T6>(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5, T6 value6)
{
return AesHasher.IsSupported
? AesHasher.Combine(value1, value2, value3, value4, value5, value6)
: SoftHasher.Combine(value1, value2, value3, value4, value5, value6);
}

[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
public static int Combine<T1, T2, T3, T4, T5, T6, T7>(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5,
T6 value6, T7 value7)
{
return AesHasher.IsSupported
? AesHasher.Combine(value1, value2, value3, value4, value5, value6, value7)
: SoftHasher.Combine(value1, value2, value3, value4, value5, value6, value7);
}

[MethodImpl(MethodImplOptions.AggressiveInlining), SkipLocalsInit]
public static int Combine<T1, T2, T3, T4, T5, T6, T7, T8>(T1 value1, T2 value2, T3 value3, T4 value4, T5 value5,
T6 value6, T7 value7, T8 value8)
{
return AesHasher.IsSupported
? AesHasher.Combine(value1, value2, value3, value4, value5, value6, value7, value8)
: SoftHasher.Combine(value1, value2, value3, value4, value5, value6, value7, value8);
}

#endregion
}

#endif
Loading