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.

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

Jump to bottom

[mono][interp] Small code refactoring for SSA #97249

Merged
merged 6 commits into from
Jan 20, 2024
Merged

[mono][interp] Small code refactoring for SSA #97249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0ba6b88
[mono][interp] Move optimization related code out of transform.c
BrzVlad Nov 6, 2023
d446465
[mono][interp] Pass ref to var storage in interp inst
BrzVlad Oct 11, 2023
d30ee3f
[mono][interp] Print invalid il offset in aligned fashion
BrzVlad Nov 6, 2023
51762ae
[mono][interp] Remove irrelevant stats
BrzVlad Nov 6, 2023
26ab3b4
[mono][interp] Renaming of local to var
BrzVlad Nov 6, 2023
2da1bdc
[mono][interp] Remove flags and use bit fields instead
BrzVlad Nov 6, 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/mini/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@ set(interp_sources
interp/mintops.h
interp/mintops.c
interp/transform.c
interp/transform-opt.c
interp/tiering.h
interp/tiering.c
interp/jiterpreter.c
Expand Down
8 changes: 0 additions & 8 deletions src/mono/mono/mini/interp/interp-internals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,15 +277,7 @@ typedef struct {
gint64 methods_transformed;
gint64 cprop_time;
gint64 super_instructions_time;
gint32 stloc_nps;
gint32 movlocs;
gint32 copy_propagations;
gint32 constant_folds;
gint32 ldlocas_removed;
gint32 killed_instructions;
gint32 emitted_instructions;
gint32 super_instructions;
gint32 added_pop_count;
gint32 inlined_methods;
gint32 inline_failures;
} MonoInterpStats;
Expand Down
8 changes: 0 additions & 8 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 @@ -8690,14 +8690,6 @@ register_interp_stats (void)
mono_counters_register ("Methods transformed", MONO_COUNTER_INTERP | MONO_COUNTER_LONG, &mono_interp_stats.methods_transformed);
mono_counters_register ("Total cprop time", MONO_COUNTER_INTERP | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &mono_interp_stats.cprop_time);
mono_counters_register ("Total super instructions time", MONO_COUNTER_INTERP | MONO_COUNTER_LONG | MONO_COUNTER_TIME, &mono_interp_stats.super_instructions_time);
mono_counters_register ("STLOC_NP count", MONO_COUNTER_INTERP | MONO_COUNTER_INT, &mono_interp_stats.stloc_nps);
mono_counters_register ("MOVLOC count", MONO_COUNTER_INTERP | MONO_COUNTER_INT, &mono_interp_stats.movlocs);
mono_counters_register ("Copy propagations", MONO_COUNTER_INTERP | MONO_COUNTER_INT, &mono_interp_stats.copy_propagations);
mono_counters_register ("Added pop count", MONO_COUNTER_INTERP | MONO_COUNTER_INT, &mono_interp_stats.added_pop_count);
mono_counters_register ("Constant folds", MONO_COUNTER_INTERP | MONO_COUNTER_INT, &mono_interp_stats.constant_folds);
mono_counters_register ("Ldlocas removed", MONO_COUNTER_INTERP | MONO_COUNTER_INT, &mono_interp_stats.ldlocas_removed);
mono_counters_register ("Super instructions", MONO_COUNTER_INTERP | MONO_COUNTER_INT, &mono_interp_stats.super_instructions);
mono_counters_register ("Killed instructions", MONO_COUNTER_INTERP | MONO_COUNTER_INT, &mono_interp_stats.killed_instructions);
mono_counters_register ("Emitted instructions", MONO_COUNTER_INTERP | MONO_COUNTER_INT, &mono_interp_stats.emitted_instructions);
mono_counters_register ("Methods inlined", MONO_COUNTER_INTERP | MONO_COUNTER_INT, &mono_interp_stats.inlined_methods);
mono_counters_register ("Inline failures", MONO_COUNTER_INTERP | MONO_COUNTER_INT, &mono_interp_stats.inline_failures);
Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono/mini/interp/jiterpreter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ build_address_taken_bitset (TransformData *td, InterpBasicBlock *bb, guint32 bit
for (InterpInst *ins = bb->first_ins; ins != NULL; ins = ins->next) {
if (ins->opcode == MINT_LDLOCA_S) {
InterpMethod *imethod = td->rtm;
InterpLocal *loc = &td->locals[ins->sregs[0]];
InterpVar *loc = &td->vars [ins->sregs[0]];

// Allocate on demand so if a method contains no ldlocas we don't allocate the bitset
if (!imethod->address_taken_bits)
Expand Down
Loading
Loading