Skip to content

WIP: Verify correctness of using mono llvmfullaot with interpreter as a fallback instead of GSHAREDVTs #72443

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

WIP: Verify correctness of using mono llvmfullaot with interpreter as a fallback instead of GSHAREDVTs #72443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4c61973
Testing mono llvmfullaot with interpreter as a fallback instead of GS…
ivanpovazan Jul 19, 2022
8253251
Relaxing the assert when original type and cmods_source are alias but…
ivanpovazan Aug 1, 2022
a03d78d
Do not initialize interpreted callback when initializing delegates in…
ivanpovazan Aug 2, 2022
01392f5
FullAOT mode forces generation of gsharedvts by force applying the fl…
ivanpovazan Aug 3, 2022
e123f83
Adding comments for why the testing environment has been temporary al…
ivanpovazan Aug 10, 2022
d5bfdf7
Attempt to fix a regression on apple lanes
ivanpovazan Aug 11, 2022
0ca3eea
[FIXME] workaround to pass build on apple lanes
ivanpovazan Aug 12, 2022
5e8624a
Revert "[FIXME] workaround to pass build on apple lanes"
ivanpovazan Sep 7, 2022
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
2 changes: 1 addition & 1 deletion src/mono/mono/metadata/metadata.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6085,7 +6085,7 @@ mono_metadata_type_dup_with_cmods (MonoImage *image, const MonoType *o, const Mo

if (cmods_source->has_cmods) {
/* FIXME: if it's aggregate what do we assert here? */
g_assert (!image || (!aggregate && image == mono_type_get_cmods (cmods_source)->image));
g_assert (!image || (o == cmods_source) || (!aggregate && image == mono_type_get_cmods (cmods_source)->image));
memcpy (r, cmods_source, mono_sizeof_type (cmods_source));
}

Expand Down
3 changes: 2 additions & 1 deletion src/mono/mono/mini/aot-compiler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14360,8 +14360,9 @@ mono_compile_assembly (MonoAssembly *ass, guint32 opts, const char *aot_options,
if (acfg->aot_opts.llvm_only) {
if (!mono_aot_mode_is_interp (&acfg->aot_opts))
acfg->jit_opts |= MONO_OPT_GSHAREDVT;
} else if (mono_aot_mode_is_full (&acfg->aot_opts) || mono_aot_mode_is_hybrid (&acfg->aot_opts))
} else if ((mono_aot_mode_is_full (&acfg->aot_opts) && !acfg->aot_opts.interp) || mono_aot_mode_is_hybrid (&acfg->aot_opts)) {
acfg->jit_opts |= MONO_OPT_GSHAREDVT;
}
#endif

#if !defined(ENABLE_LLVM)
Expand Down
3 changes: 2 additions & 1 deletion src/tests/Common/testenvironment.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,8 @@
<_TestEnvFileLine Condition="'$(RuntimeVariant)' == 'llvmaot'" Include="export MONO_ENV_OPTIONS=--llvm" />

<!-- Use Mono in Full AOT mode when running the full-AOT-compiled runtime tests -->
<_TestEnvFileLine Condition="'$(RuntimeVariant)' == 'llvmfullaot'" Include="export MONO_ENV_OPTIONS=--full-aot" />
<!-- FIXME: adding 'interp' to the aot runtime options was temporarly introduced (for the PR) to test fullaot+interp due to missing lanes for this configuration -->
<_TestEnvFileLine Condition="'$(RuntimeVariant)' == 'llvmfullaot'" Include="export MONO_ENV_OPTIONS=--full-aot-interp" />

<!-- CLR interpreter -->
<_TestEnvFileLine Condition="'$(Scenario)' == 'clrinterpreter'" Include="export COMPlus_Interpret=%2A" /> <!-- %2A is asterisk / wildcard -->
Expand Down
2 changes: 2 additions & 0 deletions src/tests/build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@

<ItemGroup>
<MonoAotOption Condition="'$(MonoFullAot)' == 'true'" Include="full" />
<!-- FIXME: adding 'interp' to the aot options was temporarly introduced (for the PR) to test fullaot+interp due to missing lanes for this configuration -->
<MonoAotOption Condition="'$(MonoFullAot)' == 'true'" Include="interp" />
<MonoAotOption Condition="'$(MonoFullAot)' == 'true'" Include="nimt-trampolines=2000" />
<MonoAotOption Condition="'$(MonoFullAot)' == 'true'" Include="ntrampolines=10000" />
<MonoAotOption Condition="'$(MonoFullAot)' == 'true'" Include="nrgctx-fetch-trampolines=256" />
Expand Down