diff options
author | Alyssa Rosenzweig <[email protected]> | 2019-10-21 21:32:35 -0400 |
---|---|---|
committer | Alyssa Rosenzweig <[email protected]> | 2019-11-04 15:36:08 -0500 |
commit | 4ae4d82e21d54ae9e8c075cb9ad5161f699023d5 (patch) | |
tree | 04d720a0693967c53b24c9bf01938c20a73f4e3e /src/panfrost/midgard/midgard_ra.c | |
parent | 45ac8ea8bd8541d0a6d861dc84a66fa8fa69fb09 (diff) |
pan/midgard: Compute bundle interference
Signed-off-by: Alyssa Rosenzweig <[email protected]>
Diffstat (limited to 'src/panfrost/midgard/midgard_ra.c')
-rw-r--r-- | src/panfrost/midgard/midgard_ra.c | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/src/panfrost/midgard/midgard_ra.c b/src/panfrost/midgard/midgard_ra.c index d278223f7f1..3060dd7c59f 100644 --- a/src/panfrost/midgard/midgard_ra.c +++ b/src/panfrost/midgard/midgard_ra.c @@ -515,6 +515,60 @@ mir_lower_special_reads(compiler_context *ctx) free(texw); } +/* We register allocate after scheduling, so we need to ensure instructions + * executing in parallel within a segment of a bundle don't clobber each + * other's registers. This is mostly a non-issue thanks to scheduling, but + * there are edge cases. In particular, after a register is written in a + * segment, it interferes with anything reading. */ + +static void +mir_compute_segment_interference( + compiler_context *ctx, + struct ra_graph *l, + midgard_bundle *bun, + unsigned pivot, + unsigned i) +{ + for (unsigned j = pivot; j < i; ++j) { + mir_foreach_src(bun->instructions[j], s) { + if (bun->instructions[j]->src[s] >= ctx->temp_count) + continue; + + for (unsigned q = pivot; q < j; ++q) { + if (bun->instructions[q]->dest >= ctx->temp_count) + continue; + + ra_add_node_interference(l, bun->instructions[q]->dest, bun->instructions[j]->src[s]); + } + } + } +} + +static void +mir_compute_bundle_interference( + compiler_context *ctx, + struct ra_graph *l, + midgard_bundle *bun) +{ + if (!IS_ALU(bun->tag)) + return; + + bool old = bun->instructions[0]->unit >= UNIT_VADD; + unsigned pivot = 0; + + for (unsigned i = 1; i < bun->instruction_count; ++i) { + bool new = bun->instructions[i]->unit >= UNIT_VADD; + + if (old != new) { + mir_compute_segment_interference(ctx, l, bun, 0, i); + pivot = i; + break; + } + } + + mir_compute_segment_interference(ctx, l, bun, pivot, bun->instruction_count); +} + static void mir_compute_interference( compiler_context *ctx, @@ -546,6 +600,9 @@ mir_compute_interference( mir_liveness_ins_update(live, ins, ctx->temp_count); } + mir_foreach_bundle_in_block(blk, bun) + mir_compute_bundle_interference(ctx, g, bun); + free(live); } } |