nir: Add a function for comparing cursors

diff --git a/src/glsl/nir/nir.c b/src/glsl/nir/nir.c
index d2e9afa4479779904c3e842958341faad2b58f6e..f01d5e295c1edb1f121260c6371528cac6faf5b0 100644 (file)
--- a/src/glsl/nir/nir.c
+++ b/src/glsl/nir/nir.c
@@ -711,6 +711,69 @@ nir_cf_node_get_function(nir_cf_node *node)
    return nir_cf_node_as_function(node);
 }
 
+/* Reduces a cursor by trying to convert everything to after and trying to
+ * go up to block granularity when possible.
+ */
+static nir_cursor
+reduce_cursor(nir_cursor cursor)
+{
+   switch (cursor.option) {
+   case nir_cursor_before_block:
+      if (exec_list_is_empty(&cursor.block->instr_list)) {
+         /* Empty block.  After is as good as before. */
+         cursor.option = nir_cursor_after_block;
+      } else {
+         /* Try to switch to after the previous block if there is one.
+          * (This isn't likely, but it can happen.)
+          */
+         nir_cf_node *prev_node = nir_cf_node_prev(&cursor.block->cf_node);
+         if (prev_node && prev_node->type == nir_cf_node_block) {
+            cursor.block = nir_cf_node_as_block(prev_node);
+            cursor.option = nir_cursor_after_block;
+         }
+      }
+      return cursor;
+
+   case nir_cursor_after_block:
+      return cursor;
+
+   case nir_cursor_before_instr: {
+      nir_instr *prev_instr = nir_instr_prev(cursor.instr);
+      if (prev_instr) {
+         /* Before this instruction is after the previous */
+         cursor.instr = prev_instr;
+         cursor.option = nir_cursor_after_instr;
+      } else {
+         /* No previous instruction.  Switch to before block */
+         cursor.block = cursor.instr->block;
+         cursor.option = nir_cursor_before_block;
+      }
+      return reduce_cursor(cursor);
+   }
+
+   case nir_cursor_after_instr:
+      if (nir_instr_next(cursor.instr) == NULL) {
+         /* This is the last instruction, switch to after block */
+         cursor.option = nir_cursor_after_block;
+         cursor.block = cursor.instr->block;
+      }
+      return cursor;
+
+   default:
+      unreachable("Inavlid cursor option");
+   }
+}
+
+bool
+nir_cursors_equal(nir_cursor a, nir_cursor b)
+{
+   /* Reduced cursors should be unique */
+   a = reduce_cursor(a);
+   b = reduce_cursor(b);
+
+   return a.block == b.block && a.option == b.option;
+}
+
 static bool
 add_use_cb(nir_src *src, void *state)
 {

diff --git a/src/glsl/nir/nir.h b/src/glsl/nir/nir.h
index 6888eded864a7ce0995ce609014f75ca537cd8cf..8655c144012a439f41cc604acbc558ab9df7fb8b 100644 (file)
--- a/src/glsl/nir/nir.h
+++ b/src/glsl/nir/nir.h
@@ -1778,6 +1778,8 @@ nir_cursor_current_block(nir_cursor cursor)
    }
 }
 
+bool nir_cursors_equal(nir_cursor a, nir_cursor b);
+
 static inline nir_cursor
 nir_before_block(nir_block *block)
 {