Mesa (main): agx: Don't choke on registers in the optimizer

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: f03cecf05fdf06389a94c09ddd6c5312db335eed
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f03cecf05fdf06389a94c09ddd6c5312db335eed

Author: Alyssa Rosenzweig <alyssa at rosenzweig.io>
Date:   Tue Jul  6 22:16:20 2021 -0400

agx: Don't choke on registers in the optimizer

Just skip over them.

Signed-off-by: Alyssa Rosenzweig <alyssa at rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11751>

---

 src/asahi/compiler/agx_dce.c       | 2 ++
 src/asahi/compiler/agx_optimizer.c | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/asahi/compiler/agx_dce.c b/src/asahi/compiler/agx_dce.c
index 4f0109e4e2d..9e2b8f1a3de 100644
--- a/src/asahi/compiler/agx_dce.c
+++ b/src/asahi/compiler/agx_dce.c
@@ -37,6 +37,8 @@ agx_dce(agx_context *ctx)
          agx_foreach_dest(I, d) {
             if (I->dest[d].type == AGX_INDEX_NORMAL)
                needed |= BITSET_TEST(seen, I->dest[d].value);
+            else if (I->dest[d].type != AGX_INDEX_NULL)
+               needed = true;
          }
 
          if (!needed) {
diff --git a/src/asahi/compiler/agx_optimizer.c b/src/asahi/compiler/agx_optimizer.c
index 0f93b19ecb0..0e6de7ee842 100644
--- a/src/asahi/compiler/agx_optimizer.c
+++ b/src/asahi/compiler/agx_optimizer.c
@@ -160,8 +160,8 @@ agx_optimizer_forward(agx_context *ctx)
       struct agx_opcode_info info = agx_opcodes_info[I->op];
 
       for (unsigned d = 0; d < info.nr_dests; ++d) {
-         assert(I->dest[d].type == AGX_INDEX_NORMAL);
-         defs[I->dest[d].value] = I;
+         if (I->dest[d].type == AGX_INDEX_NORMAL)
+            defs[I->dest[d].value] = I;
       }
 
       /* Propagate fmov down */
@@ -199,7 +199,9 @@ agx_optimizer_backward(agx_context *ctx)
       if (info.nr_dests != 1)
          continue;
 
-      assert(I->dest[0].type == AGX_INDEX_NORMAL);
+      if (I->dest[0].type != AGX_INDEX_NORMAL)
+         continue;
+
       agx_instr *use = uses[I->dest[0].value];
 
       if (!use || BITSET_TEST(multiple, I->dest[0].value))