Vectorize ProbabilisticMap.IndexOfAny#80963

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.

Sign up for GitHub

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
stephentoub merged 9 commits into from
Mar 10, 2023
Merged

Vectorize ProbabilisticMap.IndexOfAny #80963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bcb8f75
Vectorize ProbabilisticMap.IndexOfAny on AVX2
MihaZupan Jan 21, 2023
60819ff
Use ResetLowestSetBit from BitOperations
MihaZupan Jan 21, 2023
9bd28f4
Speed up Avx2 and add Vector128 support
MihaZupan Jan 21, 2023
71e7406
Add Vector{128/256}.LoadUnsafe(ref char) and Vector128.ShuffleUnsafe
MihaZupan Jan 26, 2023
44d8a93
Use Vector128.ShuffleUnsafe in more places
MihaZupan Feb 6, 2023
21c5d95
PR feedback
MihaZupan Feb 23, 2023
2295370
Replace another ShiftRightLogical with '>>>'
MihaZupan Feb 23, 2023
a753250
Add WASM path to Vector128.ShuffleUnsafe
MihaZupan Mar 8, 2023
978b4e8
PR feedback
MihaZupan Mar 9, 2023
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
9 changes: 2 additions & 7 deletions src/libraries/Common/src/System/HexConverter.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -99,13 +99,8 @@ internal static (Vector128<byte>, Vector128<byte>) AsciiToHexVector128(Vector128
Vector128<byte> lowNibbles = Vector128.UnpackLow(shiftedSrc, src);
Vector128<byte> highNibbles = Vector128.UnpackHigh(shiftedSrc, src);

return (ShuffleUnsafe(hexMap, lowNibbles & Vector128.Create((byte)0xF)),
ShuffleUnsafe(hexMap, highNibbles & Vector128.Create((byte)0xF)));

// TODO: remove once https://github.com/dotnet/runtime/pull/80963 is merged
[MethodImpl(MethodImplOptions.AggressiveInlining)]
static Vector128<byte> ShuffleUnsafe(Vector128<byte> value, Vector128<byte> mask)
=> Ssse3.IsSupported ? Ssse3.Shuffle(value, mask) : AdvSimd.Arm64.VectorTableLookup(value, mask);
return (Vector128.ShuffleUnsafe(hexMap, lowNibbles & Vector128.Create((byte)0xF)),
Vector128.ShuffleUnsafe(hexMap, highNibbles & Vector128.Create((byte)0xF)));
}

private static void EncodeToUtf16_Vector128(ReadOnlySpan<byte> bytes, Span<char> chars, Casing casing)
Expand Down
11 changes: 4 additions & 7 deletions src/libraries/System.Private.CoreLib/src/System/Buffers/Text/Base64Decoder.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -477,20 +477,17 @@ private static unsafe void Avx2Decode(ref byte* srcBytes, ref byte* destBytes, b
destBytes = dest;
}

// This can be replaced once https://github.com/dotnet/runtime/issues/63331 is implemented.
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static Vector128<byte> SimdShuffle(Vector128<byte> left, Vector128<byte> right, Vector128<byte> mask8F)
{
Debug.Assert((Ssse3.IsSupported || AdvSimd.Arm64.IsSupported) && BitConverter.IsLittleEndian);

if (Ssse3.IsSupported)
if (AdvSimd.Arm64.IsSupported)
{
return Ssse3.Shuffle(left, right);
}
else
{
return AdvSimd.Arm64.VectorTableLookup(left, Vector128.BitwiseAnd(right, mask8F));
right &= mask8F;
Comment thread
stephentoub marked this conversation as resolved.
Outdated
}

return Vector128.ShuffleUnsafe(left, right);
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Private.CoreLib/src/System/Globalization/Ordinal.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,8 +88,8 @@ private static bool EqualsIgnoreCase_Vector128(ref char charA, ref char charB, i
Vector128<ushort> vec2;
do
{
vec1 = Vector128.LoadUnsafe(ref Unsafe.As<char, ushort>(ref charA), i);
vec2 = Vector128.LoadUnsafe(ref Unsafe.As<char, ushort>(ref charB), i);
vec1 = Vector128.LoadUnsafe(ref charA, i);
vec2 = Vector128.LoadUnsafe(ref charB, i);

if (!Utf16Utility.AllCharsInVector128AreAscii(vec1 | vec2))
{
Expand Down
20 changes: 5 additions & 15 deletions src/libraries/System.Private.CoreLib/src/System/IndexOfAnyValues/IndexOfAnyAsciiSearcher.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -860,10 +860,10 @@ private static Vector128<byte> IndexOfAnyLookupCore(Vector128<byte> source, Vect

// The bitmapLookup represents a 8x16 table of bits, indicating whether a character is present in the needle.
// Lookup the rows via the lower nibble and the column via the higher nibble.
Vector128<byte> bitMask = Shuffle(bitmapLookup, lowNibbles);
Vector128<byte> bitMask = Vector128.ShuffleUnsafe(bitmapLookup, lowNibbles);

// For values above 127, the high nibble will be above 7. We construct the positions vector for the shuffle such that those values map to 0.
Vector128<byte> bitPositions = Shuffle(Vector128.Create(0x8040201008040201, 0).AsByte(), highNibbles);
Vector128<byte> bitPositions = Vector128.ShuffleUnsafe(Vector128.Create(0x8040201008040201, 0).AsByte(), highNibbles);

Vector128<byte> result = bitMask & bitPositions;
return result;
Expand DownExpand Up@@ -909,10 +909,10 @@ private static Vector128<byte> IndexOfAnyLookup<TNegator>(Vector128<byte> source
Vector128<byte> lowNibbles = source & Vector128.Create((byte)0xF);
Vector128<byte> highNibbles = Vector128.ShiftRightLogical(source.AsInt32(), 4).AsByte() & Vector128.Create((byte)0xF);

Vector128<byte> row0 = Shuffle(bitmapLookup0, lowNibbles);
Vector128<byte> row1 = Shuffle(bitmapLookup1, lowNibbles);
Vector128<byte> row0 = Vector128.ShuffleUnsafe(bitmapLookup0, lowNibbles);
Vector128<byte> row1 = Vector128.ShuffleUnsafe(bitmapLookup1, lowNibbles);

Vector128<byte> bitmask = Shuffle(Vector128.Create(0x8040201008040201).AsByte(), highNibbles);
Vector128<byte> bitmask = Vector128.ShuffleUnsafe(Vector128.Create(0x8040201008040201).AsByte(), highNibbles);

Vector128<byte> mask = Vector128.GreaterThan(highNibbles.AsSByte(), Vector128.Create((sbyte)0x7)).AsByte();
Vector128<byte> bitsets = Vector128.ConditionalSelect(mask, row1, row0);
Expand DownExpand Up@@ -944,16 +944,6 @@ private static Vector256<byte> IndexOfAnyLookup<TNegator>(Vector256<byte> source
return TNegator.NegateIfNeeded(result);
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static Vector128<byte> Shuffle(Vector128<byte> vector, Vector128<byte> indices)
{
// We're not using Vector128.Shuffle as the caller already accounts for and relies on differences in behavior between platforms.
return
Ssse3.IsSupported ? Ssse3.Shuffle(vector, indices) :
AdvSimd.Arm64.IsSupported ? AdvSimd.Arm64.VectorTableLookup(vector, indices) :
PackedSimd.Swizzle(vector, indices);
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static unsafe int ComputeFirstIndex<T, TNegator>(ref T searchSpace, ref T current, Vector128<byte> result)
where TNegator : struct, INegator
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Vectorize ProbabilisticMap.IndexOfAny#80963

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.

 Sign up for GitHub

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

stephentoub
merged 9 commits into

from

Mar 10, 2023
 Merged


Vectorize ProbabilisticMap.IndexOfAny
#80963
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
bcb8f75

Vectorize ProbabilisticMap.IndexOfAny on AVX2


MihaZupan Jan 21, 2023
60819ff

Use ResetLowestSetBit from BitOperations


MihaZupan Jan 21, 2023
9bd28f4

Speed up Avx2 and add Vector128 support


MihaZupan Jan 21, 2023
71e7406

Add Vector{128/256}.LoadUnsafe(ref char) and Vector128.ShuffleUnsafe


MihaZupan Jan 26, 2023
44d8a93

Use Vector128.ShuffleUnsafe in more places


MihaZupan Feb 6, 2023
21c5d95

PR feedback


MihaZupan Feb 23, 2023
2295370

Replace another ShiftRightLogical with '>>>'


MihaZupan Feb 23, 2023
a753250

Add WASM path to Vector128.ShuffleUnsafe


MihaZupan Mar 8, 2023
978b4e8

PR feedback


MihaZupan Mar 9, 2023

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


9 changes: 2 additions & 7 deletions
src/libraries/Common/src/System/HexConverter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,13 +99,8 @@ internal static (Vector128<byte>, Vector128<byte>) AsciiToHexVector128(Vector128
 Vector128<byte> lowNibbles = Vector128.UnpackLow(shiftedSrc, src);
 Vector128<byte> highNibbles = Vector128.UnpackHigh(shiftedSrc, src);

 return (ShuffleUnsafe(hexMap, lowNibbles & Vector128.Create((byte)0xF)),
 ShuffleUnsafe(hexMap, highNibbles & Vector128.Create((byte)0xF)));

 // TODO: remove once https://github.com/dotnet/runtime/pull/80963 is merged
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 static Vector128<byte> ShuffleUnsafe(Vector128<byte> value, Vector128<byte> mask)
 => Ssse3.IsSupported ? Ssse3.Shuffle(value, mask) : AdvSimd.Arm64.VectorTableLookup(value, mask);
 return (Vector128.ShuffleUnsafe(hexMap, lowNibbles & Vector128.Create((byte)0xF)),
 Vector128.ShuffleUnsafe(hexMap, highNibbles & Vector128.Create((byte)0xF)));
 }

 private static void EncodeToUtf16_Vector128(ReadOnlySpan<byte> bytes, Span<char> chars, Casing casing)
Expand Down

11 changes: 4 additions & 7 deletions
src/libraries/System.Private.CoreLib/src/System/Buffers/Text/Base64Decoder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -477,20 +477,17 @@ private static unsafe void Avx2Decode(ref byte* srcBytes, ref byte* destBytes, b
 destBytes = dest;
 }

 // This can be replaced once https://github.com/dotnet/runtime/issues/63331 is implemented.
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 private static Vector128<byte> SimdShuffle(Vector128<byte> left, Vector128<byte> right, Vector128<byte> mask8F)
 {
 Debug.Assert((Ssse3.IsSupported || AdvSimd.Arm64.IsSupported) && BitConverter.IsLittleEndian);

 if (Ssse3.IsSupported)
 if (AdvSimd.Arm64.IsSupported)
 {
 return Ssse3.Shuffle(left, right);
 }
 else
 {
 return AdvSimd.Arm64.VectorTableLookup(left, Vector128.BitwiseAnd(right, mask8F));
 right &= mask8F;
Comment thread
stephentoub marked this conversation as resolved.


Outdated

 }

 return Vector128.ShuffleUnsafe(left, right);
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Private.CoreLib/src/System/Globalization/Ordinal.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,8 +88,8 @@ private static bool EqualsIgnoreCase_Vector128(ref char charA, ref char charB, i
 Vector128<ushort> vec2;
 do
 {
 vec1 = Vector128.LoadUnsafe(ref Unsafe.As<char, ushort>(ref charA), i);
 vec2 = Vector128.LoadUnsafe(ref Unsafe.As<char, ushort>(ref charB), i);
 vec1 = Vector128.LoadUnsafe(ref charA, i);
 vec2 = Vector128.LoadUnsafe(ref charB, i);

 if (!Utf16Utility.AllCharsInVector128AreAscii(vec1 | vec2))
 {
Expand Down

20 changes: 5 additions & 15 deletions
src/libraries/System.Private.CoreLib/src/System/IndexOfAnyValues/IndexOfAnyAsciiSearcher.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -860,10 +860,10 @@ private static Vector128<byte> IndexOfAnyLookupCore(Vector128<byte> source, Vect

 // The bitmapLookup represents a 8x16 table of bits, indicating whether a character is present in the needle.
 // Lookup the rows via the lower nibble and the column via the higher nibble.
 Vector128<byte> bitMask = Shuffle(bitmapLookup, lowNibbles);
 Vector128<byte> bitMask = Vector128.ShuffleUnsafe(bitmapLookup, lowNibbles);

 // For values above 127, the high nibble will be above 7. We construct the positions vector for the shuffle such that those values map to 0.
 Vector128<byte> bitPositions = Shuffle(Vector128.Create(0x8040201008040201, 0).AsByte(), highNibbles);
 Vector128<byte> bitPositions = Vector128.ShuffleUnsafe(Vector128.Create(0x8040201008040201, 0).AsByte(), highNibbles);

 Vector128<byte> result = bitMask & bitPositions;
 return result;
Expand DownExpand Up@@ -909,10 +909,10 @@ private static Vector128<byte> IndexOfAnyLookup<TNegator>(Vector128<byte> source
 Vector128<byte> lowNibbles = source & Vector128.Create((byte)0xF);
 Vector128<byte> highNibbles = Vector128.ShiftRightLogical(source.AsInt32(), 4).AsByte() & Vector128.Create((byte)0xF);

 Vector128<byte> row0 = Shuffle(bitmapLookup0, lowNibbles);
 Vector128<byte> row1 = Shuffle(bitmapLookup1, lowNibbles);
 Vector128<byte> row0 = Vector128.ShuffleUnsafe(bitmapLookup0, lowNibbles);
 Vector128<byte> row1 = Vector128.ShuffleUnsafe(bitmapLookup1, lowNibbles);

 Vector128<byte> bitmask = Shuffle(Vector128.Create(0x8040201008040201).AsByte(), highNibbles);
 Vector128<byte> bitmask = Vector128.ShuffleUnsafe(Vector128.Create(0x8040201008040201).AsByte(), highNibbles);

 Vector128<byte> mask = Vector128.GreaterThan(highNibbles.AsSByte(), Vector128.Create((sbyte)0x7)).AsByte();
 Vector128<byte> bitsets = Vector128.ConditionalSelect(mask, row1, row0);
Expand DownExpand Up@@ -944,16 +944,6 @@ private static Vector256<byte> IndexOfAnyLookup<TNegator>(Vector256<byte> source
 return TNegator.NegateIfNeeded(result);
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 private static Vector128<byte> Shuffle(Vector128<byte> vector, Vector128<byte> indices)
 {
 // We're not using Vector128.Shuffle as the caller already accounts for and relies on differences in behavior between platforms.
 return
 Ssse3.IsSupported ? Ssse3.Shuffle(vector, indices) :
 AdvSimd.Arm64.IsSupported ? AdvSimd.Arm64.VectorTableLookup(vector, indices) :
 PackedSimd.Swizzle(vector, indices);
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 private static unsafe int ComputeFirstIndex<T, TNegator>(ref T searchSpace, ref T current, Vector128<byte> result)
 where TNegator : struct, INegator
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Vectorize ProbabilisticMap.IndexOfAny#80963

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.

 Sign up for GitHub

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

stephentoub
merged 9 commits into

from

Mar 10, 2023
 Merged


Vectorize ProbabilisticMap.IndexOfAny
#80963
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
bcb8f75

Vectorize ProbabilisticMap.IndexOfAny on AVX2


MihaZupan Jan 21, 2023
60819ff

Use ResetLowestSetBit from BitOperations


MihaZupan Jan 21, 2023
9bd28f4

Speed up Avx2 and add Vector128 support


MihaZupan Jan 21, 2023
71e7406

Add Vector{128/256}.LoadUnsafe(ref char) and Vector128.ShuffleUnsafe


MihaZupan Jan 26, 2023
44d8a93

Use Vector128.ShuffleUnsafe in more places


MihaZupan Feb 6, 2023
21c5d95

PR feedback


MihaZupan Feb 23, 2023
2295370

Replace another ShiftRightLogical with '>>>'


MihaZupan Feb 23, 2023
a753250

Add WASM path to Vector128.ShuffleUnsafe


MihaZupan Mar 8, 2023
978b4e8

PR feedback


MihaZupan Mar 9, 2023

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


9 changes: 2 additions & 7 deletions
src/libraries/Common/src/System/HexConverter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,13 +99,8 @@ internal static (Vector128<byte>, Vector128<byte>) AsciiToHexVector128(Vector128
 Vector128<byte> lowNibbles = Vector128.UnpackLow(shiftedSrc, src);
 Vector128<byte> highNibbles = Vector128.UnpackHigh(shiftedSrc, src);

 return (ShuffleUnsafe(hexMap, lowNibbles & Vector128.Create((byte)0xF)),
 ShuffleUnsafe(hexMap, highNibbles & Vector128.Create((byte)0xF)));

 // TODO: remove once https://github.com/dotnet/runtime/pull/80963 is merged
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 static Vector128<byte> ShuffleUnsafe(Vector128<byte> value, Vector128<byte> mask)
 => Ssse3.IsSupported ? Ssse3.Shuffle(value, mask) : AdvSimd.Arm64.VectorTableLookup(value, mask);
 return (Vector128.ShuffleUnsafe(hexMap, lowNibbles & Vector128.Create((byte)0xF)),
 Vector128.ShuffleUnsafe(hexMap, highNibbles & Vector128.Create((byte)0xF)));
 }

 private static void EncodeToUtf16_Vector128(ReadOnlySpan<byte> bytes, Span<char> chars, Casing casing)
Expand Down

11 changes: 4 additions & 7 deletions
src/libraries/System.Private.CoreLib/src/System/Buffers/Text/Base64Decoder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -477,20 +477,17 @@ private static unsafe void Avx2Decode(ref byte* srcBytes, ref byte* destBytes, b
 destBytes = dest;
 }

 // This can be replaced once https://github.com/dotnet/runtime/issues/63331 is implemented.
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 private static Vector128<byte> SimdShuffle(Vector128<byte> left, Vector128<byte> right, Vector128<byte> mask8F)
 {
 Debug.Assert((Ssse3.IsSupported || AdvSimd.Arm64.IsSupported) && BitConverter.IsLittleEndian);

 if (Ssse3.IsSupported)
 if (AdvSimd.Arm64.IsSupported)
 {
 return Ssse3.Shuffle(left, right);
 }
 else
 {
 return AdvSimd.Arm64.VectorTableLookup(left, Vector128.BitwiseAnd(right, mask8F));
 right &= mask8F;
Comment thread
stephentoub marked this conversation as resolved.


Outdated

 }

 return Vector128.ShuffleUnsafe(left, right);
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Private.CoreLib/src/System/Globalization/Ordinal.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,8 +88,8 @@ private static bool EqualsIgnoreCase_Vector128(ref char charA, ref char charB, i
 Vector128<ushort> vec2;
 do
 {
 vec1 = Vector128.LoadUnsafe(ref Unsafe.As<char, ushort>(ref charA), i);
 vec2 = Vector128.LoadUnsafe(ref Unsafe.As<char, ushort>(ref charB), i);
 vec1 = Vector128.LoadUnsafe(ref charA, i);
 vec2 = Vector128.LoadUnsafe(ref charB, i);

 if (!Utf16Utility.AllCharsInVector128AreAscii(vec1 | vec2))
 {
Expand Down

20 changes: 5 additions & 15 deletions
src/libraries/System.Private.CoreLib/src/System/IndexOfAnyValues/IndexOfAnyAsciiSearcher.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -860,10 +860,10 @@ private static Vector128<byte> IndexOfAnyLookupCore(Vector128<byte> source, Vect

 // The bitmapLookup represents a 8x16 table of bits, indicating whether a character is present in the needle.
 // Lookup the rows via the lower nibble and the column via the higher nibble.
 Vector128<byte> bitMask = Shuffle(bitmapLookup, lowNibbles);
 Vector128<byte> bitMask = Vector128.ShuffleUnsafe(bitmapLookup, lowNibbles);

 // For values above 127, the high nibble will be above 7. We construct the positions vector for the shuffle such that those values map to 0.
 Vector128<byte> bitPositions = Shuffle(Vector128.Create(0x8040201008040201, 0).AsByte(), highNibbles);
 Vector128<byte> bitPositions = Vector128.ShuffleUnsafe(Vector128.Create(0x8040201008040201, 0).AsByte(), highNibbles);

 Vector128<byte> result = bitMask & bitPositions;
 return result;
Expand DownExpand Up@@ -909,10 +909,10 @@ private static Vector128<byte> IndexOfAnyLookup<TNegator>(Vector128<byte> source
 Vector128<byte> lowNibbles = source & Vector128.Create((byte)0xF);
 Vector128<byte> highNibbles = Vector128.ShiftRightLogical(source.AsInt32(), 4).AsByte() & Vector128.Create((byte)0xF);

 Vector128<byte> row0 = Shuffle(bitmapLookup0, lowNibbles);
 Vector128<byte> row1 = Shuffle(bitmapLookup1, lowNibbles);
 Vector128<byte> row0 = Vector128.ShuffleUnsafe(bitmapLookup0, lowNibbles);
 Vector128<byte> row1 = Vector128.ShuffleUnsafe(bitmapLookup1, lowNibbles);

 Vector128<byte> bitmask = Shuffle(Vector128.Create(0x8040201008040201).AsByte(), highNibbles);
 Vector128<byte> bitmask = Vector128.ShuffleUnsafe(Vector128.Create(0x8040201008040201).AsByte(), highNibbles);

 Vector128<byte> mask = Vector128.GreaterThan(highNibbles.AsSByte(), Vector128.Create((sbyte)0x7)).AsByte();
 Vector128<byte> bitsets = Vector128.ConditionalSelect(mask, row1, row0);
Expand DownExpand Up@@ -944,16 +944,6 @@ private static Vector256<byte> IndexOfAnyLookup<TNegator>(Vector256<byte> source
 return TNegator.NegateIfNeeded(result);
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 private static Vector128<byte> Shuffle(Vector128<byte> vector, Vector128<byte> indices)
 {
 // We're not using Vector128.Shuffle as the caller already accounts for and relies on differences in behavior between platforms.
 return
 Ssse3.IsSupported ? Ssse3.Shuffle(vector, indices) :
 AdvSimd.Arm64.IsSupported ? AdvSimd.Arm64.VectorTableLookup(vector, indices) :
 PackedSimd.Swizzle(vector, indices);
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 private static unsafe int ComputeFirstIndex<T, TNegator>(ref T searchSpace, ref T current, Vector128<byte> result)
 where TNegator : struct, INegator
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Vectorize ProbabilisticMap.IndexOfAny#80963

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.

 Sign up for GitHub

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

stephentoub
merged 9 commits into

from

Mar 10, 2023
 Merged


Vectorize ProbabilisticMap.IndexOfAny
#80963
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
bcb8f75

Vectorize ProbabilisticMap.IndexOfAny on AVX2


MihaZupan Jan 21, 2023
60819ff

Use ResetLowestSetBit from BitOperations


MihaZupan Jan 21, 2023
9bd28f4

Speed up Avx2 and add Vector128 support


MihaZupan Jan 21, 2023
71e7406

Add Vector{128/256}.LoadUnsafe(ref char) and Vector128.ShuffleUnsafe


MihaZupan Jan 26, 2023
44d8a93

Use Vector128.ShuffleUnsafe in more places


MihaZupan Feb 6, 2023
21c5d95

PR feedback


MihaZupan Feb 23, 2023
2295370

Replace another ShiftRightLogical with '>>>'


MihaZupan Feb 23, 2023
a753250

Add WASM path to Vector128.ShuffleUnsafe


MihaZupan Mar 8, 2023
978b4e8

PR feedback


MihaZupan Mar 9, 2023

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


9 changes: 2 additions & 7 deletions
src/libraries/Common/src/System/HexConverter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,13 +99,8 @@ internal static (Vector128<byte>, Vector128<byte>) AsciiToHexVector128(Vector128
 Vector128<byte> lowNibbles = Vector128.UnpackLow(shiftedSrc, src);
 Vector128<byte> highNibbles = Vector128.UnpackHigh(shiftedSrc, src);

 return (ShuffleUnsafe(hexMap, lowNibbles & Vector128.Create((byte)0xF)),
 ShuffleUnsafe(hexMap, highNibbles & Vector128.Create((byte)0xF)));

 // TODO: remove once https://github.com/dotnet/runtime/pull/80963 is merged
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 static Vector128<byte> ShuffleUnsafe(Vector128<byte> value, Vector128<byte> mask)
 => Ssse3.IsSupported ? Ssse3.Shuffle(value, mask) : AdvSimd.Arm64.VectorTableLookup(value, mask);
 return (Vector128.ShuffleUnsafe(hexMap, lowNibbles & Vector128.Create((byte)0xF)),
 Vector128.ShuffleUnsafe(hexMap, highNibbles & Vector128.Create((byte)0xF)));
 }

 private static void EncodeToUtf16_Vector128(ReadOnlySpan<byte> bytes, Span<char> chars, Casing casing)
Expand Down

11 changes: 4 additions & 7 deletions
src/libraries/System.Private.CoreLib/src/System/Buffers/Text/Base64Decoder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -477,20 +477,17 @@ private static unsafe void Avx2Decode(ref byte* srcBytes, ref byte* destBytes, b
 destBytes = dest;
 }

 // This can be replaced once https://github.com/dotnet/runtime/issues/63331 is implemented.
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 private static Vector128<byte> SimdShuffle(Vector128<byte> left, Vector128<byte> right, Vector128<byte> mask8F)
 {
 Debug.Assert((Ssse3.IsSupported || AdvSimd.Arm64.IsSupported) && BitConverter.IsLittleEndian);

 if (Ssse3.IsSupported)
 if (AdvSimd.Arm64.IsSupported)
 {
 return Ssse3.Shuffle(left, right);
 }
 else
 {
 return AdvSimd.Arm64.VectorTableLookup(left, Vector128.BitwiseAnd(right, mask8F));
 right &= mask8F;
Comment thread
stephentoub marked this conversation as resolved.


Outdated

 }

 return Vector128.ShuffleUnsafe(left, right);
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Private.CoreLib/src/System/Globalization/Ordinal.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,8 +88,8 @@ private static bool EqualsIgnoreCase_Vector128(ref char charA, ref char charB, i
 Vector128<ushort> vec2;
 do
 {
 vec1 = Vector128.LoadUnsafe(ref Unsafe.As<char, ushort>(ref charA), i);
 vec2 = Vector128.LoadUnsafe(ref Unsafe.As<char, ushort>(ref charB), i);
 vec1 = Vector128.LoadUnsafe(ref charA, i);
 vec2 = Vector128.LoadUnsafe(ref charB, i);

 if (!Utf16Utility.AllCharsInVector128AreAscii(vec1 | vec2))
 {
Expand Down

20 changes: 5 additions & 15 deletions
src/libraries/System.Private.CoreLib/src/System/IndexOfAnyValues/IndexOfAnyAsciiSearcher.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -860,10 +860,10 @@ private static Vector128<byte> IndexOfAnyLookupCore(Vector128<byte> source, Vect

 // The bitmapLookup represents a 8x16 table of bits, indicating whether a character is present in the needle.
 // Lookup the rows via the lower nibble and the column via the higher nibble.
 Vector128<byte> bitMask = Shuffle(bitmapLookup, lowNibbles);
 Vector128<byte> bitMask = Vector128.ShuffleUnsafe(bitmapLookup, lowNibbles);

 // For values above 127, the high nibble will be above 7. We construct the positions vector for the shuffle such that those values map to 0.
 Vector128<byte> bitPositions = Shuffle(Vector128.Create(0x8040201008040201, 0).AsByte(), highNibbles);
 Vector128<byte> bitPositions = Vector128.ShuffleUnsafe(Vector128.Create(0x8040201008040201, 0).AsByte(), highNibbles);

 Vector128<byte> result = bitMask & bitPositions;
 return result;
Expand DownExpand Up@@ -909,10 +909,10 @@ private static Vector128<byte> IndexOfAnyLookup<TNegator>(Vector128<byte> source
 Vector128<byte> lowNibbles = source & Vector128.Create((byte)0xF);
 Vector128<byte> highNibbles = Vector128.ShiftRightLogical(source.AsInt32(), 4).AsByte() & Vector128.Create((byte)0xF);

 Vector128<byte> row0 = Shuffle(bitmapLookup0, lowNibbles);
 Vector128<byte> row1 = Shuffle(bitmapLookup1, lowNibbles);
 Vector128<byte> row0 = Vector128.ShuffleUnsafe(bitmapLookup0, lowNibbles);
 Vector128<byte> row1 = Vector128.ShuffleUnsafe(bitmapLookup1, lowNibbles);

 Vector128<byte> bitmask = Shuffle(Vector128.Create(0x8040201008040201).AsByte(), highNibbles);
 Vector128<byte> bitmask = Vector128.ShuffleUnsafe(Vector128.Create(0x8040201008040201).AsByte(), highNibbles);

 Vector128<byte> mask = Vector128.GreaterThan(highNibbles.AsSByte(), Vector128.Create((sbyte)0x7)).AsByte();
 Vector128<byte> bitsets = Vector128.ConditionalSelect(mask, row1, row0);
Expand DownExpand Up@@ -944,16 +944,6 @@ private static Vector256<byte> IndexOfAnyLookup<TNegator>(Vector256<byte> source
 return TNegator.NegateIfNeeded(result);
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 private static Vector128<byte> Shuffle(Vector128<byte> vector, Vector128<byte> indices)
 {
 // We're not using Vector128.Shuffle as the caller already accounts for and relies on differences in behavior between platforms.
 return
 Ssse3.IsSupported ? Ssse3.Shuffle(vector, indices) :
 AdvSimd.Arm64.IsSupported ? AdvSimd.Arm64.VectorTableLookup(vector, indices) :
 PackedSimd.Swizzle(vector, indices);
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 private static unsafe int ComputeFirstIndex<T, TNegator>(ref T searchSpace, ref T current, Vector128<byte> result)
 where TNegator : struct, INegator
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Vectorize ProbabilisticMap.IndexOfAny#80963

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.

 Sign up for GitHub

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

stephentoub
merged 9 commits into

from

Mar 10, 2023
 Merged


Vectorize ProbabilisticMap.IndexOfAny
#80963
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
bcb8f75

Vectorize ProbabilisticMap.IndexOfAny on AVX2


MihaZupan Jan 21, 2023
60819ff

Use ResetLowestSetBit from BitOperations


MihaZupan Jan 21, 2023
9bd28f4

Speed up Avx2 and add Vector128 support


MihaZupan Jan 21, 2023
71e7406

Add Vector{128/256}.LoadUnsafe(ref char) and Vector128.ShuffleUnsafe


MihaZupan Jan 26, 2023
44d8a93

Use Vector128.ShuffleUnsafe in more places


MihaZupan Feb 6, 2023
21c5d95

PR feedback


MihaZupan Feb 23, 2023
2295370

Replace another ShiftRightLogical with '>>>'


MihaZupan Feb 23, 2023
a753250

Add WASM path to Vector128.ShuffleUnsafe


MihaZupan Mar 8, 2023
978b4e8

PR feedback


MihaZupan Mar 9, 2023

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


9 changes: 2 additions & 7 deletions
src/libraries/Common/src/System/HexConverter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,13 +99,8 @@ internal static (Vector128<byte>, Vector128<byte>) AsciiToHexVector128(Vector128
 Vector128<byte> lowNibbles = Vector128.UnpackLow(shiftedSrc, src);
 Vector128<byte> highNibbles = Vector128.UnpackHigh(shiftedSrc, src);

 return (ShuffleUnsafe(hexMap, lowNibbles & Vector128.Create((byte)0xF)),
 ShuffleUnsafe(hexMap, highNibbles & Vector128.Create((byte)0xF)));

 // TODO: remove once https://github.com/dotnet/runtime/pull/80963 is merged
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 static Vector128<byte> ShuffleUnsafe(Vector128<byte> value, Vector128<byte> mask)
 => Ssse3.IsSupported ? Ssse3.Shuffle(value, mask) : AdvSimd.Arm64.VectorTableLookup(value, mask);
 return (Vector128.ShuffleUnsafe(hexMap, lowNibbles & Vector128.Create((byte)0xF)),
 Vector128.ShuffleUnsafe(hexMap, highNibbles & Vector128.Create((byte)0xF)));
 }

 private static void EncodeToUtf16_Vector128(ReadOnlySpan<byte> bytes, Span<char> chars, Casing casing)
Expand Down

11 changes: 4 additions & 7 deletions
src/libraries/System.Private.CoreLib/src/System/Buffers/Text/Base64Decoder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -477,20 +477,17 @@ private static unsafe void Avx2Decode(ref byte* srcBytes, ref byte* destBytes, b
 destBytes = dest;
 }

 // This can be replaced once https://github.com/dotnet/runtime/issues/63331 is implemented.
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 private static Vector128<byte> SimdShuffle(Vector128<byte> left, Vector128<byte> right, Vector128<byte> mask8F)
 {
 Debug.Assert((Ssse3.IsSupported || AdvSimd.Arm64.IsSupported) && BitConverter.IsLittleEndian);

 if (Ssse3.IsSupported)
 if (AdvSimd.Arm64.IsSupported)
 {
 return Ssse3.Shuffle(left, right);
 }
 else
 {
 return AdvSimd.Arm64.VectorTableLookup(left, Vector128.BitwiseAnd(right, mask8F));
 right &= mask8F;
Comment thread
stephentoub marked this conversation as resolved.


Outdated

 }

 return Vector128.ShuffleUnsafe(left, right);
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Private.CoreLib/src/System/Globalization/Ordinal.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,8 +88,8 @@ private static bool EqualsIgnoreCase_Vector128(ref char charA, ref char charB, i
 Vector128<ushort> vec2;
 do
 {
 vec1 = Vector128.LoadUnsafe(ref Unsafe.As<char, ushort>(ref charA), i);
 vec2 = Vector128.LoadUnsafe(ref Unsafe.As<char, ushort>(ref charB), i);
 vec1 = Vector128.LoadUnsafe(ref charA, i);
 vec2 = Vector128.LoadUnsafe(ref charB, i);

 if (!Utf16Utility.AllCharsInVector128AreAscii(vec1 | vec2))
 {
Expand Down

20 changes: 5 additions & 15 deletions
src/libraries/System.Private.CoreLib/src/System/IndexOfAnyValues/IndexOfAnyAsciiSearcher.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -860,10 +860,10 @@ private static Vector128<byte> IndexOfAnyLookupCore(Vector128<byte> source, Vect

 // The bitmapLookup represents a 8x16 table of bits, indicating whether a character is present in the needle.
 // Lookup the rows via the lower nibble and the column via the higher nibble.
 Vector128<byte> bitMask = Shuffle(bitmapLookup, lowNibbles);
 Vector128<byte> bitMask = Vector128.ShuffleUnsafe(bitmapLookup, lowNibbles);

 // For values above 127, the high nibble will be above 7. We construct the positions vector for the shuffle such that those values map to 0.
 Vector128<byte> bitPositions = Shuffle(Vector128.Create(0x8040201008040201, 0).AsByte(), highNibbles);
 Vector128<byte> bitPositions = Vector128.ShuffleUnsafe(Vector128.Create(0x8040201008040201, 0).AsByte(), highNibbles);

 Vector128<byte> result = bitMask & bitPositions;
 return result;
Expand DownExpand Up@@ -909,10 +909,10 @@ private static Vector128<byte> IndexOfAnyLookup<TNegator>(Vector128<byte> source
 Vector128<byte> lowNibbles = source & Vector128.Create((byte)0xF);
 Vector128<byte> highNibbles = Vector128.ShiftRightLogical(source.AsInt32(), 4).AsByte() & Vector128.Create((byte)0xF);

 Vector128<byte> row0 = Shuffle(bitmapLookup0, lowNibbles);
 Vector128<byte> row1 = Shuffle(bitmapLookup1, lowNibbles);
 Vector128<byte> row0 = Vector128.ShuffleUnsafe(bitmapLookup0, lowNibbles);
 Vector128<byte> row1 = Vector128.ShuffleUnsafe(bitmapLookup1, lowNibbles);

 Vector128<byte> bitmask = Shuffle(Vector128.Create(0x8040201008040201).AsByte(), highNibbles);
 Vector128<byte> bitmask = Vector128.ShuffleUnsafe(Vector128.Create(0x8040201008040201).AsByte(), highNibbles);

 Vector128<byte> mask = Vector128.GreaterThan(highNibbles.AsSByte(), Vector128.Create((sbyte)0x7)).AsByte();
 Vector128<byte> bitsets = Vector128.ConditionalSelect(mask, row1, row0);
Expand DownExpand Up@@ -944,16 +944,6 @@ private static Vector256<byte> IndexOfAnyLookup<TNegator>(Vector256<byte> source
 return TNegator.NegateIfNeeded(result);
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 private static Vector128<byte> Shuffle(Vector128<byte> vector, Vector128<byte> indices)
 {
 // We're not using Vector128.Shuffle as the caller already accounts for and relies on differences in behavior between platforms.
 return
 Ssse3.IsSupported ? Ssse3.Shuffle(vector, indices) :
 AdvSimd.Arm64.IsSupported ? AdvSimd.Arm64.VectorTableLookup(vector, indices) :
 PackedSimd.Swizzle(vector, indices);
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 private static unsafe int ComputeFirstIndex<T, TNegator>(ref T searchSpace, ref T current, Vector128<byte> result)
 where TNegator : struct, INegator
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Vectorize ProbabilisticMap.IndexOfAny#80963

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.

 Sign up for GitHub

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

stephentoub
merged 9 commits into

from

Mar 10, 2023
 Merged


Vectorize ProbabilisticMap.IndexOfAny
#80963
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
bcb8f75

Vectorize ProbabilisticMap.IndexOfAny on AVX2


MihaZupan Jan 21, 2023
60819ff

Use ResetLowestSetBit from BitOperations


MihaZupan Jan 21, 2023
9bd28f4

Speed up Avx2 and add Vector128 support


MihaZupan Jan 21, 2023
71e7406

Add Vector{128/256}.LoadUnsafe(ref char) and Vector128.ShuffleUnsafe


MihaZupan Jan 26, 2023
44d8a93

Use Vector128.ShuffleUnsafe in more places


MihaZupan Feb 6, 2023
21c5d95

PR feedback


MihaZupan Feb 23, 2023
2295370

Replace another ShiftRightLogical with '>>>'


MihaZupan Feb 23, 2023
a753250

Add WASM path to Vector128.ShuffleUnsafe


MihaZupan Mar 8, 2023
978b4e8

PR feedback


MihaZupan Mar 9, 2023

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


9 changes: 2 additions & 7 deletions
src/libraries/Common/src/System/HexConverter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,13 +99,8 @@ internal static (Vector128<byte>, Vector128<byte>) AsciiToHexVector128(Vector128
 Vector128<byte> lowNibbles = Vector128.UnpackLow(shiftedSrc, src);
 Vector128<byte> highNibbles = Vector128.UnpackHigh(shiftedSrc, src);

 return (ShuffleUnsafe(hexMap, lowNibbles & Vector128.Create((byte)0xF)),
 ShuffleUnsafe(hexMap, highNibbles & Vector128.Create((byte)0xF)));

 // TODO: remove once https://github.com/dotnet/runtime/pull/80963 is merged
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 static Vector128<byte> ShuffleUnsafe(Vector128<byte> value, Vector128<byte> mask)
 => Ssse3.IsSupported ? Ssse3.Shuffle(value, mask) : AdvSimd.Arm64.VectorTableLookup(value, mask);
 return (Vector128.ShuffleUnsafe(hexMap, lowNibbles & Vector128.Create((byte)0xF)),
 Vector128.ShuffleUnsafe(hexMap, highNibbles & Vector128.Create((byte)0xF)));
 }

 private static void EncodeToUtf16_Vector128(ReadOnlySpan<byte> bytes, Span<char> chars, Casing casing)
Expand Down

11 changes: 4 additions & 7 deletions
src/libraries/System.Private.CoreLib/src/System/Buffers/Text/Base64Decoder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -477,20 +477,17 @@ private static unsafe void Avx2Decode(ref byte* srcBytes, ref byte* destBytes, b
 destBytes = dest;
 }

 // This can be replaced once https://github.com/dotnet/runtime/issues/63331 is implemented.
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 private static Vector128<byte> SimdShuffle(Vector128<byte> left, Vector128<byte> right, Vector128<byte> mask8F)
 {
 Debug.Assert((Ssse3.IsSupported || AdvSimd.Arm64.IsSupported) && BitConverter.IsLittleEndian);

 if (Ssse3.IsSupported)
 if (AdvSimd.Arm64.IsSupported)
 {
 return Ssse3.Shuffle(left, right);
 }
 else
 {
 return AdvSimd.Arm64.VectorTableLookup(left, Vector128.BitwiseAnd(right, mask8F));
 right &= mask8F;
Comment thread
stephentoub marked this conversation as resolved.


Outdated

 }

 return Vector128.ShuffleUnsafe(left, right);
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Private.CoreLib/src/System/Globalization/Ordinal.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,8 +88,8 @@ private static bool EqualsIgnoreCase_Vector128(ref char charA, ref char charB, i
 Vector128<ushort> vec2;
 do
 {
 vec1 = Vector128.LoadUnsafe(ref Unsafe.As<char, ushort>(ref charA), i);
 vec2 = Vector128.LoadUnsafe(ref Unsafe.As<char, ushort>(ref charB), i);
 vec1 = Vector128.LoadUnsafe(ref charA, i);
 vec2 = Vector128.LoadUnsafe(ref charB, i);

 if (!Utf16Utility.AllCharsInVector128AreAscii(vec1 | vec2))
 {
Expand Down

20 changes: 5 additions & 15 deletions
src/libraries/System.Private.CoreLib/src/System/IndexOfAnyValues/IndexOfAnyAsciiSearcher.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -860,10 +860,10 @@ private static Vector128<byte> IndexOfAnyLookupCore(Vector128<byte> source, Vect

 // The bitmapLookup represents a 8x16 table of bits, indicating whether a character is present in the needle.
 // Lookup the rows via the lower nibble and the column via the higher nibble.
 Vector128<byte> bitMask = Shuffle(bitmapLookup, lowNibbles);
 Vector128<byte> bitMask = Vector128.ShuffleUnsafe(bitmapLookup, lowNibbles);

 // For values above 127, the high nibble will be above 7. We construct the positions vector for the shuffle such that those values map to 0.
 Vector128<byte> bitPositions = Shuffle(Vector128.Create(0x8040201008040201, 0).AsByte(), highNibbles);
 Vector128<byte> bitPositions = Vector128.ShuffleUnsafe(Vector128.Create(0x8040201008040201, 0).AsByte(), highNibbles);

 Vector128<byte> result = bitMask & bitPositions;
 return result;
Expand DownExpand Up@@ -909,10 +909,10 @@ private static Vector128<byte> IndexOfAnyLookup<TNegator>(Vector128<byte> source
 Vector128<byte> lowNibbles = source & Vector128.Create((byte)0xF);
 Vector128<byte> highNibbles = Vector128.ShiftRightLogical(source.AsInt32(), 4).AsByte() & Vector128.Create((byte)0xF);

 Vector128<byte> row0 = Shuffle(bitmapLookup0, lowNibbles);
 Vector128<byte> row1 = Shuffle(bitmapLookup1, lowNibbles);
 Vector128<byte> row0 = Vector128.ShuffleUnsafe(bitmapLookup0, lowNibbles);
 Vector128<byte> row1 = Vector128.ShuffleUnsafe(bitmapLookup1, lowNibbles);

 Vector128<byte> bitmask = Shuffle(Vector128.Create(0x8040201008040201).AsByte(), highNibbles);
 Vector128<byte> bitmask = Vector128.ShuffleUnsafe(Vector128.Create(0x8040201008040201).AsByte(), highNibbles);

 Vector128<byte> mask = Vector128.GreaterThan(highNibbles.AsSByte(), Vector128.Create((sbyte)0x7)).AsByte();
 Vector128<byte> bitsets = Vector128.ConditionalSelect(mask, row1, row0);
Expand DownExpand Up@@ -944,16 +944,6 @@ private static Vector256<byte> IndexOfAnyLookup<TNegator>(Vector256<byte> source
 return TNegator.NegateIfNeeded(result);
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 private static Vector128<byte> Shuffle(Vector128<byte> vector, Vector128<byte> indices)
 {
 // We're not using Vector128.Shuffle as the caller already accounts for and relies on differences in behavior between platforms.
 return
 Ssse3.IsSupported ? Ssse3.Shuffle(vector, indices) :
 AdvSimd.Arm64.IsSupported ? AdvSimd.Arm64.VectorTableLookup(vector, indices) :
 PackedSimd.Swizzle(vector, indices);
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 private static unsafe int ComputeFirstIndex<T, TNegator>(ref T searchSpace, ref T current, Vector128<byte> result)
 where TNegator : struct, INegator
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Vectorize ProbabilisticMap.IndexOfAny#80963

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.

 Sign up for GitHub

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

stephentoub
merged 9 commits into

from

Mar 10, 2023
 Merged


Vectorize ProbabilisticMap.IndexOfAny
#80963
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
bcb8f75

Vectorize ProbabilisticMap.IndexOfAny on AVX2


MihaZupan Jan 21, 2023
60819ff

Use ResetLowestSetBit from BitOperations


MihaZupan Jan 21, 2023
9bd28f4

Speed up Avx2 and add Vector128 support


MihaZupan Jan 21, 2023
71e7406

Add Vector{128/256}.LoadUnsafe(ref char) and Vector128.ShuffleUnsafe


MihaZupan Jan 26, 2023
44d8a93

Use Vector128.ShuffleUnsafe in more places


MihaZupan Feb 6, 2023
21c5d95

PR feedback


MihaZupan Feb 23, 2023
2295370

Replace another ShiftRightLogical with '>>>'


MihaZupan Feb 23, 2023
a753250

Add WASM path to Vector128.ShuffleUnsafe


MihaZupan Mar 8, 2023
978b4e8

PR feedback


MihaZupan Mar 9, 2023

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


9 changes: 2 additions & 7 deletions
src/libraries/Common/src/System/HexConverter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,13 +99,8 @@ internal static (Vector128<byte>, Vector128<byte>) AsciiToHexVector128(Vector128
 Vector128<byte> lowNibbles = Vector128.UnpackLow(shiftedSrc, src);
 Vector128<byte> highNibbles = Vector128.UnpackHigh(shiftedSrc, src);

 return (ShuffleUnsafe(hexMap, lowNibbles & Vector128.Create((byte)0xF)),
 ShuffleUnsafe(hexMap, highNibbles & Vector128.Create((byte)0xF)));

 // TODO: remove once https://github.com/dotnet/runtime/pull/80963 is merged
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 static Vector128<byte> ShuffleUnsafe(Vector128<byte> value, Vector128<byte> mask)
 => Ssse3.IsSupported ? Ssse3.Shuffle(value, mask) : AdvSimd.Arm64.VectorTableLookup(value, mask);
 return (Vector128.ShuffleUnsafe(hexMap, lowNibbles & Vector128.Create((byte)0xF)),
 Vector128.ShuffleUnsafe(hexMap, highNibbles & Vector128.Create((byte)0xF)));
 }

 private static void EncodeToUtf16_Vector128(ReadOnlySpan<byte> bytes, Span<char> chars, Casing casing)
Expand Down

11 changes: 4 additions & 7 deletions
src/libraries/System.Private.CoreLib/src/System/Buffers/Text/Base64Decoder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -477,20 +477,17 @@ private static unsafe void Avx2Decode(ref byte* srcBytes, ref byte* destBytes, b
 destBytes = dest;
 }

 // This can be replaced once https://github.com/dotnet/runtime/issues/63331 is implemented.
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 private static Vector128<byte> SimdShuffle(Vector128<byte> left, Vector128<byte> right, Vector128<byte> mask8F)
 {
 Debug.Assert((Ssse3.IsSupported || AdvSimd.Arm64.IsSupported) && BitConverter.IsLittleEndian);

 if (Ssse3.IsSupported)
 if (AdvSimd.Arm64.IsSupported)
 {
 return Ssse3.Shuffle(left, right);
 }
 else
 {
 return AdvSimd.Arm64.VectorTableLookup(left, Vector128.BitwiseAnd(right, mask8F));
 right &= mask8F;
Comment thread
stephentoub marked this conversation as resolved.


Outdated

 }

 return Vector128.ShuffleUnsafe(left, right);
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Private.CoreLib/src/System/Globalization/Ordinal.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,8 +88,8 @@ private static bool EqualsIgnoreCase_Vector128(ref char charA, ref char charB, i
 Vector128<ushort> vec2;
 do
 {
 vec1 = Vector128.LoadUnsafe(ref Unsafe.As<char, ushort>(ref charA), i);
 vec2 = Vector128.LoadUnsafe(ref Unsafe.As<char, ushort>(ref charB), i);
 vec1 = Vector128.LoadUnsafe(ref charA, i);
 vec2 = Vector128.LoadUnsafe(ref charB, i);

 if (!Utf16Utility.AllCharsInVector128AreAscii(vec1 | vec2))
 {
Expand Down

20 changes: 5 additions & 15 deletions
src/libraries/System.Private.CoreLib/src/System/IndexOfAnyValues/IndexOfAnyAsciiSearcher.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -860,10 +860,10 @@ private static Vector128<byte> IndexOfAnyLookupCore(Vector128<byte> source, Vect

 // The bitmapLookup represents a 8x16 table of bits, indicating whether a character is present in the needle.
 // Lookup the rows via the lower nibble and the column via the higher nibble.
 Vector128<byte> bitMask = Shuffle(bitmapLookup, lowNibbles);
 Vector128<byte> bitMask = Vector128.ShuffleUnsafe(bitmapLookup, lowNibbles);

 // For values above 127, the high nibble will be above 7. We construct the positions vector for the shuffle such that those values map to 0.
 Vector128<byte> bitPositions = Shuffle(Vector128.Create(0x8040201008040201, 0).AsByte(), highNibbles);
 Vector128<byte> bitPositions = Vector128.ShuffleUnsafe(Vector128.Create(0x8040201008040201, 0).AsByte(), highNibbles);

 Vector128<byte> result = bitMask & bitPositions;
 return result;
Expand DownExpand Up@@ -909,10 +909,10 @@ private static Vector128<byte> IndexOfAnyLookup<TNegator>(Vector128<byte> source
 Vector128<byte> lowNibbles = source & Vector128.Create((byte)0xF);
 Vector128<byte> highNibbles = Vector128.ShiftRightLogical(source.AsInt32(), 4).AsByte() & Vector128.Create((byte)0xF);

 Vector128<byte> row0 = Shuffle(bitmapLookup0, lowNibbles);
 Vector128<byte> row1 = Shuffle(bitmapLookup1, lowNibbles);
 Vector128<byte> row0 = Vector128.ShuffleUnsafe(bitmapLookup0, lowNibbles);
 Vector128<byte> row1 = Vector128.ShuffleUnsafe(bitmapLookup1, lowNibbles);

 Vector128<byte> bitmask = Shuffle(Vector128.Create(0x8040201008040201).AsByte(), highNibbles);
 Vector128<byte> bitmask = Vector128.ShuffleUnsafe(Vector128.Create(0x8040201008040201).AsByte(), highNibbles);

 Vector128<byte> mask = Vector128.GreaterThan(highNibbles.AsSByte(), Vector128.Create((sbyte)0x7)).AsByte();
 Vector128<byte> bitsets = Vector128.ConditionalSelect(mask, row1, row0);
Expand DownExpand Up@@ -944,16 +944,6 @@ private static Vector256<byte> IndexOfAnyLookup<TNegator>(Vector256<byte> source
 return TNegator.NegateIfNeeded(result);
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 private static Vector128<byte> Shuffle(Vector128<byte> vector, Vector128<byte> indices)
 {
 // We're not using Vector128.Shuffle as the caller already accounts for and relies on differences in behavior between platforms.
 return
 Ssse3.IsSupported ? Ssse3.Shuffle(vector, indices) :
 AdvSimd.Arm64.IsSupported ? AdvSimd.Arm64.VectorTableLookup(vector, indices) :
 PackedSimd.Swizzle(vector, indices);
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 private static unsafe int ComputeFirstIndex<T, TNegator>(ref T searchSpace, ref T current, Vector128<byte> result)
 where TNegator : struct, INegator
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Vectorize ProbabilisticMap.IndexOfAny#80963

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.

 Sign up for GitHub

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

stephentoub
merged 9 commits into

from

Mar 10, 2023
 Merged


Vectorize ProbabilisticMap.IndexOfAny
#80963
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
bcb8f75

Vectorize ProbabilisticMap.IndexOfAny on AVX2


MihaZupan Jan 21, 2023
60819ff

Use ResetLowestSetBit from BitOperations


MihaZupan Jan 21, 2023
9bd28f4

Speed up Avx2 and add Vector128 support


MihaZupan Jan 21, 2023
71e7406

Add Vector{128/256}.LoadUnsafe(ref char) and Vector128.ShuffleUnsafe


MihaZupan Jan 26, 2023
44d8a93

Use Vector128.ShuffleUnsafe in more places


MihaZupan Feb 6, 2023
21c5d95

PR feedback


MihaZupan Feb 23, 2023
2295370

Replace another ShiftRightLogical with '>>>'


MihaZupan Feb 23, 2023
a753250

Add WASM path to Vector128.ShuffleUnsafe


MihaZupan Mar 8, 2023
978b4e8

PR feedback


MihaZupan Mar 9, 2023

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


9 changes: 2 additions & 7 deletions
src/libraries/Common/src/System/HexConverter.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,13 +99,8 @@ internal static (Vector128<byte>, Vector128<byte>) AsciiToHexVector128(Vector128
 Vector128<byte> lowNibbles = Vector128.UnpackLow(shiftedSrc, src);
 Vector128<byte> highNibbles = Vector128.UnpackHigh(shiftedSrc, src);

 return (ShuffleUnsafe(hexMap, lowNibbles & Vector128.Create((byte)0xF)),
 ShuffleUnsafe(hexMap, highNibbles & Vector128.Create((byte)0xF)));

 // TODO: remove once https://github.com/dotnet/runtime/pull/80963 is merged
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 static Vector128<byte> ShuffleUnsafe(Vector128<byte> value, Vector128<byte> mask)
 => Ssse3.IsSupported ? Ssse3.Shuffle(value, mask) : AdvSimd.Arm64.VectorTableLookup(value, mask);
 return (Vector128.ShuffleUnsafe(hexMap, lowNibbles & Vector128.Create((byte)0xF)),
 Vector128.ShuffleUnsafe(hexMap, highNibbles & Vector128.Create((byte)0xF)));
 }

 private static void EncodeToUtf16_Vector128(ReadOnlySpan<byte> bytes, Span<char> chars, Casing casing)
Expand Down

11 changes: 4 additions & 7 deletions
src/libraries/System.Private.CoreLib/src/System/Buffers/Text/Base64Decoder.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -477,20 +477,17 @@ private static unsafe void Avx2Decode(ref byte* srcBytes, ref byte* destBytes, b
 destBytes = dest;
 }

 // This can be replaced once https://github.com/dotnet/runtime/issues/63331 is implemented.
 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 private static Vector128<byte> SimdShuffle(Vector128<byte> left, Vector128<byte> right, Vector128<byte> mask8F)
 {
 Debug.Assert((Ssse3.IsSupported || AdvSimd.Arm64.IsSupported) && BitConverter.IsLittleEndian);

 if (Ssse3.IsSupported)
 if (AdvSimd.Arm64.IsSupported)
 {
 return Ssse3.Shuffle(left, right);
 }
 else
 {
 return AdvSimd.Arm64.VectorTableLookup(left, Vector128.BitwiseAnd(right, mask8F));
 right &= mask8F;
Comment thread
stephentoub marked this conversation as resolved.


Outdated

 }

 return Vector128.ShuffleUnsafe(left, right);
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Private.CoreLib/src/System/Globalization/Ordinal.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,8 +88,8 @@ private static bool EqualsIgnoreCase_Vector128(ref char charA, ref char charB, i
 Vector128<ushort> vec2;
 do
 {
 vec1 = Vector128.LoadUnsafe(ref Unsafe.As<char, ushort>(ref charA), i);
 vec2 = Vector128.LoadUnsafe(ref Unsafe.As<char, ushort>(ref charB), i);
 vec1 = Vector128.LoadUnsafe(ref charA, i);
 vec2 = Vector128.LoadUnsafe(ref charB, i);

 if (!Utf16Utility.AllCharsInVector128AreAscii(vec1 | vec2))
 {
Expand Down

20 changes: 5 additions & 15 deletions
src/libraries/System.Private.CoreLib/src/System/IndexOfAnyValues/IndexOfAnyAsciiSearcher.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -860,10 +860,10 @@ private static Vector128<byte> IndexOfAnyLookupCore(Vector128<byte> source, Vect

 // The bitmapLookup represents a 8x16 table of bits, indicating whether a character is present in the needle.
 // Lookup the rows via the lower nibble and the column via the higher nibble.
 Vector128<byte> bitMask = Shuffle(bitmapLookup, lowNibbles);
 Vector128<byte> bitMask = Vector128.ShuffleUnsafe(bitmapLookup, lowNibbles);

 // For values above 127, the high nibble will be above 7. We construct the positions vector for the shuffle such that those values map to 0.
 Vector128<byte> bitPositions = Shuffle(Vector128.Create(0x8040201008040201, 0).AsByte(), highNibbles);
 Vector128<byte> bitPositions = Vector128.ShuffleUnsafe(Vector128.Create(0x8040201008040201, 0).AsByte(), highNibbles);

 Vector128<byte> result = bitMask & bitPositions;
 return result;
Expand DownExpand Up@@ -909,10 +909,10 @@ private static Vector128<byte> IndexOfAnyLookup<TNegator>(Vector128<byte> source
 Vector128<byte> lowNibbles = source & Vector128.Create((byte)0xF);
 Vector128<byte> highNibbles = Vector128.ShiftRightLogical(source.AsInt32(), 4).AsByte() & Vector128.Create((byte)0xF);

 Vector128<byte> row0 = Shuffle(bitmapLookup0, lowNibbles);
 Vector128<byte> row1 = Shuffle(bitmapLookup1, lowNibbles);
 Vector128<byte> row0 = Vector128.ShuffleUnsafe(bitmapLookup0, lowNibbles);
 Vector128<byte> row1 = Vector128.ShuffleUnsafe(bitmapLookup1, lowNibbles);

 Vector128<byte> bitmask = Shuffle(Vector128.Create(0x8040201008040201).AsByte(), highNibbles);
 Vector128<byte> bitmask = Vector128.ShuffleUnsafe(Vector128.Create(0x8040201008040201).AsByte(), highNibbles);

 Vector128<byte> mask = Vector128.GreaterThan(highNibbles.AsSByte(), Vector128.Create((sbyte)0x7)).AsByte();
 Vector128<byte> bitsets = Vector128.ConditionalSelect(mask, row1, row0);
Expand DownExpand Up@@ -944,16 +944,6 @@ private static Vector256<byte> IndexOfAnyLookup<TNegator>(Vector256<byte> source
 return TNegator.NegateIfNeeded(result);
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 private static Vector128<byte> Shuffle(Vector128<byte> vector, Vector128<byte> indices)
 {
 // We're not using Vector128.Shuffle as the caller already accounts for and relies on differences in behavior between platforms.
 return
 Ssse3.IsSupported ? Ssse3.Shuffle(vector, indices) :
 AdvSimd.Arm64.IsSupported ? AdvSimd.Arm64.VectorTableLookup(vector, indices) :
 PackedSimd.Swizzle(vector, indices);
 }

 [MethodImpl(MethodImplOptions.AggressiveInlining)]
 private static unsafe int ComputeFirstIndex<T, TNegator>(ref T searchSpace, ref T current, Vector128<byte> result)
 where TNegator : struct, INegator
Expand Down
Loading