Skip to content
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.

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

[mono] Pre-compute and cache class name hashes #100847

Merged
merged 1 commit into from
Apr 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/mono/mono/metadata/class-getters.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ MONO_CLASS_GETTER(m_class_get_parent, MonoClass *, , MonoClass, parent)
MONO_CLASS_GETTER(m_class_get_nested_in, MonoClass *, , MonoClass, nested_in)
MONO_CLASS_GETTER(m_class_get_image, MonoImage *, , MonoClass, image)
MONO_CLASS_GETTER(m_class_get_name, const char *, , MonoClass, name)
MONO_CLASS_GETTER(m_class_get_name_hash, guint, , MonoClass, name_hash)
MONO_CLASS_GETTER(m_class_get_name_space, const char *, , MonoClass, name_space)
MONO_CLASS_GETTER(m_class_get_type_token, guint32, , MonoClass, type_token)
MONO_CLASS_GETTER(m_class_get_vtable_size, int, , MonoClass, vtable_size)
Expand Down
5 changes: 5 additions & 0 deletions src/mono/mono/metadata/class-init.c
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,7 @@ mono_class_create_from_typedef (MonoImage *image, guint32 type_token, MonoError
}

klass->name = name;
klass->name_hash = mono_metadata_str_hash (name);
klass->name_space = nspace;

MONO_PROFILER_RAISE (class_loading, (klass));
Expand Down Expand Up @@ -909,6 +910,7 @@ mono_class_create_generic_inst (MonoGenericClass *gclass)
}

klass->name = gklass->name;
klass->name_hash = gklass->name_hash;
klass->name_space = gklass->name_space;

klass->image = gklass->image;
Expand Down Expand Up @@ -1154,6 +1156,7 @@ mono_class_create_bounded_array (MonoClass *eclass, guint32 rank, gboolean bound
name [nsize + maxrank + bounded] = ']';
name [nsize + maxrank + bounded + 1] = 0;
klass->name = mm ? mono_mem_manager_strdup (mm, name) : mono_image_strdup (image, name);
klass->name_hash = mono_metadata_str_hash (klass->name);
g_free (name);

klass->type_token = 0;
Expand Down Expand Up @@ -1508,6 +1511,7 @@ mono_class_create_ptr (MonoType *type)
result->name_space = el_class->name_space;
name = g_strdup_printf ("%s*", el_class->name);
result->name = mm ? mono_mem_manager_strdup (mm, name) : mono_image_strdup (image, name);
result->name_hash = mono_metadata_str_hash (result->name);
result->class_kind = MONO_CLASS_POINTER;
g_free (name);

Expand Down Expand Up @@ -1585,6 +1589,7 @@ mono_class_create_fnptr (MonoMethodSignature *sig)
result->parent = NULL; /* no parent for PTR types */
result->name_space = "System";
result->name = "MonoFNPtrFakeClass";
result->name_hash = mono_metadata_str_hash (result->name);
result->class_kind = MONO_CLASS_POINTER;

result->image = mono_defaults.corlib; /* need to fix... */
Expand Down
3 changes: 2 additions & 1 deletion src/mono/mono/metadata/class-private-definition.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ struct _MonoClass {
guint16 *interface_offsets_packed;
guint8 *interface_bitmap;

gint32 inlinearray_value; /* System.Runtime.CompilerServices.InlineArrayAttribute length value */
gint32 inlinearray_value; /* System.Runtime.CompilerServices.InlineArrayAttribute length value */
guint name_hash;

MonoClass **interfaces;

Expand Down
6 changes: 3 additions & 3 deletions src/mono/mono/metadata/metadata.c
Original file line number Diff line number Diff line change
Expand Up @@ -1931,7 +1931,7 @@ static guint
mono_generic_class_hash (gconstpointer data)
{
const MonoGenericClass *gclass = (const MonoGenericClass *) data;
guint hash = mono_metadata_str_hash (m_class_get_name (gclass->container_class));
guint hash = m_class_get_name_hash (gclass->container_class);

hash *= 13;
hash += gclass->is_tb_open;
Expand Down Expand Up @@ -5611,8 +5611,8 @@ mono_metadata_type_hash (MonoType *t1)
* inserted in a bunch of hash tables before been finished.
*/
if (image_is_dynamic (m_class_get_image (klass)))
return ((m_type_is_byref (t1) ? 1 : 0) << 6) | mono_metadata_str_hash (m_class_get_name (klass));
return ((hash << 5) - hash) ^ mono_metadata_str_hash (m_class_get_name (klass));
return ((m_type_is_byref (t1) ? 1 : 0) << 6) | m_class_get_name_hash (klass);
return ((hash << 5) - hash) ^ m_class_get_name_hash (klass);
}
case MONO_TYPE_PTR:
return ((hash << 5) - hash) ^ mono_metadata_type_hash (t1->data.type);
Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono/metadata/object.c
Original file line number Diff line number Diff line change
Expand Up @@ -1343,7 +1343,7 @@ mono_method_get_imt_slot (MonoMethod *method)
}

/* Initialize hashes */
hashes [0] = mono_metadata_str_hash (m_class_get_name (method->klass));
hashes [0] = m_class_get_name_hash (method->klass);
hashes [1] = mono_metadata_str_hash (m_class_get_name_space (method->klass));
hashes [2] = mono_metadata_str_hash (method->name);
hashes [3] = mono_metadata_type_hash (sig->ret);
Expand Down
4 changes: 2 additions & 2 deletions src/mono/mono/mini/aot-compiler.c
Original file line number Diff line number Diff line change
Expand Up @@ -11181,7 +11181,7 @@ mono_aot_type_hash (MonoType *t1)
case MONO_TYPE_CLASS:
case MONO_TYPE_SZARRAY:
/* check if the distribution is good enough */
return ((hash << 5) - hash) ^ mono_metadata_str_hash (m_class_get_name (t1->data.klass));
return ((hash << 5) - hash) ^ m_class_get_name_hash (t1->data.klass);
case MONO_TYPE_PTR:
return ((hash << 5) - hash) ^ mono_metadata_type_hash (t1->data.type);
case MONO_TYPE_ARRAY:
Expand Down Expand Up @@ -11251,7 +11251,7 @@ mono_aot_method_hash (MonoMethod *method)
hashes [1] = 0;
g_free (full_name);
} else {
hashes [0] = mono_metadata_str_hash (m_class_get_name (klass));
hashes [0] = m_class_get_name_hash (klass);
hashes [1] = mono_metadata_str_hash (m_class_get_name_space (klass));
}
if (method->wrapper_type == MONO_WRAPPER_MANAGED_TO_NATIVE && mono_marshal_get_wrapper_info (method)->subtype == WRAPPER_SUBTYPE_ICALL_WRAPPER)
Expand Down
Loading