From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Sat, 2 May 2020 01:42:53 +0000 (-0400)
Subject: pan/bi: Don't pack ICMP on FMA
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=35c806e701d1557db7d97671030f50704bc7b833;p=mesa.git

pan/bi: Don't pack ICMP on FMA

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

diff --git a/src/panfrost/bifrost/bi_schedule.c b/src/panfrost/bifrost/bi_schedule.c
index d52fe1c4489..d1d99d94233 100644
--- a/src/panfrost/bifrost/bi_schedule.c
+++ b/src/panfrost/bifrost/bi_schedule.c
@@ -101,6 +101,14 @@ bi_ambiguous_abs(bi_instruction *ins)
         return classy && typey && absy;
 }
 
+/* New Bifrost (which?) don't seem to have ICMP on FMA */
+static bool
+bi_icmp(bi_instruction *ins)
+{
+        bool ic = nir_alu_type_get_base_type(ins->src_types[0]) != nir_type_float;
+        return ic && (ins->type == BI_CMP);
+}
+
 /* Lowers FMOV to ADD #0, since FMOV doesn't exist on the h/w and this is the
  * latest time it's sane to lower (it's useful to distinguish before, but we'll
  * need this handle during scheduling to ensure the ports get modeled
@@ -150,6 +158,7 @@ bi_schedule(bi_context *ctx)
                         bool can_add = props & BI_SCHED_ADD;
 
                         can_fma &= !bi_ambiguous_abs(ins);
+                        can_fma &= !bi_icmp(ins);
 
                         assert(can_fma || can_add);