Skip to content

Prefer vectorized ProbabilisticMap over Latin1CharSearchValues #89981

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
merged 1 commit into from
Aug 4, 2023
Merged

Prefer vectorized ProbabilisticMap over Latin1CharSearchValues #89981

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions src/libraries/System.Private.CoreLib/src/System/SearchValues/SearchValues.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using System.Runtime.Intrinsics.Wasm;
using System.Runtime.Intrinsics.X86;

Expand Down Expand Up @@ -134,12 +135,6 @@ ref Unsafe.As<char, short>(ref MemoryMarshal.GetReference(values)),
return new Any5SearchValues<char, short>(shortValues);
}

if (maxInclusive < 256)
{
// This will also match ASCII values when IndexOfAnyAsciiSearcher is not supported
return new Latin1CharSearchValues(values);
}

scoped ReadOnlySpan<char> probabilisticValues = values;

if (Vector128.IsHardwareAccelerated && values.Length < 8)
Expand All @@ -162,6 +157,13 @@ ref Unsafe.As<char, short>(ref MemoryMarshal.GetReference(values)),
: new ProbabilisticWithAsciiCharSearchValues<IndexOfAnyAsciiSearcher.Default>(probabilisticValues);
}

// We prefer using the ProbabilisticMap over Latin1CharSearchValues if the former is vectorized.
if (!(Sse41.IsSupported || AdvSimd.Arm64.IsSupported) && maxInclusive < 256)
{
// This will also match ASCII values when IndexOfAnyAsciiSearcher is not supported.
return new Latin1CharSearchValues(values);
}

return new ProbabilisticCharSearchValues(probabilisticValues);
}

Expand Down