Skip to content

Improve JSON (de)serialization perf of longer strings on mono #39733

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
steveharter merged 4 commits into from
Aug 14, 2020
Merged

Improve JSON (de)serialization perf of longer strings on mono #39733

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d4ac72
Perf improvements for mono
steveharter Jul 17, 2020
ba6b7ca
Check for RuntimeFeature.IsDynamicCodeSupported to allow loop unrolling
steveharter Aug 4, 2020
8a44188
Change to IsDynamicCodeCompiled
steveharter Aug 5, 2020
31ea3ca
Undo STJ changes and assume mono interpreter will intrinsify
steveharter Aug 10, 2020
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
18 changes: 16 additions & 2 deletions ...em.Text.Encodings.Web/src/System/Text/Encodings/Web/DefaultJavaScriptEncoderBasicLatin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,19 @@ public override unsafe int FindFirstCharacterToEncode(char* text, int textLength
#endif
Debug.Assert(textLength > 0 && ptr < end);

// For performance on the Mono interpreter, avoid referencing the static table for every value.
ReadOnlySpan<byte> allowListLocal = AllowList;

do
{
Debug.Assert(text <= ptr && ptr < (text + textLength));

if (NeedsEscaping(*(char*)ptr))
char value = *(char*)ptr;

// NeedsEscaping() is lifted below for perf; verify semantics remain consistent.
Debug.Assert((value > LastAsciiCharacter || allowListLocal[value] == 0) == NeedsEscaping(value));

if (value > LastAsciiCharacter || allowListLocal[value] == 0)
{
goto Return;
}
Expand Down Expand Up @@ -276,11 +284,17 @@ public override unsafe int FindFirstCharacterToEncodeUtf8(ReadOnlySpan<byte> utf
#endif
Debug.Assert(textLength > 0 && ptr < end);

// For performance on the Mono interpreter, avoid referencing the static table for every value.
ReadOnlySpan<byte> allowListLocal = AllowList;

do
{
Debug.Assert(pValue <= ptr && ptr < (pValue + utf8Text.Length));

if (NeedsEscaping(*ptr))
// NeedsEscaping() is lifted below for perf; verify semantics remain consistent.
Debug.Assert((allowListLocal[*ptr] == 0) == NeedsEscaping(*ptr));

if (allowListLocal[*ptr] == 0)
{
goto Return;
}
Expand Down