Skip to content

[interp] Intrinsify IndexOfOrLessThan #40705

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

Closed
wants to merge 1 commit into from
Closed

[interp] Intrinsify IndexOfOrLessThan #40705

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions src/libraries/System.Text.Json/src/System/Text/Json/Reader/JsonReaderHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ ref MemoryMarshal.GetReference(span),
span.Length);
}

// Intrinsified in mono interpreter
private static unsafe int IndexOfOrLessThan(ref byte searchSpace, byte value0, byte value1, byte lessThan, int length)
{
Debug.Assert(length >= 0);
Expand Down
12 changes: 12 additions & 0 deletions src/mono/mono/mini/interp/interp-intrins.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,3 +138,15 @@ interp_intrins_widen_ascii_to_utf16 (guint8 *pAsciiBuffer, mono_unichar2 *pUtf16
}
return currentOffset;
}

int
interp_intrins_json_index_of_lt (guint8 *searchSpace, guint8 value0, guint8 value1, guint8 lessThan, gint32 length)
{
for (int i = 0; i < length; i++) {
guint8 value = searchSpace [i];
if (value0 == value || value1 == value || lessThan > value)
return i;
}

return -1;
}
3 changes: 3 additions & 0 deletions src/mono/mono/mini/interp/interp-intrins.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,7 @@ interp_intrins_u32_to_decstr (guint32 value, MonoArray *cache, MonoVTable *vtabl
mono_u
interp_intrins_widen_ascii_to_utf16 (guint8 *pAsciiBuffer, mono_unichar2 *pUtf16Buffer, mono_u elementCount);

int
interp_intrins_json_index_of_lt (guint8 *searchSpace, guint8 value0, guint8 value1, guint8 lessThan, gint32 length);

#endif /* __MONO_MINI_INTERP_INTRINSICS_H__ */
6 changes: 6 additions & 0 deletions src/mono/mono/mini/interp/interp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5355,6 +5355,12 @@ interp_exec_method (InterpFrame *frame, ThreadContext *context, FrameClauseArgs
ip++;
MINT_IN_BREAK;
}
MINT_IN_CASE(MINT_INTRINS_JSON_INDEX_OF_LT) {
sp -= 4;
sp [-1].data.i = interp_intrins_json_index_of_lt ((guint8*)sp [-1].data.p, (guint8)sp [0].data.i, (guint8)sp [1].data.i, (guint8)sp [2].data.i, sp [3].data.i);
ip++;
MINT_IN_BREAK;
}
MINT_IN_CASE(MINT_INTRINS_UNSAFE_BYTE_OFFSET) {
sp -= 2;
sp [0].data.nati = (guint8*)sp [1].data.p - (guint8*)sp [0].data.p;
Expand Down
1 change: 1 addition & 0 deletions src/mono/mono/mini/interp/mintops.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,3 +800,4 @@ OPDEF(MINT_INTRINS_ORDINAL_IGNORE_CASE_ASCII, "intrins_ordinal_ignore_case_ascii
OPDEF(MINT_INTRINS_64ORDINAL_IGNORE_CASE_ASCII, "intrins_64ordinal_ignore_case_ascii", 1, Pop2, Push1, MintOpNoArgs)
OPDEF(MINT_INTRINS_U32_TO_DECSTR, "intrins_u32_to_decstr", 3, Pop1, Push1, MintOpNoArgs)
OPDEF(MINT_INTRINS_WIDEN_ASCII_TO_UTF16, "intrins_widen_ascii_to_utf16", 1, Pop3, Push1, MintOpNoArgs)
OPDEF(MINT_INTRINS_JSON_INDEX_OF_LT, "intrins_json_index_of_lt", 1, Pop5, Push1, MintOpNoArgs)
5 changes: 5 additions & 0 deletions src/mono/mono/mini/interp/transform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1895,6 +1895,11 @@ interp_handle_intrinsics (TransformData *td, MonoMethod *target_method, MonoClas
!strncmp ("System.Runtime.Intrinsics", klass_name_space, 25) &&
!strcmp (tm, "get_IsSupported")) {
*op = MINT_LDC_I4_0;
} else if (!strcmp (m_class_get_image (target_method->klass)->assembly_name, "System.Text.Json") &&
!strcmp (klass_name_space, "System.Text.Json") &&
!strcmp (klass_name, "JsonReaderHelper")) {
Copy link
Member Author

@BrzVlad BrzVlad Aug 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure if this check is rigorous enough

if (!strcmp (tm, "IndexOfOrLessThan"))
*op = MINT_INTRINS_JSON_INDEX_OF_LT;
}
#endif

Expand Down