Mesa (master): Revert "pan/bi: Optimize out redundant jumps to #0x0"

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: f7bbfbaeb5694a238056d68a047f923470bcb8f0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7bbfbaeb5694a238056d68a047f923470bcb8f0

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Wed Feb 24 17:53:06 2021 +0100

Revert "pan/bi: Optimize out redundant jumps to #0x0"

A block that has all its successors empty is not necessarily a leaf
block in the CFG, and removing the JUMP in that causes the shader
to continue executing code from another block instead of exiting.

This reverts commit a496b41d50589191ad2e37a17019aef0dafcb9f2.

Reviewed-by: Alyssa Rosenzweig <alyssa at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9520>

---

 src/panfrost/bifrost/bifrost_compile.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c
index 27e545b9c84..0a48d0905f3 100644
--- a/src/panfrost/bifrost/bifrost_compile.c
+++ b/src/panfrost/bifrost/bifrost_compile.c
@@ -2939,13 +2939,6 @@ bi_lower_branch(bi_block *block)
 
                 if (bi_is_terminal_block(ins->branch_target))
                         ins->branch_target = NULL;
-
-                /* If there is nowhere to go, there is no point in branching */
-                if (bi_is_terminal_block((bi_block *) block->base.successors[0]) &&
-                        bi_is_terminal_block((bi_block *) block->base.successors[1]) &&
-                        ins->branch_target == NULL) {
-                        bi_remove_instruction(ins);
-                }
         }
 }