vc4: Fix memory leaks of struct qinst.

[mesa.git] / src / gallium / drivers / vc4 / vc4_qir.c

diff --git a/src/gallium/drivers/vc4/vc4_qir.c b/src/gallium/drivers/vc4/vc4_qir.c
index 0b0d2c11cf1dd2774fab1d3e86e1dee772da4ac5..0ab81d4d714c7d694ad06437423e4d66b1127cae 100644 (file)
--- a/src/gallium/drivers/vc4/vc4_qir.c
+++ b/src/gallium/drivers/vc4/vc4_qir.c
@@ -23,6 +23,7 @@
 
 #include "util/u_memory.h"
 #include "util/u_simple_list.h"
+#include "util/ralloc.h"
 
 #include "vc4_qir.h"
 #include "vc4_qpu.h"
@@ -38,19 +39,35 @@ static const struct qir_op_info qir_op_info[] = {
         [QOP_FADD] = { "fadd", 1, 2 },
         [QOP_FSUB] = { "fsub", 1, 2 },
         [QOP_FMUL] = { "fmul", 1, 2 },
+        [QOP_MUL24] = { "mul24", 1, 2 },
         [QOP_FMIN] = { "fmin", 1, 2 },
         [QOP_FMAX] = { "fmax", 1, 2 },
         [QOP_FMINABS] = { "fminabs", 1, 2 },
         [QOP_FMAXABS] = { "fmaxabs", 1, 2 },
-
-        [QOP_SEQ] = { "seq", 1, 2 },
-        [QOP_SNE] = { "sne", 1, 2 },
-        [QOP_SGE] = { "sge", 1, 2 },
-        [QOP_SLT] = { "slt", 1, 2 },
-        [QOP_CMP] = { "cmp", 1, 3 },
-
         [QOP_FTOI] = { "ftoi", 1, 1 },
         [QOP_ITOF] = { "itof", 1, 1 },
+        [QOP_ADD] = { "add", 1, 2 },
+        [QOP_SUB] = { "sub", 1, 2 },
+        [QOP_SHR] = { "shr", 1, 2 },
+        [QOP_ASR] = { "asr", 1, 2 },
+        [QOP_SHL] = { "shl", 1, 2 },
+        [QOP_MIN] = { "min", 1, 2 },
+        [QOP_MAX] = { "max", 1, 2 },
+        [QOP_AND] = { "and", 1, 2 },
+        [QOP_OR] = { "or", 1, 2 },
+        [QOP_XOR] = { "xor", 1, 2 },
+        [QOP_NOT] = { "not", 1, 1 },
+
+        [QOP_SF] = { "sf", 0, 1 },
+        [QOP_SEL_X_0_NS] = { "fsel_x_0_ns", 1, 1 },
+        [QOP_SEL_X_0_NC] = { "fsel_x_0_nc", 1, 1 },
+        [QOP_SEL_X_0_ZS] = { "fsel_x_0_zs", 1, 1 },
+        [QOP_SEL_X_0_ZC] = { "fsel_x_0_zc", 1, 1 },
+        [QOP_SEL_X_Y_NS] = { "fsel_x_y_ns", 1, 2 },
+        [QOP_SEL_X_Y_NC] = { "fsel_x_y_nc", 1, 2 },
+        [QOP_SEL_X_Y_ZS] = { "fsel_x_y_zs", 1, 2 },
+        [QOP_SEL_X_Y_ZC] = { "fsel_x_y_zc", 1, 2 },
+
         [QOP_RCP] = { "rcp", 1, 1 },
         [QOP_RSQ] = { "rsq", 1, 1 },
         [QOP_EXP2] = { "exp2", 1, 2 },
@@ -62,7 +79,7 @@ static const struct qir_op_info qir_op_info[] = {
         [QOP_TLB_DISCARD_SETUP] = { "discard", 0, 1, true },
         [QOP_TLB_PASSTHROUGH_Z_WRITE] = { "tlb_passthrough_z", 0, 0, true },
         [QOP_TLB_COLOR_WRITE] = { "tlb_color", 0, 1, true },
-        [QOP_TLB_COLOR_READ] = { "tlb_color_read", 0, 0, true },
+        [QOP_TLB_COLOR_READ] = { "tlb_color_read", 1, 0, true },
         [QOP_VARY_ADD_C] = { "vary_add_c", 1, 1 },
 
         [QOP_FRAG_X] = { "frag_x", 1, 0 },
@@ -74,11 +91,11 @@ static const struct qir_op_info qir_op_info[] = {
         [QOP_TEX_T] = { "tex_t", 0, 2 },
         [QOP_TEX_R] = { "tex_r", 0, 2 },
         [QOP_TEX_B] = { "tex_b", 0, 2 },
-        [QOP_TEX_RESULT] = { "tex_result", 0, 0 },
-        [QOP_R4_UNPACK_A] = { "r4_unpack_a", 1, 0 },
-        [QOP_R4_UNPACK_B] = { "r4_unpack_b", 1, 0 },
-        [QOP_R4_UNPACK_C] = { "r4_unpack_c", 1, 0 },
-        [QOP_R4_UNPACK_D] = { "r4_unpack_d", 1, 0 },
+        [QOP_TEX_RESULT] = { "tex_result", 1, 0, true },
+        [QOP_R4_UNPACK_A] = { "r4_unpack_a", 1, 1 },
+        [QOP_R4_UNPACK_B] = { "r4_unpack_b", 1, 1 },
+        [QOP_R4_UNPACK_C] = { "r4_unpack_c", 1, 1 },
+        [QOP_R4_UNPACK_D] = { "r4_unpack_d", 1, 1 },
 };
 
 static const char *
@@ -111,6 +128,54 @@ qir_has_side_effects(struct qinst *inst)
         return qir_op_info[inst->op].has_side_effects;
 }
 
+bool
+qir_depends_on_flags(struct qinst *inst)
+{
+        switch (inst->op) {
+        case QOP_SEL_X_0_NS:
+        case QOP_SEL_X_0_NC:
+        case QOP_SEL_X_0_ZS:
+        case QOP_SEL_X_0_ZC:
+        case QOP_SEL_X_Y_NS:
+        case QOP_SEL_X_Y_NC:
+        case QOP_SEL_X_Y_ZS:
+        case QOP_SEL_X_Y_ZC:
+                return true;
+        default:
+                return false;
+        }
+}
+
+bool
+qir_writes_r4(struct qinst *inst)
+{
+        switch (inst->op) {
+        case QOP_TEX_RESULT:
+        case QOP_TLB_COLOR_READ:
+        case QOP_RCP:
+        case QOP_RSQ:
+        case QOP_EXP2:
+        case QOP_LOG2:
+                return true;
+        default:
+                return false;
+        }
+}
+
+bool
+qir_reads_r4(struct qinst *inst)
+{
+        switch (inst->op) {
+        case QOP_R4_UNPACK_A:
+        case QOP_R4_UNPACK_B:
+        case QOP_R4_UNPACK_C:
+        case QOP_R4_UNPACK_D:
+                return true;
+        default:
+                return false;
+        }
+}
+
 static void
 qir_print_reg(struct qreg reg)
 {
@@ -139,7 +204,7 @@ qir_dump_inst(struct qinst *inst)
 }
 
 void
-qir_dump(struct qcompile *c)
+qir_dump(struct vc4_compile *c)
 {
         struct simple_node *node;
 
@@ -151,7 +216,7 @@ qir_dump(struct qcompile *c)
 }
 
 struct qreg
-qir_get_temp(struct qcompile *c)
+qir_get_temp(struct vc4_compile *c)
 {
         struct qreg reg;
 
@@ -196,7 +261,7 @@ qir_inst4(enum qop op, struct qreg dst,
 }
 
 void
-qir_emit(struct qcompile *c, struct qinst *inst)
+qir_emit(struct vc4_compile *c, struct qinst *inst)
 {
         insert_at_tail(&c->instructions, &inst->link);
 }
@@ -207,10 +272,10 @@ qir_reg_equals(struct qreg a, struct qreg b)
         return a.file == b.file && a.index == b.index;
 }
 
-struct qcompile *
+struct vc4_compile *
 qir_compile_init(void)
 {
-        struct qcompile *c = CALLOC_STRUCT(qcompile);
+        struct vc4_compile *c = rzalloc(NULL, struct vc4_compile);
 
         make_empty_list(&c->instructions);
 
@@ -218,9 +283,23 @@ qir_compile_init(void)
 }
 
 void
-qir_compile_destroy(struct qcompile *c)
+qir_remove_instruction(struct qinst *qinst)
 {
-        free(c);
+        remove_from_list(&qinst->link);
+        free(qinst->src);
+        free(qinst);
+}
+
+void
+qir_compile_destroy(struct vc4_compile *c)
+{
+        while (!is_empty_list(&c->instructions)) {
+                struct qinst *qinst =
+                        (struct qinst *)first_elem(&c->instructions);
+                qir_remove_instruction(qinst);
+        }
+
+        ralloc_free(c);
 }
 
 const char *
@@ -249,7 +328,7 @@ qir_get_stage_name(enum qstage stage)
         } while (0)
 
 void
-qir_optimize(struct qcompile *c)
+qir_optimize(struct vc4_compile *c)
 {
         bool print_opt_debug = false;
         int pass = 1;
@@ -258,6 +337,7 @@ qir_optimize(struct qcompile *c)
                 bool progress = false;
 
                 OPTPASS(qir_opt_algebraic);
+                OPTPASS(qir_opt_cse);
                 OPTPASS(qir_opt_copy_propagation);
                 OPTPASS(qir_opt_dead_code);