Module: Mesa Branch: master Commit: 6cef8040672e84393e59ed6efa9953c95f5f8c92 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6cef8040672e84393e59ed6efa9953c95f5f8c92
Author: Rhys Perry <[email protected]> Date: Mon Sep 7 11:33:44 2020 +0100 nir/opt_if: fix opt_if_merge when destination branch has a jump Fixes a case where opt_if_merge created code like: if (...) { break; loop { ... } } which caused opt_peel_loop_initial_if to complain that the loop pre-header wasn't a predecessor of the loop header. This patch prevents this (invalid, I think) unreachable code from being created. Signed-off-by: Rhys Perry <[email protected]> Reviewed-by: Timothy Arceri <[email protected]> Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3496 Fixes: 4d3f6cb9739 ('nir: merge some basic consecutive ifs') Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6633> --- src/compiler/nir/nir_opt_if.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/compiler/nir/nir_opt_if.c b/src/compiler/nir/nir_opt_if.c index 8b35b167013..9bcc7712e1a 100644 --- a/src/compiler/nir/nir_opt_if.c +++ b/src/compiler/nir/nir_opt_if.c @@ -1273,6 +1273,13 @@ opt_if_merge(nir_if *nif) if (nif->condition.ssa == next_if->condition.ssa && exec_list_is_empty(&next_blk->instr_list)) { + /* This optimization isn't made to work in this case and + * opt_if_evaluate_condition_use will optimize it later. + */ + if (nir_block_ends_in_jump(nir_if_last_then_block(nif)) || + nir_block_ends_in_jump(nir_if_last_else_block(nif))) + return false; + simple_merge_if(nif, next_if, true, true); simple_merge_if(nif, next_if, false, false); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
