danog/ir
1
0
Fork 0
mirror of https://github.com/danog/ir.git synced 2025-01-22 05:31:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Disable LICM across an OSR ENTRY if the value can't be restored at OSR ENTRY point

Browse Source
This commit is contained in:
Dmitry Stogov 2023-04-07 16:36:27 +03:00
parent efa8a83153
commit d71cbd47d5
5 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ir_cfg.c
View File

@ -806,6 +806,7 @@ next:
} }
} else if (ir_worklist_len(&work)) { } else if (ir_worklist_len(&work)) {
bb->flags |= IR_BB_LOOP_HEADER; bb->flags |= IR_BB_LOOP_HEADER;
bb->loop_depth = 1;
while (ir_worklist_len(&work)) { while (ir_worklist_len(&work)) {
j = ir_worklist_pop(&work); j = ir_worklist_pop(&work);
while (blocks[j].loop_header > 0) { while (blocks[j].loop_header > 0) {
@ -836,10 +837,16 @@ next:
i = sorted_blocks[n]; i = sorted_blocks[n];
ir_block *bb = &blocks[i]; ir_block *bb = &blocks[i];
if (bb->loop_header > 0) { if (bb->loop_header > 0) {
bb->loop_depth = blocks[bb->loop_header].loop_depth; ir_block *loop = &blocks[bb->loop_header];
} uint32_t loop_depth = loop->loop_depth;
if (bb->flags & IR_BB_LOOP_HEADER) { if (bb->flags & IR_BB_LOOP_HEADER) {
bb->loop_depth++; loop_depth++;
}
bb->loop_depth = loop_depth;
if (bb->flags & (IR_BB_ENTRY|IR_BB_LOOP_WITH_ENTRY)) {
loop->flags |= IR_BB_LOOP_WITH_ENTRY;
}
} }
} }

4
ir_dump.c
View File

@ -243,8 +243,12 @@ void ir_dump_cfg(ir_ctx *ctx, FILE *f)
fprintf(f, "\tUNREACHABLE\n"); fprintf(f, "\tUNREACHABLE\n");
} }
if (bb->flags & IR_BB_LOOP_HEADER) { if (bb->flags & IR_BB_LOOP_HEADER) {
if (bb->flags & IR_BB_LOOP_WITH_ENTRY) {
fprintf(f, "\tLOOP_HEADER, LOOP_WITH_ENTRY\n");
} else {
fprintf(f, "\tLOOP_HEADER\n"); fprintf(f, "\tLOOP_HEADER\n");
} }
}
if (bb->flags & IR_BB_IRREDUCIBLE_LOOP) { if (bb->flags & IR_BB_IRREDUCIBLE_LOOP) {
fprintf(stderr, "\tIRREDUCIBLE_LOOP\n"); fprintf(stderr, "\tIRREDUCIBLE_LOOP\n");
} }

7
ir_gcm.c
View File

@ -123,10 +123,9 @@ static void ir_gcm_schedule_late(ir_ctx *ctx, uint32_t *_blocks, ir_bitset visit
uint32_t loop_depth = bb->loop_depth; uint32_t loop_depth = bb->loop_depth;
if (loop_depth) { if (loop_depth) {
insn = &ctx->ir_base[ref]; if ((ctx->cfg_blocks[bb->loop_header].flags & IR_BB_LOOP_WITH_ENTRY)
if (insn->op >= IR_ADD_OV && insn->op <= IR_OVERFLOW) { && !(ctx->binding && ir_binding_find(ctx, ref))) {
/* Don't move overflow checking math out of the loop */ /* Don't move loop invariant code across an OSR ENTRY if we can't restore it */
// TODO: this should be turned into a more general check to prohibit LICM ???
} else { } else {
lca = bb->dom_parent; lca = bb->dom_parent;
while (lca != _blocks[ref]) { while (lca != _blocks[ref]) {

1
ir_private.h
View File

@ -823,6 +823,7 @@ struct _ir_use_list {
#define IR_BB_EMPTY (1<<6) #define IR_BB_EMPTY (1<<6)
#define IR_BB_PREV_EMPTY_ENTRY (1<<7) #define IR_BB_PREV_EMPTY_ENTRY (1<<7)
#define IR_BB_OSR_ENTRY_LOADS (1<<8) /* OSR Entry-point with register LOADs */ #define IR_BB_OSR_ENTRY_LOADS (1<<8) /* OSR Entry-point with register LOADs */
#define IR_BB_LOOP_WITH_ENTRY (1<<9) /* set together with LOOP_HEADER if there is an ENTRY in the loop */
struct _ir_block { struct _ir_block {
uint32_t flags; uint32_t flags;

2
ir_ra.c
View File

@ -371,7 +371,7 @@ static void ir_add_osr_entry_loads(ir_ctx *ctx, ir_block *bb, ir_bitset live, ui
continue; continue;
} }
} }
fprintf(stderr, "ENTRY %d (block %i) - live var %d\n", ctx->ir_base[bb->start].op2, b, ref); fprintf(stderr, "ENTRY %d (block %d start %d) - live var %d\n", ctx->ir_base[bb->start].op2, b, bb->start, ref);
ok = 0; ok = 0;
} IR_BITSET_FOREACH_END(); } IR_BITSET_FOREACH_END();