From: Alyssa Rosenzweig Date: Tue, 28 Apr 2020 00:34:36 +0000 (-0400) Subject: pan/mdg: Make some branch targets more explicit X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e27fd4b3eccff8fcea2dd381f73bdd1d96075a7d;p=mesa.git pan/mdg: Make some branch targets more explicit Signed-off-by: Alyssa Rosenzweig Part-of: --- diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c index ae03750b08e..83221a31c81 100644 --- a/src/panfrost/midgard/midgard_compile.c +++ b/src/panfrost/midgard/midgard_compile.c @@ -2518,6 +2518,7 @@ mir_add_writeout_loops(compiler_context *ctx) unsigned popped = br->branch.target_block; pan_block_add_successor(&(mir_get_block(ctx, popped - 1)->base), &ctx->current_block->base); br->branch.target_block = emit_fragment_epilogue(ctx, rt); + br->branch.target_type = TARGET_GOTO; /* If we have more RTs, we'll need to restore back after our * loop terminates */ @@ -2525,6 +2526,7 @@ mir_add_writeout_loops(compiler_context *ctx) if ((rt + 1) < ARRAY_SIZE(ctx->writeout_branch) && ctx->writeout_branch[rt + 1]) { midgard_instruction uncond = v_branch(false, false); uncond.branch.target_block = popped; + uncond.branch.target_type = TARGET_GOTO; emit_mir_instruction(ctx, uncond); pan_block_add_successor(&ctx->current_block->base, &(mir_get_block(ctx, popped)->base)); schedule_barrier(ctx);