nir: fix gather_ssa_types

[mesa.git] / src / compiler / nir / nir_search.h

diff --git a/src/compiler/nir/nir_search.h b/src/compiler/nir/nir_search.h
index a500febc9150bebd0ef1a9bab9e1e17d006d2ffd..526a498cd47e1a814a1f8196e3af9b1f11e9e872 100644 (file)
--- a/src/compiler/nir/nir_search.h
+++ b/src/compiler/nir/nir_search.h
@@ -32,6 +32,8 @@
 
 #define NIR_SEARCH_MAX_VARIABLES 16
 
+struct nir_builder;
+
 typedef enum {
    nir_search_value_expression,
    nir_search_value_variable,
@@ -41,7 +43,22 @@ typedef enum {
 typedef struct {
    nir_search_value_type type;
 
-   unsigned bit_size;
+   /**
+    * Bit size of the value. It is interpreted as follows:
+    *
+    * For a search expression:
+    * - If bit_size > 0, then the value only matches an SSA value with the
+    *   given bit size.
+    * - If bit_size <= 0, then the value matches any size SSA value.
+    *
+    * For a replace expression:
+    * - If bit_size > 0, then the value is constructed with the given bit size.
+    * - If bit_size == 0, then the value is constructed with the same bit size
+    *   as the search value.
+    * - If bit_size < 0, then the value is constructed with the same bit size
+    *   as variable (-bit_size - 1).
+    */
+   int bit_size;
 } nir_search_value;
 
 typedef struct {
@@ -68,6 +85,16 @@ typedef struct {
     * never match anything.
     */
    nir_alu_type type;
+
+   /** Optional condition fxn ptr
+    *
+    * This is only allowed in search expressions, and allows additional
+    * constraints to be placed on the match.  Typically used for 'is_constant'
+    * variables to require, for example, power-of-two in order for the search
+    * to match.
+    */
+   bool (*cond)(nir_alu_instr *instr, unsigned src,
+                unsigned num_components, const uint8_t *swizzle);
 } nir_search_variable;
 
 typedef struct {
@@ -82,6 +109,23 @@ typedef struct {
    } data;
 } nir_search_constant;
 
+enum nir_search_op {
+   nir_search_op_i2f = nir_last_opcode + 1,
+   nir_search_op_u2f,
+   nir_search_op_f2f,
+   nir_search_op_f2u,
+   nir_search_op_f2i,
+   nir_search_op_u2u,
+   nir_search_op_i2i,
+   nir_search_op_b2f,
+   nir_search_op_b2i,
+   nir_search_op_i2b,
+   nir_search_op_f2b,
+   nir_num_search_ops,
+};
+
+uint16_t nir_search_op_for_nir_op(nir_op op);
+
 typedef struct {
    nir_search_value value;
 
@@ -91,19 +135,44 @@ typedef struct {
     */
    bool inexact;
 
-   nir_op opcode;
+   /* Commutative expression index.  This is assigned by opt_algebraic.py when
+    * search structures are constructed and is a unique (to this structure)
+    * index within the commutative operation bitfield used for searching for
+    * all combinations of expressions containing commutative operations.
+    */
+   int8_t comm_expr_idx;
+
+   /* Number of commutative expressions in this expression including this one
+    * (if it is commutative).
+    */
+   uint8_t comm_exprs;
+
+   /* One of nir_op or nir_search_op */
+   uint16_t opcode;
    const nir_search_value *srcs[4];
+
+   /** Optional condition fxn ptr
+    *
+    * This allows additional constraints on expression matching, it is
+    * typically used to match an expressions uses such as the number of times
+    * the expression is used, and whether its used by an if.
+    */
+   bool (*cond)(nir_alu_instr *instr);
 } nir_search_expression;
 
 NIR_DEFINE_CAST(nir_search_value_as_variable, nir_search_value,
-                nir_search_variable, value)
+                nir_search_variable, value,
+                type, nir_search_value_variable)
 NIR_DEFINE_CAST(nir_search_value_as_constant, nir_search_value,
-                nir_search_constant, value)
+                nir_search_constant, value,
+                type, nir_search_value_constant)
 NIR_DEFINE_CAST(nir_search_value_as_expression, nir_search_value,
-                nir_search_expression, value)
+                nir_search_expression, value,
+                type, nir_search_value_expression)
 
-nir_alu_instr *
-nir_replace_instr(nir_alu_instr *instr, const nir_search_expression *search,
-                  const nir_search_value *replace, void *mem_ctx);
+nir_ssa_def *
+nir_replace_instr(struct nir_builder *b, nir_alu_instr *instr,
+                  const nir_search_expression *search,
+                  const nir_search_value *replace);
 
 #endif /* _NIR_SEARCH_ */