Extend Equals/StartsWith auto-vectorization for OrdinalIgnoreCase #66095
Conversation
This file contains 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
ghost
assigned 
dotnet-issue-labeler
bot
added
the
area-CodeGen-coreclr
|
Tagging subscribers to this area: @JulieLeeMSFT Issue DetailsThis PR adds if the constant value contains at least one non-ASCII char (>127) - we give up on optimizing it. Codegen examplebool EqualsCoreLib(string s) =>
s.Equals("System.Private.CoreLib.dll", StringComparison.OrdinalIgnoreCase);New codegen: ; Method EqualsCoreLib(System.String):bool:this
G_M43376_IG01:
vzeroupper
G_M43376_IG02:
cmp dword ptr [rdx+8], 26
jne SHORT G_M43376_IG04
G_M43376_IG03:
vmovupd ymm0, ymmword ptr[rdx+12]
vpor ymm0, ymm0, ymmword ptr[reloc @RWD00] ;; ToLower
vpxor ymm0, ymm0, ymmword ptr[reloc @RWD32]
vmovupd ymm1, ymmword ptr[rdx+32]
vpor ymm1, ymm1, ymmword ptr[reloc @RWD64] ;; ToLower
vpxor ymm1, ymm1, ymmword ptr[reloc @RWD96]
vpor ymm0, ymm0, ymm1
vptest ymm0, ymm0
sete al
movzx rax, al
jmp SHORT G_M43376_IG05
G_M43376_IG04:
xor eax, eax
G_M43376_IG05:
movzx rax, al
G_M43376_IG06:
vzeroupper
ret
RWD00 dq 0020002000200020h, 0020000000200020h, 0020002000200020h, 0020000000200020h
RWD32 dq 0074007300790073h, 0070002E006D0065h, 0061007600690072h, 0063002E00650074h
RWD64 dq 0020002000200020h, 0020002000200000h, 0020002000200020h, 0020002000200000h
RWD96 dq 0065007400610076h, 0072006F0063002Eh, 00620069006C0065h, 006C006C0064002Eh
; Total bytes of code: 77Benchmarkusing System;
using BenchmarkDotNet.Attributes;
using BenchmarkDotNet.Running;
BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args);
public class Benchmarks
{
const StringComparison cmp = StringComparison.OrdinalIgnoreCase;
[Benchmark]
[Arguments("https://bing.com")]
public bool StartsWithBing(string s) => s.StartsWith("https://bing", cmp);
[Benchmark]
[Arguments("XMLFILE")]
public bool StartsWithXml(string s) => s.StartsWith("xml", cmp);
[Benchmark]
[Arguments("system.private.corelib.dll")]
public bool EqualsCoreLib(string s) => s.Equals("System.Private.CoreLib.dll", cmp );
}
10-20x faster for these cases. #65288 added tests which also cover
|
am11
reviewed
Mar 2, 2022
This was referenced Mar 2, 2022
|
cc @dotnet/jit-contrib @AndyAyersMS |
AndyAyersMS
reviewed
Mar 8, 2022
AndyAyersMS
approved these changes
Mar 8, 2022
echesakov
approved these changes
Mar 9, 2022
|
|
||
| // We can use e.g. UINT here to support SIMD for 32bit as well, | ||
| // but it significantly complicates code, so 32bit support is left up-for-grabs | ||
| assert(sizeof(ssize_t) == 8); |
There was a problem hiding this comment.
You could use static_assert(...) here, so the code would never be enabled.
There was a problem hiding this comment.
good idea, will change in a follow up PR
| vec1 = gtNewSimdBinOpNode(GT_OR, simdType, vec1, toLowerVec1, baseType, simdSize, false); | ||
| vec2 = gtNewSimdBinOpNode(GT_OR, simdType, vec2, toLowerVec2, baseType, simdSize, false); | ||
| } | ||
|
|
||
| // ((v1 ^ cns1) | (v2 ^ cns2)) == zero | ||
| GenTree* xor1 = gtNewSimdBinOpNode(GT_XOR, simdType, vec1, cnsVec1, baseType, simdSize, false); | ||
| GenTree* xor2 = gtNewSimdBinOpNode(GT_XOR, simdType, vec2, cnsVec2, baseType, simdSize, false); | ||
| GenTree* orr = gtNewSimdBinOpNode(GT_OR, simdType, xor1, xor2, baseType, simdSize, false); | ||
| return gtNewSimdHWIntrinsicNode(TYP_BOOL, useSingleVector ? xor1 : orr, zero, niEquals, baseType, simdSize); |
There was a problem hiding this comment.
What happens when useSingleVector is true. xor2 and orr trees are just abandoned?
There was a problem hiding this comment.
Yes, but I assume it's a rare case, basically, 6.25% probability 😄 I was not sure it was worth it to add more control flow here or DEBUG_DESTROY
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This PR adds
OrdinalIgnoreCasesupport to #65288 by injectingx | ToLowerMaskoperation where ToLowerMask looks like this for e.g for"ab1-C"constant value:if the constant value contains at least one non-ASCII char (>127) - we give up on optimizing it.
Codegen example
New codegen:
Benchmark
10-20x faster for these cases.
#65288 added tests which also cover
OrdinalIgnoreCasebut I might add more.jit-diff -f --crossgen
132 methods improved, I know that aspnetcore also uses it a lot.