From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Mon, 6 Apr 2020 18:15:37 +0000 (-0400)
Subject: pan/bit: Wire up add/add op+test
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eeb626257d486feba814cbd608c7cd0a22159e6e;p=mesa.git

pan/bit: Wire up add/add op+test

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

diff --git a/src/panfrost/bifrost/bi_pack.c b/src/panfrost/bifrost/bi_pack.c
index 89eab4fa04f..519bc713041 100644
--- a/src/panfrost/bifrost/bi_pack.c
+++ b/src/panfrost/bifrost/bi_pack.c
@@ -1057,7 +1057,7 @@ bi_pack_add(bi_clause *clause, bi_bundle bundle, struct bi_registers *regs)
 
         switch (bundle.add->type) {
         case BI_ADD:
-                return BIFROST_ADD_NOP;
+                return bi_pack_add_addmin(bundle.add, regs);
         case BI_ATEST:
                 return bi_pack_add_atest(clause, bundle.add, regs);
         case BI_BRANCH:
diff --git a/src/panfrost/bifrost/test/bi_test_pack.c b/src/panfrost/bifrost/test/bi_test_pack.c
index a45a15125cc..ef8e32a9929 100644
--- a/src/panfrost/bifrost/test/bi_test_pack.c
+++ b/src/panfrost/bifrost/test/bi_test_pack.c
@@ -303,6 +303,7 @@ bit_packing(struct panfrost_device *dev, enum bit_debug debug)
                 bit_fmod_helper(dev, BI_ADD, sz, true, input, debug, 0);
 
                 if (sz == 32) {
+                        bit_fmod_helper(dev, BI_ADD, sz, false, input, debug, 0);
                         bit_fmod_helper(dev, BI_MINMAX, sz, false, input, debug, BI_MINMAX_MIN);
                         bit_fmod_helper(dev, BI_MINMAX, sz, false, input, debug, BI_MINMAX_MAX);
                 }