commit 81b28ebcb5a3801216e752cfda2e600bbc7bcb10
author Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Thu Oct 15 08:47:40 2020 -0400
committer Marge Bot <eric+marge@anholt.net> Fri Oct 23 14:48:23 2020 +0000
tree 157740a77092f4d7533b6d7236d67ba3a8a25eda
parent 86b2b4eb768bcee6664790a66fc5508002e34424

pan/bi: Use nir_undef_to_zero

We don't handle undefs explicitly in NIR->BIR which means if they aren't
optimized out they won't be RA'd to anything and then backend RA will
crash (as occurs in a glamor shader seen in MATE).

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7206>

src/panfrost/bifrost/bifrost_compile.c

diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c
index 99f4a16..1ed06dc 100644
--- a/src/panfrost/bifrost/bifrost_compile.c
+++ b/src/panfrost/bifrost/bifrost_compile.c
@@ -1609,8 +1609,7 @@
                 break;
 
         case nir_instr_type_ssa_undef:
-                /* Spurious */
-                break;
+                unreachable("should've been lowered");
 
         default:
                 unreachable("Unhandled instruction type");
@@ -1852,6 +1851,8 @@
                 }
 
                 NIR_PASS(progress, nir, nir_opt_undef);
+                NIR_PASS(progress, nir, nir_undef_to_zero);
+
                 NIR_PASS(progress, nir, nir_opt_loop_unroll,
                          nir_var_shader_in |
                          nir_var_shader_out |