Skip to content

[release/6.0-rc2] [interp] Add wide data item index static load and stores #59262

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
steveisok merged 9 commits into from
Sep 21, 2021
Merged

[release/6.0-rc2] [interp] Add wide data item index static load and stores #59262

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
83dd78a
warn if there's a ton of data items
lambdageek Sep 15, 2021
284e80d
[interp] Add stsfld.vt.w interpreter opcode
lambdageek Sep 16, 2021
f9f29d9
Add ldsfld.vt.w opcode
lambdageek Sep 16, 2021
f98a183
[mono] Log debug message when running .cctors
lambdageek Sep 16, 2021
74d28cd
drop hacky logging
lambdageek Sep 16, 2021
79d4938
fix whitespace
lambdageek Sep 16, 2021
a8fe4ff
Address review feedback
lambdageek Sep 17, 2021
84e0e5b
Fix wide index boundary conditions
lambdageek Sep 17, 2021
b61e9b3
Rename opcodes to ldsfld.w and stsfld.w
lambdageek Sep 17, 2021
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
6 changes: 6 additions & 0 deletions src/mono/mono/metadata/object.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@ mono_runtime_run_module_cctor (MonoImage *image, MonoError *error)
MonoClass *module_klass;
MonoVTable *module_vtable;

mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_TYPE, "Running module .cctor for '%s'", image->name);
module_klass = mono_class_get_checked (image, MONO_TOKEN_TYPE_DEF | 1, error);
if (!module_klass) {
return FALSE;
Expand Down Expand Up @@ -522,6 +523,11 @@ mono_runtime_class_init_full (MonoVTable *vtable, MonoError *error)
if (do_initialization) {
MonoException *exc = NULL;

if (mono_trace_is_traced (G_LOG_LEVEL_DEBUG, MONO_TRACE_TYPE)) {
char* type_name = mono_type_full_name (m_class_get_byval_arg (klass));
mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_TYPE, "Running class .cctor for %s from '%s'", type_name, m_class_get_image (klass)->name);
g_free (type_name);
}
/* We are holding the per-vtable lock, do the actual initialization */

mono_threads_begin_abort_protected_block ();
Expand Down
20 changes: 20 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 @@ -5418,6 +5418,16 @@ MINT_IN_CASE(MINT_BRTRUE_I8_SP) ZEROP_SP(gint64, !=); MINT_IN_BREAK;
MINT_IN_BREAK;
}

MINT_IN_CASE(MINT_LDSFLD_W) {
MonoVTable *vtable = (MonoVTable*) frame->imethod->data_items [READ32 (ip + 2)];
INIT_VTABLE (vtable);
gpointer addr = frame->imethod->data_items [READ32 (ip + 4)];
MonoClass *klass = frame->imethod->data_items [READ32 (ip + 6)];
stackval_from_data (m_class_get_byval_arg (klass), (stackval*)(locals + ip [1]), addr, FALSE);
ip += 8;
MINT_IN_BREAK;
}

#define STSFLD(datatype, fieldtype) { \
MonoVTable *vtable = (MonoVTable*) frame->imethod->data_items [ip [2]]; \
INIT_VTABLE (vtable); \
Expand All @@ -5444,6 +5454,16 @@ MINT_IN_CASE(MINT_BRTRUE_I8_SP) ZEROP_SP(gint64, !=); MINT_IN_BREAK;
MINT_IN_BREAK;
}

MINT_IN_CASE(MINT_STSFLD_W) {
MonoVTable *vtable = (MonoVTable*) frame->imethod->data_items [READ32 (ip + 2)];
INIT_VTABLE (vtable);
gpointer addr = frame->imethod->data_items [READ32 (ip + 4)];
MonoClass *klass = frame->imethod->data_items [READ32 (ip + 6)];
stackval_to_data (m_class_get_byval_arg (klass), (stackval*)(locals + ip [1]), addr, FALSE);
ip += 8;
MINT_IN_BREAK;
}

MINT_IN_CASE(MINT_STOBJ_VT) {
MonoClass *c = (MonoClass*)frame->imethod->data_items [ip [3]];
mono_value_copy_internal (LOCAL_VAR (ip [1], gpointer), locals + ip [2], c);
Expand Down
2 changes: 2 additions & 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 @@ -85,6 +85,7 @@ OPDEF(MINT_LDSFLD_R4, "ldsfld.r4", 4, 1, 0, MintOpUShortInt)
OPDEF(MINT_LDSFLD_R8, "ldsfld.r8", 4, 1, 0, MintOpUShortInt)
OPDEF(MINT_LDSFLD_O, "ldsfld.o", 4, 1, 0, MintOpUShortInt)
OPDEF(MINT_LDSFLD_VT, "ldsfld.vt", 5, 1, 0, MintOpTwoShorts)
OPDEF(MINT_LDSFLD_W, "ldsfld.w", 8, 1, 0, MintOpTwoInts)

OPDEF(MINT_STSFLD_I1, "stsfld.i1", 4, 0, 1, MintOpUShortInt)
OPDEF(MINT_STSFLD_U1, "stsfld.u1", 4, 0, 1, MintOpUShortInt)
Expand All @@ -96,6 +97,7 @@ OPDEF(MINT_STSFLD_R4, "stsfld.r4", 4, 0, 1, MintOpUShortInt)
OPDEF(MINT_STSFLD_R8, "stsfld.r8", 4, 0, 1, MintOpUShortInt)
OPDEF(MINT_STSFLD_O, "stsfld.o", 4, 0, 1, MintOpUShortInt)
OPDEF(MINT_STSFLD_VT, "stsfld.vt", 5, 0, 1, MintOpTwoShorts)
OPDEF(MINT_STSFLD_W, "stsfld.w", 8, 0, 1, MintOpTwoInts)
OPDEF(MINT_LDSFLDA, "ldsflda", 4, 1, 0, MintOpTwoShorts)
OPDEF(MINT_LDTSFLDA, "ldtsflda", 4, 1, 0, MintOpInt)

Expand Down
1 change: 1 addition & 0 deletions src/mono/mono/mini/interp/mintops.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ typedef enum
MintOpFieldToken,
MintOpClassToken,
MintOpTwoShorts,
MintOpTwoInts,
MintOpShortAndInt,
MintOpShortAndShortBranch,
MintOpPair2,
Expand Down
57 changes: 48 additions & 9 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 @@ -1093,11 +1093,11 @@ store_local (TransformData *td, int local)
td->last_ins->data [0] = td->locals [local].size;
}

static guint16
get_data_item_index (TransformData *td, void *ptr)
static guint32
get_data_item_wide_index (TransformData *td, void *ptr)
{
gpointer p = g_hash_table_lookup (td->data_hash, ptr);
guint index;
guint32 index;
if (p != NULL)
return GPOINTER_TO_UINT (p) - 1;
if (td->max_data_items == td->n_data_items) {
Expand All @@ -1111,6 +1111,20 @@ get_data_item_index (TransformData *td, void *ptr)
return index;
}

static guint16
get_data_item_index (TransformData *td, void *ptr)
{
guint32 index = get_data_item_wide_index (td, ptr);
g_assertf (index <= G_MAXUINT16, "Interpreter data item index 0x%x for method '%s' overflows", index, td->method->name);
return (guint16)index;
}

static gboolean
is_data_item_wide_index (guint32 data_item_index)
{
return data_item_index > G_MAXUINT16;
}

static guint16
get_data_item_index_nonshared (TransformData *td, void *ptr)
{
Expand Down Expand Up @@ -1347,6 +1361,9 @@ dump_interp_ins_data (InterpInst *ins, gint32 ins_offset, const guint16 *data, g
case MintOpTwoShorts:
g_string_append_printf (str, " %u,%u", *(guint16*)data, *(guint16 *)(data + 1));
break;
case MintOpTwoInts:
g_string_append_printf (str, " %u,%u", (guint32)READ32(data), (guint32)READ32(data + 2));
break;
case MintOpShortAndInt:
g_string_append_printf (str, " %u,%u", *(guint16*)data, (guint32)READ32(data + 1));
break;
Expand Down Expand Up @@ -4199,7 +4216,20 @@ interp_emit_sfld_access (TransformData *td, MonoClassField *field, MonoClass *fi
if (interp_emit_load_const (td, field_addr, mt))
return;
}
if (mt == MINT_TYPE_VT) {
}
guint32 vtable_index = get_data_item_wide_index (td, vtable);
guint32 addr_index = get_data_item_wide_index (td, (char*)field_addr);
gboolean wide_data = is_data_item_wide_index (vtable_index) || is_data_item_wide_index (addr_index);
guint32 klass_index = !wide_data ? 0 : get_data_item_wide_index (td, field_class);
if (is_load) {
if (G_UNLIKELY (wide_data)) {
interp_add_ins (td, MINT_LDSFLD_W);
if (mt == MINT_TYPE_VT) {
push_type_vt (td, field_class, size);
} else {
push_type (td, stack_type [mt], field_class);
}
} else if (mt == MINT_TYPE_VT) {
interp_add_ins (td, MINT_LDSFLD_VT);
push_type_vt (td, field_class, size);
} else {
Expand All @@ -4208,15 +4238,24 @@ interp_emit_sfld_access (TransformData *td, MonoClassField *field, MonoClass *fi
}
interp_ins_set_dreg (td->last_ins, td->sp [-1].local);
} else {
interp_add_ins (td, (mt == MINT_TYPE_VT) ? MINT_STSFLD_VT : (MINT_STSFLD_I1 + mt - MINT_TYPE_I1));
if (G_LIKELY (!wide_data))
interp_add_ins (td, (mt == MINT_TYPE_VT) ? MINT_STSFLD_VT : (MINT_STSFLD_I1 + mt - MINT_TYPE_I1));
else
interp_add_ins (td, MINT_STSFLD_W);
td->sp--;
interp_ins_set_sreg (td->last_ins, td->sp [0].local);
}

td->last_ins->data [0] = get_data_item_index (td, vtable);
td->last_ins->data [1] = get_data_item_index (td, (char*)field_addr);
if (mt == MINT_TYPE_VT)
td->last_ins->data [2] = size;
if (G_LIKELY (!wide_data)) {
td->last_ins->data [0] = (guint16) vtable_index;
td->last_ins->data [1] = (guint16) addr_index;
if (mt == MINT_TYPE_VT)
td->last_ins->data [2] = size;
} else {
WRITE32_INS (td->last_ins, 0, &vtable_index);
WRITE32_INS (td->last_ins, 2, &addr_index);
WRITE32_INS (td->last_ins, 4, &klass_index);
}

}
}
Expand Down