-
Notifications
You must be signed in to change notification settings - Fork 39
Optimize AVX intrinsics for .NET8 #597
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
Merged
Merged
Changes from 7 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
78dfea8
pot
bitfaster 91eb568
Merge branch 'main' into users/alexpeck/avx2
bitfaster 23584fe
Merge branch 'main' into users/alexpeck/avx2
bitfaster 2c52ed2
merge
139b77a
fix projs
d7935d2
test
bitfaster c7b361d
Merge branch 'users/alexpeck/avx2' of https://github.com/bitfaster/Bi…
bitfaster 560c6f2
opt
bitfaster 2c587a4
merge
ae1d567
512
bitfaster 5b73569
Merge branch 'users/alexpeck/avx2' of https://github.com/bitfaster/Bi…
bitfaster 91ee099
cleanup
d2b0bc1
params
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,353 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Diagnostics.CodeAnalysis; | ||
| using System.Linq; | ||
| using System.Runtime.CompilerServices; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
|
|
||
|
|
||
| #if NET6_0_OR_GREATER | ||
| using System.Runtime.Intrinsics; | ||
| using System.Runtime.Intrinsics.X86; | ||
| #endif | ||
|
|
||
| namespace BitFaster.Caching.Benchmarks.Lfu | ||
| { | ||
| public unsafe class CmSketchPinNoOpt<T, I> | ||
| where T : notnull | ||
| where I : struct, IsaProbe | ||
| { | ||
| private const long ResetMask = 0x7777777777777777L; | ||
| private const long OneMask = 0x1111111111111111L; | ||
|
|
||
| private long[] table; | ||
| #if NET6_0_OR_GREATER | ||
| private long* tableAddr; | ||
| #endif | ||
| private int sampleSize; | ||
| private int blockMask; | ||
| private int size; | ||
|
|
||
| private readonly IEqualityComparer<T> comparer; | ||
|
|
||
| /// <summary> | ||
| /// Initializes a new instance of the CmSketch class with the specified maximum size and equality comparer. | ||
| /// </summary> | ||
| /// <param name="maximumSize">The maximum size.</param> | ||
| /// <param name="comparer">The equality comparer.</param> | ||
| public CmSketchPinNoOpt(long maximumSize, IEqualityComparer<T> comparer) | ||
| { | ||
| EnsureCapacity(maximumSize); | ||
| this.comparer = comparer; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Gets the reset sample size. | ||
| /// </summary> | ||
| public int ResetSampleSize => this.sampleSize; | ||
|
|
||
| /// <summary> | ||
| /// Gets the size. | ||
| /// </summary> | ||
| public int Size => this.size; | ||
|
|
||
| /// <summary> | ||
| /// Estimate the frequency of the specified value, up to the maximum of 15. | ||
| /// </summary> | ||
| /// <param name="value">The value.</param> | ||
| /// <returns>The estimated frequency of the value.</returns> | ||
| public int EstimateFrequency(T value) | ||
| { | ||
| #if NET48 | ||
| return EstimateFrequencyStd(value); | ||
| #else | ||
|
|
||
| I isa = default; | ||
|
|
||
| if (isa.IsAvx2Supported) | ||
| { | ||
| return EstimateFrequencyAvx(value); | ||
| } | ||
| else | ||
| { | ||
| return EstimateFrequencyStd(value); | ||
| } | ||
| #endif | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Increment the count of the specified value. | ||
| /// </summary> | ||
| /// <param name="value">The value.</param> | ||
| public void Increment(T value) | ||
| { | ||
| #if NET48 | ||
| IncrementStd(value); | ||
| #else | ||
|
|
||
| I isa = default; | ||
|
|
||
| if (isa.IsAvx2Supported) | ||
| { | ||
| IncrementAvx(value); | ||
| } | ||
| else | ||
| { | ||
| IncrementStd(value); | ||
| } | ||
| #endif | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Clears the count for all items. | ||
| /// </summary> | ||
| public void Clear() | ||
| { | ||
| Array.Clear(table, 0, table.Length); | ||
| size = 0; | ||
| } | ||
|
|
||
| //[MemberNotNull(nameof(table))] | ||
| private void EnsureCapacity(long maximumSize) | ||
| { | ||
| int maximum = (int)Math.Min(maximumSize, int.MaxValue >> 1); | ||
|
|
||
| #if NET6_0_OR_GREATER | ||
| I isa = default; | ||
| if (isa.IsAvx2Supported) | ||
| { | ||
| // over alloc by 8 to give 64 bytes padding, tableAddr is then aligned to 64 bytes | ||
| const int pad = 8; | ||
| bool pinned = true; | ||
| table = GC.AllocateArray<long>(Math.Max(BitOps.CeilingPowerOfTwo(maximum), 8) + pad, pinned); | ||
|
|
||
| tableAddr = (long*)Unsafe.AsPointer(ref table[0]); | ||
| tableAddr = (long*)((long)tableAddr + (long)tableAddr % 64); | ||
|
|
||
| blockMask = (int)((uint)(table.Length - pad) >> 3) - 1; | ||
| } | ||
| else | ||
| #endif | ||
| { | ||
| table = new long[Math.Max(BitOps.CeilingPowerOfTwo(maximum), 8)]; | ||
| blockMask = (int)((uint)(table.Length) >> 3) - 1; | ||
| } | ||
|
|
||
| sampleSize = (maximumSize == 0) ? 10 : (10 * maximum); | ||
|
|
||
| size = 0; | ||
| } | ||
|
|
||
| private unsafe int EstimateFrequencyStd(T value) | ||
|
||
| { | ||
| var count = stackalloc int[4]; | ||
| int blockHash = Spread(comparer.GetHashCode(value)); | ||
| int counterHash = Rehash(blockHash); | ||
| int block = (blockHash & blockMask) << 3; | ||
|
|
||
| for (int i = 0; i < 4; i++) | ||
| { | ||
| int h = (int)((uint)counterHash >> (i << 3)); | ||
| int index = (h >> 1) & 15; | ||
| int offset = h & 1; | ||
| count[i] = (int)(((ulong)table[block + offset + (i << 1)] >> (index << 2)) & 0xfL); | ||
| } | ||
| return Math.Min(Math.Min(count[0], count[1]), Math.Min(count[2], count[3])); | ||
| } | ||
|
|
||
| private unsafe void IncrementStd(T value) | ||
|
||
| { | ||
| var index = stackalloc int[8]; | ||
| int blockHash = Spread(comparer.GetHashCode(value)); | ||
| int counterHash = Rehash(blockHash); | ||
| int block = (blockHash & blockMask) << 3; | ||
|
|
||
| for (int i = 0; i < 4; i++) | ||
| { | ||
| int h = (int)((uint)counterHash >> (i << 3)); | ||
| index[i] = (h >> 1) & 15; | ||
| int offset = h & 1; | ||
| index[i + 4] = block + offset + (i << 1); | ||
| } | ||
|
|
||
| bool added = | ||
| IncrementAt(index[4], index[0]) | ||
| | IncrementAt(index[5], index[1]) | ||
| | IncrementAt(index[6], index[2]) | ||
| | IncrementAt(index[7], index[3]); | ||
|
|
||
| if (added && (++size == sampleSize)) | ||
| { | ||
| Reset(); | ||
| } | ||
| } | ||
|
|
||
| // Applies another round of hashing for additional randomization. | ||
| private static int Rehash(int x) | ||
| { | ||
| x = (int)(x * 0x31848bab); | ||
| x ^= (int)((uint)x >> 14); | ||
| return x; | ||
| } | ||
|
|
||
| // Applies a supplemental hash function to defend against poor quality hash. | ||
| private static int Spread(int x) | ||
| { | ||
| x ^= (int)((uint)x >> 17); | ||
| x = (int)(x * 0xed5ad4bb); | ||
| x ^= (int)((uint)x >> 11); | ||
| x = (int)(x * 0xac4c1b51); | ||
| x ^= (int)((uint)x >> 15); | ||
| return x; | ||
| } | ||
|
|
||
| private bool IncrementAt(int i, int j) | ||
| { | ||
| int offset = j << 2; | ||
| long mask = (0xfL << offset); | ||
|
|
||
| if ((table[i] & mask) != mask) | ||
| { | ||
| table[i] += (1L << offset); | ||
| return true; | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| private void Reset() | ||
| { | ||
| // unroll, almost 2x faster | ||
| int count0 = 0; | ||
| int count1 = 0; | ||
| int count2 = 0; | ||
| int count3 = 0; | ||
|
|
||
| for (int i = 0; i < table.Length; i += 4) | ||
| { | ||
| count0 += BitOps.BitCount(table[i] & OneMask); | ||
| count1 += BitOps.BitCount(table[i + 1] & OneMask); | ||
| count2 += BitOps.BitCount(table[i + 2] & OneMask); | ||
| count3 += BitOps.BitCount(table[i + 3] & OneMask); | ||
|
|
||
| table[i] = (long)((ulong)table[i] >> 1) & ResetMask; | ||
| table[i + 1] = (long)((ulong)table[i + 1] >> 1) & ResetMask; | ||
| table[i + 2] = (long)((ulong)table[i + 2] >> 1) & ResetMask; | ||
| table[i + 3] = (long)((ulong)table[i + 3] >> 1) & ResetMask; | ||
| } | ||
|
|
||
| count0 = (count0 + count1) + (count2 + count3); | ||
|
|
||
| size = (size - (count0 >> 2)) >> 1; | ||
| } | ||
|
|
||
| #if NET6_0_OR_GREATER | ||
| private unsafe int EstimateFrequencyAvx(T value) | ||
|
||
| { | ||
| int blockHash = Spread(comparer.GetHashCode(value)); | ||
| int counterHash = Rehash(blockHash); | ||
| int block = (blockHash & blockMask) << 3; | ||
|
|
||
| Vector128<int> h = Vector128.Create(counterHash); | ||
| h = Avx2.ShiftRightLogicalVariable(h.AsUInt32(), Vector128.Create(0U, 8U, 16U, 24U)).AsInt32(); | ||
|
|
||
| var index = Avx2.ShiftRightLogical(h, 1); | ||
| index = Avx2.And(index, Vector128.Create(15)); // j - counter index | ||
| Vector128<int> offset = Avx2.And(h, Vector128.Create(1)); | ||
| Vector128<int> blockOffset = Avx2.Add(Vector128.Create(block), offset); // i - table index | ||
| blockOffset = Avx2.Add(blockOffset, Vector128.Create(0, 2, 4, 6)); // + (i << 1) | ||
|
|
||
| #if NET6_0_OR_GREATER | ||
| long* tablePtr = tableAddr; | ||
| #else | ||
| fixed (long* tablePtr = table) | ||
| #endif | ||
| { | ||
| Vector256<long> tableVector = Avx2.GatherVector256(tablePtr, blockOffset, 8); | ||
| index = Avx2.ShiftLeftLogical(index, 2); | ||
|
|
||
| // convert index from int to long via permute | ||
| Vector256<long> indexLong = Vector256.Create(index, Vector128<int>.Zero).AsInt64(); | ||
| Vector256<int> permuteMask2 = Vector256.Create(0, 4, 1, 5, 2, 5, 3, 7); | ||
| indexLong = Avx2.PermuteVar8x32(indexLong.AsInt32(), permuteMask2).AsInt64(); | ||
| tableVector = Avx2.ShiftRightLogicalVariable(tableVector, indexLong.AsUInt64()); | ||
| tableVector = Avx2.And(tableVector, Vector256.Create(0xfL)); | ||
|
|
||
| Vector256<int> permuteMask = Vector256.Create(0, 2, 4, 6, 1, 3, 5, 7); | ||
| Vector128<ushort> count = Avx2.PermuteVar8x32(tableVector.AsInt32(), permuteMask) | ||
| .GetLower() | ||
| .AsUInt16(); | ||
|
|
||
| // set the zeroed high parts of the long value to ushort.Max | ||
| #if NET6_0_OR_GREATER | ||
| count = Avx2.Blend(count, Vector128<ushort>.AllBitsSet, 0b10101010); | ||
| #else | ||
| count = Avx2.Blend(count, Vector128.Create(ushort.MaxValue), 0b10101010); | ||
| #endif | ||
|
|
||
| return Avx2.MinHorizontal(count).GetElement(0); | ||
| } | ||
| } | ||
|
|
||
| private unsafe void IncrementAvx(T value) | ||
|
||
| { | ||
| int blockHash = Spread(comparer.GetHashCode(value)); | ||
| int counterHash = Rehash(blockHash); | ||
| int block = (blockHash & blockMask) << 3; | ||
|
|
||
| Vector128<int> h = Vector128.Create(counterHash); | ||
| h = Avx2.ShiftRightLogicalVariable(h.AsUInt32(), Vector128.Create(0U, 8U, 16U, 24U)).AsInt32(); | ||
|
|
||
| Vector128<int> index = Avx2.ShiftRightLogical(h, 1); | ||
| index = Avx2.And(index, Vector128.Create(15)); // j - counter index | ||
| Vector128<int> offset = Avx2.And(h, Vector128.Create(1)); | ||
| Vector128<int> blockOffset = Avx2.Add(Vector128.Create(block), offset); // i - table index | ||
| blockOffset = Avx2.Add(blockOffset, Vector128.Create(0, 2, 4, 6)); // + (i << 1) | ||
|
|
||
| #if NET6_0_OR_GREATER | ||
| long* tablePtr = tableAddr; | ||
| #else | ||
| fixed (long* tablePtr = table) | ||
| #endif | ||
| { | ||
| Vector256<long> tableVector = Avx2.GatherVector256(tablePtr, blockOffset, 8); | ||
|
|
||
| // j == index | ||
| index = Avx2.ShiftLeftLogical(index, 2); | ||
| Vector256<long> offsetLong = Vector256.Create(index, Vector128<int>.Zero).AsInt64(); | ||
|
|
||
| Vector256<int> permuteMask = Vector256.Create(0, 4, 1, 5, 2, 5, 3, 7); | ||
| offsetLong = Avx2.PermuteVar8x32(offsetLong.AsInt32(), permuteMask).AsInt64(); | ||
|
|
||
| // mask = (0xfL << offset) | ||
| Vector256<long> fifteen = Vector256.Create(0xfL); | ||
| Vector256<long> mask = Avx2.ShiftLeftLogicalVariable(fifteen, offsetLong.AsUInt64()); | ||
|
|
||
| // (table[i] & mask) != mask) | ||
| // Note masked is 'equal' - therefore use AndNot below | ||
| Vector256<long> masked = Avx2.CompareEqual(Avx2.And(tableVector, mask), mask); | ||
|
|
||
| // 1L << offset | ||
| Vector256<long> inc = Avx2.ShiftLeftLogicalVariable(Vector256.Create(1L), offsetLong.AsUInt64()); | ||
|
|
||
| // Mask to zero out non matches (add zero below) - first operand is NOT then AND result (order matters) | ||
| inc = Avx2.AndNot(masked, inc); | ||
|
|
||
| Vector256<byte> result = Avx2.CompareEqual(masked.AsByte(), Vector256<byte>.Zero); | ||
| bool wasInc = Avx2.MoveMask(result.AsByte()) == unchecked((int)(0b1111_1111_1111_1111_1111_1111_1111_1111)); | ||
|
|
||
| tablePtr[blockOffset.GetElement(0)] += inc.GetElement(0); | ||
| tablePtr[blockOffset.GetElement(1)] += inc.GetElement(1); | ||
| tablePtr[blockOffset.GetElement(2)] += inc.GetElement(2); | ||
| tablePtr[blockOffset.GetElement(3)] += inc.GetElement(3); | ||
|
|
||
| if (wasInc && (++size == sampleSize)) | ||
| { | ||
| Reset(); | ||
| } | ||
| } | ||
| } | ||
| #endif | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.