Skip to content

[DRAFT][mono][aot] Implementation of nollvm init method #89074

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 17 commits into from
Closed

[DRAFT][mono][aot] Implementation of nollvm init method #89074

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a6b88f9
Preliminary work for nollvm init method
Jun 30, 2023
c6fc40a
Added cee opcodes for amodule and init_bitset
Jul 12, 2023
95a8470
Passing only method_index to init wrapper
Jul 14, 2023
03e1389
Small changes and cleanup
Jul 17, 2023
9140661
Commented
Jul 17, 2023
aad02cc
Conflicts
Jul 18, 2023
9976eaf
Enabled for arm64 for CI purposes
Jul 18, 2023
49dcf2e
Leftover
Jul 18, 2023
1dbcc28
Small changes, added a flag for later use
Jul 21, 2023
2bad646
Added cmake flag
Jul 21, 2023
0e4b036
Cleanup
Jul 21, 2023
00a9b41
Update src/mono/mono/mini/mini-arm64.c
LeVladIonescu Jul 21, 2023
f5eee3e
Added flag and converting this PR to draft
LeVladIonescu Aug 17, 2023
bfe9c5e
Merge branch 'dotnet:main' into noLLVM
kotlarmilos Aug 18, 2023
73537b5
Fix AOT compilation to generate init wrapper code
kotlarmilos Aug 18, 2023
cc43423
Merge branch 'dotnet:main' into noLLVM
LeVladIonescu Oct 18, 2023
406e5bd
Change the symbol for the init wrappers
LeVladIonescu Oct 31, 2023
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/cil/cil-opcodes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,4 +328,5 @@
<opcode name="mono_methodconst" input="Pop0" output="PushI" args="InlineI" o1="0xF0" o2="0x21" flow="next" />
<opcode name="mono_pinvoke_addr_cache" input="Pop0" output="PushI" args="InlineI" o1="0xF0" o2="0x22" flow="next" />
<opcode name="mono_remap_ovf_exc" input="Pop0" output="Push0" args="InlineI" o1="0xF0" o2="0x23" flow="next" />
<opcode name="aot_module" input="Pop0" output="PushI" args="InlineI" o1="0xF0" o2="0x24" flow="next" />
</opdesc>
1 change: 1 addition & 0 deletions src/mono/mono/cil/opcode.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,7 @@ OPDEF(CEE_MONO_GET_SP, "mono_get_sp", Pop0, PushI, InlineNone, 0, 2, 0xF0, 0x20,
OPDEF(CEE_MONO_METHODCONST, "mono_methodconst", Pop0, PushI, InlineI, 0, 2, 0xF0, 0x21, NEXT)
OPDEF(CEE_MONO_PINVOKE_ADDR_CACHE, "mono_pinvoke_addr_cache", Pop0, PushI, InlineI, 0, 2, 0xF0, 0x22, NEXT)
OPDEF(CEE_MONO_REMAP_OVF_EXC, "mono_remap_ovf_exc", Pop0, Push0, InlineI, 0, 2, 0xF0, 0x23, NEXT)
OPDEF(CEE_AOT_MODULE, "aot_module", Pop0, PushI, InlineI, 0, 2, 0xF0, 0x24, NEXT)
#ifndef OPALIAS
#define _MONO_CIL_OPALIAS_DEFINED_
#define OPALIAS(a,s,r)
Expand Down
1 change: 1 addition & 0 deletions src/mono/mono/metadata/jit-icall-reg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ MONO_JIT_ICALL (cominterop_type_from_handle) \
MONO_JIT_ICALL (g_free) \
MONO_JIT_ICALL (interp_to_native_trampoline) \
MONO_JIT_ICALL (mini_llvm_init_method) \
MONO_JIT_ICALL (mini_nollvm_init_method) \
MONO_JIT_ICALL (mini_llvmonly_init_delegate) \
MONO_JIT_ICALL (mini_llvmonly_init_delegate_virtual) \
MONO_JIT_ICALL (mini_llvmonly_init_vtable_slot) \
Expand Down
14 changes: 14 additions & 0 deletions src/mono/mono/metadata/marshal-lightweight.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3360,6 +3360,19 @@ emit_return_ilgen (MonoMethodBuilder *mb)
mono_mb_emit_byte (mb, CEE_RET);
}

static void
emit_method_init_ilgen (MonoMethodBuilder *mb)
{
// load aot_module
mono_mb_emit_op (mb, CEE_AOT_MODULE, NULL);
// load method_index
mono_mb_emit_ldarg (mb, 0);

mono_mb_emit_icall_id (mb, MONO_JIT_ICALL_mini_nollvm_init_method);

mono_mb_emit_byte (mb, CEE_RET);
}

void
mono_marshal_lightweight_init (void)
{
Expand Down Expand Up @@ -3390,6 +3403,7 @@ mono_marshal_lightweight_init (void)
cb.emit_native_icall_wrapper = emit_native_icall_wrapper_ilgen;
cb.emit_icall_wrapper = emit_icall_wrapper_ilgen;
cb.emit_return = emit_return_ilgen;
cb.emit_method_init = emit_method_init_ilgen;
cb.emit_vtfixup_ftnptr = emit_vtfixup_ftnptr_ilgen;
cb.mb_skip_visibility = mb_skip_visibility_ilgen;
cb.mb_set_dynamic = mb_set_dynamic_ilgen;
Expand Down
6 changes: 5 additions & 1 deletion src/mono/mono/metadata/marshal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2948,12 +2948,12 @@ MonoMethod *
mono_marshal_get_aot_init_wrapper (MonoAotInitSubtype subtype)
{
MonoMethodBuilder *mb;
const char *name = mono_marshal_get_aot_init_wrapper_name (subtype);
MonoMethod *res;
WrapperInfo *info;
MonoMethodSignature *csig = NULL;
MonoType *void_type = mono_get_void_type ();
MonoType *int_type = mono_get_int_type ();
const char *name = mono_marshal_get_aot_init_wrapper_name (subtype);

switch (subtype) {
case AOT_INIT_METHOD:
Expand All @@ -2977,6 +2977,10 @@ mono_marshal_get_aot_init_wrapper (MonoAotInitSubtype subtype)

mb = mono_mb_new (mono_defaults.object_class, name, MONO_WRAPPER_OTHER);

#if !defined(ENABLE_LLVM) && defined(TARGET_ARM64)
get_marshal_cb ()->emit_method_init (mb);
#endif

// Just stub out the method with a "CEE_RET"
// Our codegen backend generates other code here
get_marshal_cb ()->emit_return (mb);
Expand Down
1 change: 1 addition & 0 deletions src/mono/mono/metadata/marshal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,7 @@ typedef struct {
void (*emit_native_icall_wrapper) (MonoMethodBuilder *mb, MonoMethod *method, MonoMethodSignature *csig, gboolean check_exceptions, gboolean aot, MonoMethodPInvoke *pinfo);
void (*emit_icall_wrapper) (MonoMethodBuilder *mb, MonoJitICallInfo *callinfo, MonoMethodSignature *csig2, gboolean check_exceptions);
void (*emit_return) (MonoMethodBuilder *mb);
void (*emit_method_init) (MonoMethodBuilder *mb);
void (*emit_vtfixup_ftnptr) (MonoMethodBuilder *mb, MonoMethod *method, int param_count, guint16 type);
void (*mb_skip_visibility) (MonoMethodBuilder *mb);
void (*mb_set_dynamic) (MonoMethodBuilder *mb);
Expand Down
21 changes: 17 additions & 4 deletions src/mono/mono/mini/aot-compiler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4461,7 +4461,7 @@ add_jit_icall_wrapper (MonoAotCompile *acfg, MonoJitICallInfo *callinfo)
add_method (acfg, mono_marshal_get_icall_wrapper (callinfo, TRUE));
}

#if ENABLE_LLVM
// #if ENABLE_LLVM

static void
add_lazy_init_wrappers (MonoAotCompile *acfg)
Expand All @@ -4470,7 +4470,7 @@ add_lazy_init_wrappers (MonoAotCompile *acfg)
add_method (acfg, mono_marshal_get_aot_init_wrapper ((MonoAotInitSubtype)i));
}

#endif
// #endif

static MonoMethod*
get_runtime_invoke_sig (MonoMethodSignature *sig)
Expand Down Expand Up @@ -6808,9 +6808,11 @@ emit_and_reloc_code (MonoAotCompile *acfg, MonoMethod *method, guint8 *code, gui

/*
* This is a call from a JITted method to the init wrapper emitted by LLVM.
* Disable this assert when nollvm init is enabled
*/
#if !(!defined(ENABLE_LLVM) && defined(TARGET_ARM64))
g_assert (acfg->aot_opts.llvm && acfg->aot_opts.direct_extern_calls);

#endif
const char *init_name = mono_marshal_get_aot_init_wrapper_name (info->d.aot_init.subtype);
char *symbol = g_strdup_printf ("%s%s_%s", acfg->user_symbol_prefix, acfg->global_prefix, init_name);

Expand Down Expand Up @@ -7305,6 +7307,7 @@ encode_patch (MonoAotCompile *acfg, MonoJumpInfo *patch_info, guint8 *buf, guint
}
case MONO_PATCH_INFO_SEQ_POINT_INFO:
case MONO_PATCH_INFO_AOT_MODULE:
case MONO_PATCH_INFO_INIT_BITSET:
break;
case MONO_PATCH_INFO_SIGNATURE:
case MONO_PATCH_INFO_GSHAREDVT_IN_WRAPPER:
Expand Down Expand Up @@ -7466,7 +7469,8 @@ emit_method_info (MonoAotCompile *acfg, MonoCompile *cfg)
if (patch_info->type == MONO_PATCH_INFO_GC_CARD_TABLE_ADDR ||
patch_info->type == MONO_PATCH_INFO_GC_NURSERY_START ||
patch_info->type == MONO_PATCH_INFO_GC_NURSERY_BITS ||
patch_info->type == MONO_PATCH_INFO_AOT_MODULE) {
patch_info->type == MONO_PATCH_INFO_AOT_MODULE ||
patch_info->type == MONO_PATCH_INFO_INIT_BITSET) {
/* Stored in a GOT slot initialized at module load time */
patch_info->type = MONO_PATCH_INFO_NONE;
continue;
Expand Down Expand Up @@ -14531,6 +14535,10 @@ add_preinit_got_slots (MonoAotCompile *acfg)
ji->type = MONO_PATCH_INFO_AOT_MODULE;
add_preinit_slot (acfg, ji);

ji = (MonoJumpInfo *)mono_mempool_alloc0 (acfg->mempool, sizeof (MonoJumpInfo));
ji->type = MONO_PATCH_INFO_INIT_BITSET;
add_preinit_slot (acfg, ji);

ji = (MonoJumpInfo *)mono_mempool_alloc0 (acfg->mempool, sizeof (MonoJumpInfo));
ji->type = MONO_PATCH_INFO_GC_NURSERY_BITS;
add_preinit_slot (acfg, ji);
Expand Down Expand Up @@ -15194,11 +15202,16 @@ aot_assembly (MonoAssembly *ass, guint32 jit_opts, MonoAotOptions *aot_options)
flags = (LLVMModuleFlags)(flags | LLVM_MODULE_FLAG_INTERP);
mono_llvm_create_aot_module (acfg->image->assembly, acfg->global_prefix, acfg->nshared_got_entries, flags);

/* This will need to be moved outside to enable nollvm init method */
add_lazy_init_wrappers (acfg);
add_method (acfg, mono_marshal_get_llvm_func_wrapper (LLVM_FUNC_WRAPPER_GC_POLL));
}
#endif

#if !defined(ENABLE_LLVM) && defined(TARGET_ARM64)
add_lazy_init_wrappers (acfg);
#endif

if (mono_aot_mode_is_interp (&acfg->aot_opts) && mono_is_corlib_image (acfg->image->assembly->image)) {
MonoMethod *wrapper = mini_get_interp_lmf_wrapper ("mono_interp_to_native_trampoline", (gpointer) mono_interp_to_native_trampoline);
add_method (acfg, wrapper);
Expand Down
34 changes: 34 additions & 0 deletions src/mono/mono/mini/aot-runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ struct MonoAotModule {
guint8 *unwind_info;
/* Maps method index -> unbox tramp */
gpointer *unbox_tramp_per_method;
MonoBitSet *mono_inited;

/* Points to the mono EH data created by LLVM */
guint8 *mono_eh_frame;
Expand Down Expand Up @@ -2237,6 +2238,11 @@ load_aot_module (MonoAssemblyLoadContext *alc, MonoAssembly *assembly, gpointer
mscorlib_aot_module = amodule;
}

/*
* Methods init bitset used for initialization during the runtime
*/
amodule->mono_inited = mono_bitset_new (amodule->info.nmethods, 0);
Copy link
Member

@kotlarmilos kotlarmilos Jul 19, 2023

Choose a reason for hiding this comment

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

As we discussed offline, would be good to think of memory leaks. Is it allocated within the mempool?


/* Compute method addresses */
amodule->methods = (void **)g_malloc0 (amodule->info.nmethods * sizeof (gpointer));
for (guint32 i = 0; i < amodule->info.nmethods; ++i) {
Expand Down Expand Up @@ -3548,6 +3554,12 @@ sort_methods (MonoAotModule *amodule)
g_free (method_indexes);
}

MonoBitSet*
mono_aot_get_mono_inited (MonoAotModule *amodule)
{
return amodule->mono_inited;
}

/*
* mono_aot_find_jit_info:
*
Expand Down Expand Up @@ -4015,6 +4027,10 @@ decode_patch (MonoAotModule *aot_module, MonoMemPool *mp, MonoJumpInfo *ji, guin
case MONO_PATCH_INFO_AOT_MODULE:
case MONO_PATCH_INFO_MSCORLIB_GOT_ADDR:
break;
case MONO_PATCH_INFO_INIT_BITSET: {
ji->data.target = aot_module->mono_inited;
break;
}
case MONO_PATCH_INFO_SIGNATURE:
case MONO_PATCH_INFO_GSHAREDVT_IN_WRAPPER:
ji->data.target = decode_signature (aot_module, p, &p);
Expand Down Expand Up @@ -4374,6 +4390,10 @@ load_method (MonoAotModule *amodule, MonoImage *image, MonoMethod *method, guint
res = init_method (amodule, NULL, method_index, method, NULL, error);
if (!res)
goto cleanup;
#if !defined(ENABLE_LLVM) && defined(TARGET_ARM64)
else
mono_bitset_set (mono_aot_get_mono_inited(amodule), method_index);
#endif
}
}

Expand Down Expand Up @@ -5934,6 +5954,20 @@ no_specific_trampoline (void)
g_assert_not_reached ();
}

void
mini_nollvm_init_method (MonoAotModule* amodule, guint32 method_index)
{
MonoBitSet *inited_bitset = mono_aot_get_mono_inited (amodule);

ERROR_DECL (error);
if (!mono_bitset_test (inited_bitset, method_index)) {
if (init_method (amodule, NULL, method_index, NULL, NULL, error)) {
mono_bitset_set (inited_bitset, method_index);
}
}
mono_error_assert_ok (error);
Copy link
Contributor Author

@LeVladIonescu LeVladIonescu Jul 18, 2023

Choose a reason for hiding this comment

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

@vargaz do we want to propagate this error?

}

/*
* Return a specific trampoline from the AOT file.
*/
Expand Down
3 changes: 3 additions & 0 deletions src/mono/mono/mini/aot-runtime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ guint32 mono_aot_get_plt_info_offset (gpointer aot_module, guint8 *plt_en
gboolean mono_aot_get_cached_class_info (MonoClass *klass, MonoCachedClassInfo *res);
gboolean mono_aot_get_class_from_name (MonoImage *image, const char *name_space, const char *name, MonoClass **klass);
MonoJitInfo* mono_aot_find_jit_info (MonoImage *image, gpointer addr);
MonoBitSet* mono_aot_get_mono_inited (MonoAotModule *amodule);
gpointer mono_aot_plt_resolve (gpointer aot_module, host_mgreg_t *regs, guint8 *code, MonoError *error);
void mono_aot_patch_plt_entry (gpointer aot_module, guint8 *code, guint8 *plt_entry, gpointer *got, host_mgreg_t *regs, guint8 *addr);
gpointer mono_aot_get_method_from_vt_slot (MonoVTable *vtable, int slot, MonoError *error);
Expand All @@ -278,6 +279,8 @@ void mono_aot_set_make_unreadable (gboolean unreadable);
gboolean mono_aot_is_pagefault (void *ptr);
void mono_aot_handle_pagefault (void *ptr);

void mini_nollvm_init_method (MonoAotModule* amodule, guint32 method_index);

guint32 mono_aot_find_method_index (MonoMethod *method);
gboolean mono_aot_init_llvm_method (gpointer aot_module, gpointer method_info, MonoClass *init_class, MonoError *error);
GHashTable *mono_aot_get_weak_field_indexes (MonoImage *image);
Expand Down
7 changes: 7 additions & 0 deletions src/mono/mono/mini/method-to-ir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11258,6 +11258,13 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
*sp++ = ins;
break;
}
case MONO_CEE_AOT_MODULE: {
if (cfg->compile_aot) {
EMIT_NEW_AOTCONST (cfg, ins, MONO_PATCH_INFO_AOT_MODULE, NULL);
*sp++ = ins;
}
break;
}
Copy link
Member

@lambdageek lambdageek Jul 19, 2023

Choose a reason for hiding this comment

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

We don't expect to see this opcode if we're JITing, right? can we do g_assert (cfg->compile_aot)?
Alternately, can we add an else case that pushes some dummy constant (NULL?) on the stack. That way even if we emit this during JITing by accident it will just mean we'll see a NULL module in the icall instead of getting a messed up operand stack in the wrapper method.

Copy link
Contributor Author

@LeVladIonescu LeVladIonescu Jul 19, 2023

Choose a reason for hiding this comment

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

I think I'll go with the first approach, since the second will also need a NULL check for the amodule inside the call.

case MONO_CEE_MONO_NOT_TAKEN:
g_assert (method->wrapper_type != MONO_WRAPPER_NONE);
cfg->cbb->out_of_line = TRUE;
Expand Down
23 changes: 14 additions & 9 deletions src/mono/mono/mini/mini-arm64.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1050,14 +1050,14 @@ emit_xinsert_i8_r8 (guint8* code, MonoTypeEnum type, int dreg, int src_reg, int
}

static guint8*
emit_call (MonoCompile *cfg, guint8* code, MonoJumpInfoType patch_type, gconstpointer data)
emit_call (MonoCompile *cfg, guint8* code, MonoJumpInfoType patch_type, gconstpointer data, MonoMethod *method)
{
/*
mono_add_patch_info_rel (cfg, code - cfg->native_code, patch_type, data, MONO_R_ARM64_IMM);
code = emit_imm64_template (code, ARMREG_LR);
arm_blrx (code, ARMREG_LR);
*/
mono_add_patch_info_rel (cfg, code - cfg->native_code, patch_type, data, MONO_R_ARM64_BL);
mono_add_patch_info_rel (cfg, code - cfg->native_code, patch_type, method ? method : data, MONO_R_ARM64_BL);
Copy link
Member

@lambdageek lambdageek Jul 19, 2023

Choose a reason for hiding this comment

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

This seems unnecessary - MonoMethod* is a pointer-sized value. You can just pass it in for the data argument (possibly with a cast to deal with the const-ness).

arm_bl (code, code);
cfg->thunk_area += THUNK_SIZE;
return code;
Expand Down Expand Up @@ -3706,7 +3706,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
* So instead of emitting a trap, we emit a call a C function and place a
* breakpoint there.
*/
code = emit_call (cfg, code, MONO_PATCH_INFO_JIT_ICALL_ID, GUINT_TO_POINTER (MONO_JIT_ICALL_mono_break));
code = emit_call (cfg, code, MONO_PATCH_INFO_JIT_ICALL_ID, GUINT_TO_POINTER (MONO_JIT_ICALL_mono_break), NULL);
break;
case OP_LOCALLOC: {
guint8 *buf [16];
Expand Down Expand Up @@ -5073,7 +5073,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)

call = (MonoCallInst*)ins;
const MonoJumpInfoTarget patch = mono_call_to_patch (call);
code = emit_call (cfg, code, patch.type, patch.target);
code = emit_call (cfg, code, patch.type, patch.target, NULL);
code = emit_move_return_value (cfg, code, ins);
break;
}
Expand Down Expand Up @@ -5291,7 +5291,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
/* Slowpath */
g_assert (sreg1 == ARMREG_R0);
code = emit_call (cfg, code, MONO_PATCH_INFO_JIT_ICALL_ID,
GUINT_TO_POINTER (MONO_JIT_ICALL_mono_generic_class_init));
GUINT_TO_POINTER (MONO_JIT_ICALL_mono_generic_class_init), NULL);

mono_arm_patch (jump, code, MONO_R_ARM64_CBZ);
break;
Expand All @@ -5312,7 +5312,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
if (sreg2 != ARMREG_R1)
arm_movx (code, ARMREG_R1, sreg2);
code = emit_call (cfg, code, MONO_PATCH_INFO_JIT_ICALL_ID,
GUINT_TO_POINTER (MONO_JIT_ICALL_mini_init_method_rgctx));
GUINT_TO_POINTER (MONO_JIT_ICALL_mini_init_method_rgctx), NULL);

mono_arm_patch (jump, code, MONO_R_ARM64_CBZ);
break;
Expand Down Expand Up @@ -5368,13 +5368,13 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
if (sreg1 != ARMREG_R0)
arm_movx (code, ARMREG_R0, sreg1);
code = emit_call (cfg, code, MONO_PATCH_INFO_JIT_ICALL_ID,
GUINT_TO_POINTER (MONO_JIT_ICALL_mono_arch_throw_exception));
GUINT_TO_POINTER (MONO_JIT_ICALL_mono_arch_throw_exception), NULL);
break;
case OP_RETHROW:
if (sreg1 != ARMREG_R0)
arm_movx (code, ARMREG_R0, sreg1);
code = emit_call (cfg, code, MONO_PATCH_INFO_JIT_ICALL_ID,
GUINT_TO_POINTER (MONO_JIT_ICALL_mono_arch_rethrow_exception));
GUINT_TO_POINTER (MONO_JIT_ICALL_mono_arch_rethrow_exception), NULL);
break;
case OP_CALL_HANDLER:
mono_add_patch_info_rel (cfg, offset, MONO_PATCH_INFO_BB, ins->inst_target_bb, MONO_R_ARM64_BL);
Expand Down Expand Up @@ -5436,7 +5436,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
/* Call it if it is non-null */
buf [0] = code;
arm_cbzx (code, ARMREG_IP1, 0);
code = emit_call (cfg, code, MONO_PATCH_INFO_JIT_ICALL_ID, GUINT_TO_POINTER (MONO_JIT_ICALL_mono_threads_state_poll));
code = emit_call (cfg, code, MONO_PATCH_INFO_JIT_ICALL_ID, GUINT_TO_POINTER (MONO_JIT_ICALL_mono_threads_state_poll), NULL);
mono_arm_patch (buf [0], code, MONO_R_ARM64_CBZ);
break;
}
Expand Down Expand Up @@ -5924,6 +5924,11 @@ mono_arch_emit_prolog (MonoCompile *cfg)
code = emit_addx_imm (code, cfg->arch.args_reg, ARMREG_FP, cfg->stack_offset);
}

/* Call the init wrapper which checks if the methos needs to be initialised or not */
code = emit_imm (code, ARMREG_R0, cfg->method_index);
code = emit_call (cfg, code, MONO_PATCH_INFO_METHOD, NULL, mono_marshal_get_aot_init_wrapper (AOT_INIT_METHOD));


/* Save return area addr received in R8 */
if (cfg->vret_addr) {
MonoInst *ins = cfg->vret_addr;
Expand Down
3 changes: 3 additions & 0 deletions src/mono/mono/mini/mini-runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1259,6 +1259,7 @@ mono_patch_info_hash (gconstpointer data)
case MONO_PATCH_INFO_GOT_OFFSET:
case MONO_PATCH_INFO_GC_SAFE_POINT_FLAG:
case MONO_PATCH_INFO_AOT_MODULE:
case MONO_PATCH_INFO_INIT_BITSET:
case MONO_PATCH_INFO_PROFILER_ALLOCATION_COUNT:
case MONO_PATCH_INFO_PROFILER_CLAUSE_COUNT:
case MONO_PATCH_INFO_SPECIFIC_TRAMPOLINES:
Expand Down Expand Up @@ -1536,6 +1537,7 @@ mono_resolve_patch_target_ext (MonoMemoryManager *mem_manager, MonoMethod *metho
case MONO_PATCH_INFO_FIELD:
case MONO_PATCH_INFO_SIGNATURE:
case MONO_PATCH_INFO_AOT_MODULE:
case MONO_PATCH_INFO_INIT_BITSET:
target = patch_info->data.target;
break;
case MONO_PATCH_INFO_IID:
Expand Down Expand Up @@ -5083,6 +5085,7 @@ register_icalls (void)
register_dyn_icall (mono_component_debugger ()->user_break, mono_debugger_agent_user_break, mono_icall_sig_void, FALSE);

register_icall (mini_llvm_init_method, mono_icall_sig_void_ptr_ptr_ptr_ptr, TRUE);
register_icall (mini_nollvm_init_method, mono_icall_sig_void_ptr_int, TRUE);
register_icall_no_wrapper (mini_llvmonly_resolve_iface_call_gsharedvt, mono_icall_sig_ptr_object_int_ptr_ptr);
register_icall_no_wrapper (mini_llvmonly_resolve_vcall_gsharedvt, mono_icall_sig_ptr_object_int_ptr_ptr);
register_icall_no_wrapper (mini_llvmonly_resolve_vcall_gsharedvt_fast, mono_icall_sig_ptr_object_int);
Expand Down
1 change: 1 addition & 0 deletions src/mono/mono/mini/patch-info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ PATCH_INFO(VIRT_METHOD, "virt_method")
PATCH_INFO(GC_SAFE_POINT_FLAG, "gc_safe_point_flag")
PATCH_INFO(NONE, "none")
PATCH_INFO(AOT_MODULE, "aot_module")
PATCH_INFO(INIT_BITSET, "init_bitset")
PATCH_INFO(AOT_JIT_INFO, "aot_jit_info")
PATCH_INFO(GC_NURSERY_BITS, "gc_nursery_bits")
PATCH_INFO(GSHAREDVT_IN_WRAPPER, "gsharedvt_in_wrapper")
Expand Down
2 changes: 1 addition & 1 deletion src/mono/sample/HelloWorld/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ run: publish
$(TOP)artifacts/bin/HelloWorld/$(MONO_ARCH)/$(MONO_CONFIG)/$(TARGET_OS)-$(MONO_ARCH)/publish/HelloWorld

clean:
rm -rf $(TOP)artifacts/bin/HelloWorld/
rm -rf $(TOP)artifacts/bin/HelloWorld/
Loading