pan/bi: Fix negation in ADD.v2f16

When we flip the sources we need to flip the negates as well to stay
consistent.

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

diff --git a/src/panfrost/bifrost/bi_pack.c b/src/panfrost/bifrost/bi_pack.c
index 8e83358e54696e513ba86111ed2307d39e56bd16..8f006edebe0acbd372c086d03b3f024e207f65ac 100644 (file)
--- a/src/panfrost/bifrost/bi_pack.c
+++ b/src/panfrost/bifrost/bi_pack.c
@@ -553,37 +553,26 @@ bi_pack_fma_addmin_f16(bi_instruction *ins, struct bi_registers *regs)
         unsigned src_0 = bi_get_src(ins, regs, 0, true);
         unsigned src_1 = bi_get_src(ins, regs, 1, true);
         bool l = false;
+        bool flip = false;
 
         if (!abs_0 && !abs_1) {
                 /* Force k = 0 <===> NOT(src1 < src0) <==> src1 >= src0 */
-                if (src_0 < src_1) {
-                        unsigned tmp = src_0;
-                        src_0 = src_1;
-                        src_1 = tmp;
-                }
+                flip = (src_0 < src_1);
         } else if (abs_0 && !abs_1) {
                 l = src_1 >= src_0;
         } else if (abs_1 && !abs_0) {
-                unsigned tmp = src_0;
-                src_0 = src_1;
-                src_0 = tmp;
-
-                l = src_1 >= src_0;
+                flip = true;
+                l = src_0 >= src_1;
         } else {
-                if (src_0 >= src_1) {
-                        unsigned tmp = src_0;
-                        src_0 = src_1;
-                        src_1 = tmp;
-                }
-
+                flip = (src_0 >= src_1);
                 l = true;
         }
 
         struct bifrost_fma_add_minmax16 pack = {
-                .src0 = src_0,
-                .src1 = src_1,
-                .src0_neg = ins->src_neg[0],
-                .src1_neg = ins->src_neg[1],
+                .src0 = flip ? src_1 : src_0,
+                .src1 = flip ? src_0 : src_1,
+                .src0_neg = ins->src_neg[flip ? 1 : 0],
+                .src1_neg = ins->src_neg[flip ? 0 : 1],
                 .abs1 = l,
                 .outmod = ins->outmod,
                 .mode = (ins->type == BI_ADD) ? ins->roundmode : ins->minmax,