From 7deb0d296d83286b1f83dd0baeb4e355e717a615 Mon Sep 17 00:00:00 2001
From: Connor Abbott <cwabbott0@gmail.com>
Date: Mon, 11 Oct 2021 16:29:48 +0200
Subject: [PATCH] ir3/cse: Support mov instructions

This doesn't affect shader-db at all, but it will help clean up the
mov's emitted in the next commit when there are multiple ldp/stp.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13307>
---
 src/freedreno/ir3/ir3_cse.c | 45 +++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/freedreno/ir3/ir3_cse.c b/src/freedreno/ir3/ir3_cse.c
index 712730f3097..36a5cda0e61 100644
--- a/src/freedreno/ir3/ir3_cse.c
+++ b/src/freedreno/ir3/ir3_cse.c
@@ -43,12 +43,24 @@ hash_instr(const void *data)
    hash = HASH(hash, instr->opc);
    hash = HASH(hash, instr->dsts[0]->flags);
    foreach_src (src, (struct ir3_instruction *)instr) {
-      if (src->flags & IR3_REG_CONST)
-         hash = HASH(hash, src->num);
-      else if (src->flags & IR3_REG_IMMED)
+      if (src->flags & IR3_REG_CONST) {
+         if (src->flags & IR3_REG_RELATIV)
+            hash = HASH(hash, src->array.offset);
+         else
+            hash = HASH(hash, src->num);
+      } else if (src->flags & IR3_REG_IMMED) {
          hash = HASH(hash, src->uim_val);
-      else
+      } else {
+         if (src->flags & IR3_REG_ARRAY)
+            hash = HASH(hash, src->array.offset);
          hash = HASH(hash, src->def);
+      }
+   }
+
+   if (opc_cat(instr->opc) == 1) {
+      hash = HASH(hash, instr->cat1.dst_type);
+      hash = HASH(hash, instr->cat1.src_type);
+      hash = HASH(hash, instr->cat1.round);
    }
 
    return hash;
@@ -76,24 +88,43 @@ instrs_equal(const struct ir3_instruction *i1, const struct ir3_instruction *i2)
          return false;
 
       if (i1_reg->flags & IR3_REG_CONST) {
-         if (i1_reg->num != i2_reg->num)
-            return false;
+         if (i1_reg->flags & IR3_REG_RELATIV) {
+            if (i1_reg->array.offset != i2_reg->array.offset)
+               return false;
+         } else {
+            if (i1_reg->num != i2_reg->num)
+               return false;
+         }
       } else if (i1_reg->flags & IR3_REG_IMMED) {
          if (i1_reg->uim_val != i2_reg->uim_val)
             return false;
       } else {
+         if (i1_reg->flags & IR3_REG_ARRAY) {
+            if (i1_reg->array.offset != i2_reg->array.offset)
+               return false;
+         }
          if (i1_reg->def != i2_reg->def)
             return false;
       }
    }
 
+   if (opc_cat(i1->opc) == 1) {
+      if (i1->cat1.dst_type != i2->cat1.dst_type ||
+          i1->cat1.src_type != i2->cat1.src_type ||
+          i1->cat1.round != i2->cat1.round)
+         return false;
+   }
+
    return true;
 }
 
 static bool
 instr_can_cse(const struct ir3_instruction *instr)
 {
-   if (instr->opc != OPC_META_COLLECT)
+   if (instr->opc != OPC_META_COLLECT && instr->opc != OPC_MOV)
+      return false;
+
+   if (!is_dest_gpr(instr->dsts[0]) || (instr->dsts[0]->flags & IR3_REG_ARRAY))
       return false;
 
    return true;