commit 3064feb2350d5fce36a09c85a72788998c3f1c1b
author Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Thu Sep 10 16:47:37 2020 -0400
committer Marge Bot <eric+marge@anholt.net> Thu Sep 10 23:35:13 2020 +0000
tree bf6f698250f0ea171598d6eb1fb63dc923157b77
parent 5cd62359586245a62a525461d9efadbee1e281e0

pan/mdg: Obey f2fmp size restriction in fuse_io_16

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Signed-off-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6283>

src/panfrost/midgard/nir_fuse_io_16.c

diff --git a/src/panfrost/midgard/nir_fuse_io_16.c b/src/panfrost/midgard/nir_fuse_io_16.c
index ed4b775..a588f6a 100644
--- a/src/panfrost/midgard/nir_fuse_io_16.c
+++ b/src/panfrost/midgard/nir_fuse_io_16.c
@@ -87,6 +87,15 @@
                continue;
 
             intr->dest.ssa.bit_size = 16;
+
+            nir_builder b;
+            nir_builder_init(&b, function->impl);
+            b.cursor = nir_after_instr(instr);
+
+            /* The f2f32(f2fmp(x)) will cancel by opt_algebraic */
+            nir_ssa_def *conv = nir_f2f32(&b, &intr->dest.ssa);
+            nir_ssa_def_rewrite_uses_after(&intr->dest.ssa, nir_src_for_ssa(conv), conv->parent_instr);
+
             progress |= true;
          }
       }