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

[mono] Enable branch optimizations when using LLVM. #93092

Merged
merged 1 commit into from
Oct 6, 2023
+26 −8
Merged

[mono] Enable branch optimizations when using LLVM. #93092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/mini/branch-opts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1311,7 +1311,7 @@ mono_optimize_branches (MonoCompile *cfg)
/* the block are in sequence anyway ... */

/* branches to the following block can be removed */
if (bb->last_ins && bb->last_ins->opcode == OP_BR && !bbn->out_of_line) {
if (!COMPILE_LLVM (cfg) && bb->last_ins && bb->last_ins->opcode == OP_BR && !bbn->out_of_line) {
NULLIFY_INS (bb->last_ins);
changed = TRUE;
if (cfg->verbose_level > 2)
Expand Down
14 changes: 13 additions & 1 deletion src/mono/mono/mini/mini-codegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2165,8 +2165,9 @@ mono_local_regalloc (MonoCompile *cfg, MonoBasicBlock *bb)

MONO_RESTORE_WARNING

/* Returns -1 if opcode is not a conditional */
CompRelation
mono_opcode_to_cond (int opcode)
mono_opcode_to_cond_unchecked (int opcode)
{
switch (opcode) {
case OP_CEQ:
Expand Down Expand Up @@ -2286,10 +2287,21 @@ mono_opcode_to_cond (int opcode)
case OP_CMOV_LGT_UN:
return CMP_GT_UN;
default:
return (CompRelation)-1;
}
}

CompRelation
mono_opcode_to_cond (int opcode)
{
CompRelation rel = mono_opcode_to_cond_unchecked (opcode);

if (rel == (CompRelation)-1) {
printf ("%s\n", mono_inst_name (opcode));
g_assert_not_reached ();
return (CompRelation)0;
fanyang-mono marked this conversation as resolved.
Show resolved Hide resolved
}
return rel;
}

CompRelation
Expand Down
14 changes: 11 additions & 3 deletions src/mono/mono/mini/mini-llvm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6145,7 +6145,10 @@ process_bb (EmitContext *ctx, MonoBasicBlock *bb)
/* The comparison result is not needed */
continue;

rel = mono_opcode_to_cond (ins->next->opcode);
rel = mono_opcode_to_cond_unchecked (ins->next->opcode);
if (rel == (CompRelation)-1)
/* The following branch etc. was optimized away */
continue;

if (ins->opcode == OP_ICOMPARE_IMM) {
lhs = convert (ctx, lhs, LLVMInt32Type ());
Expand Down Expand Up @@ -12138,7 +12141,7 @@ MONO_RESTORE_WARNING
if (!ctx_ok (ctx))
return;

if (!has_terminator && bb->next_bb && (bb == cfg->bb_entry || bb->in_count > 0)) {
if (!has_terminator && bb->next_bb && bb != cfg->bb_exit && (bb == cfg->bb_entry || bb->in_count > 0)) {
LLVMBuildBr (builder, get_bb (ctx, bb->next_bb));
}

Expand Down Expand Up @@ -12961,8 +12964,13 @@ emit_method_inner (EmitContext *ctx)
bb = (MonoBasicBlock*)g_ptr_array_index (bblock_list, bb_index);

// Prune unreachable mono BBs.
if (!(bb == cfg->bb_entry || bb->in_count > 0))
if (!(bb == cfg->bb_entry || bb->in_count > 0)) {
LLVMBasicBlockRef target_bb = ctx->bblocks [bb->block_num].call_handler_target_bb;
if (target_bb)
/* Unused */
LLVMDeleteBasicBlock (target_bb);
continue;
}

process_bb (ctx, bb);
if (!ctx_ok (ctx))
Expand Down
3 changes: 0 additions & 3 deletions src/mono/mono/mini/mini.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3550,9 +3550,6 @@ mini_method_compile (MonoMethod *method, guint32 opts, JitFlags flags, int parts
}

cfg->opt &= ~MONO_OPT_LINEARS;

/* FIXME: */
cfg->opt &= ~MONO_OPT_BRANCH;
}

cfg->after_method_to_ir = TRUE;
Expand Down
1 change: 1 addition & 0 deletions src/mono/mono/mini/mini.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2356,6 +2356,7 @@ MonoMethod* mini_get_memset_method (void);
int mini_class_check_context_used (MonoCompile *cfg, MonoClass *klass);
MonoRgctxAccess mini_get_rgctx_access_for_method (MonoMethod *method);

CompRelation mono_opcode_to_cond_unchecked (int opcode);
CompRelation mono_opcode_to_cond (int opcode);
CompType mono_opcode_to_type (int opcode, int cmp_opcode);
CompRelation mono_negate_cond (CompRelation cond);
Expand Down
Loading