From 49e8f660f514942b2650bf1fae88fcea2ac600c6 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Mon, 25 Jul 2022 12:06:40 -0400 Subject: [PATCH] pan/bi: Remove bogus assert lowering branches We can get BRANCHZ.i16 since we lower JUMP early. This seems to have worked before mainly by chance. With the change to how we optimize, we can get code sequences like: block2 { BRANCHZ.i16.eq u256, u256 -> block5 BRANCHZ.i16.eq u256, u256 -> block4 } -> block5 from block1 which would choke the assert. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/bifrost/bifrost_compile.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c index 47644d7c573..56d51f8c96a 100644 --- a/src/panfrost/bifrost/bifrost_compile.c +++ b/src/panfrost/bifrost/bifrost_compile.c @@ -4727,19 +4727,16 @@ bi_lower_branch(bi_context *ctx, bi_block *block) { bool cull_terminal = (ctx->arch <= 8); bool branched = false; - ASSERTED bool was_jump = false; bi_foreach_instr_in_block_safe(block, ins) { if (!ins->branch_target) continue; if (branched) { - assert(was_jump && (ins->op == BI_OPCODE_JUMP)); bi_remove_instruction(ins); continue; } branched = true; - was_jump = ins->op == BI_OPCODE_JUMP; if (!bi_is_terminal_block(ins->branch_target)) continue;