winsys/radeon: use the common job queue for multithreaded command submission v2

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

diff --git a/src/gallium/drivers/vc4/vc4_opt_dead_code.c b/src/gallium/drivers/vc4/vc4_opt_dead_code.c
index 408bd4302b4072e6913bc17a968d656f8191adc8..d3562ee947e6bfaed7572997298651bc1425fffa 100644 (file)
--- a/src/gallium/drivers/vc4/vc4_opt_dead_code.c
+++ b/src/gallium/drivers/vc4/vc4_opt_dead_code.c
@@ -43,7 +43,38 @@ dce(struct vc4_compile *c, struct qinst *inst)
                 qir_dump_inst(c, inst);
                 fprintf(stderr, "\n");
         }
-        qir_remove_instruction(inst);
+        assert(!inst->sf);
+        qir_remove_instruction(c, inst);
+}
+
+static bool
+has_nonremovable_reads(struct vc4_compile *c, struct qinst *inst)
+{
+        for (int i = 0; i < qir_get_op_nsrc(inst->op); i++) {
+                if (inst->src[i].file == QFILE_VPM) {
+                        uint32_t attr = inst->src[i].index / 4;
+                        uint32_t offset = (inst->src[i].index % 4) * 4;
+
+                        if (c->vattr_sizes[attr] != offset + 4)
+                                return true;
+
+                        /* Can't get rid of the last VPM read, or the
+                         * simulator (at least) throws an error.
+                         */
+                        uint32_t total_size = 0;
+                        for (uint32_t i = 0; i < ARRAY_SIZE(c->vattr_sizes); i++)
+                                total_size += c->vattr_sizes[i];
+                        if (total_size == 4)
+                                return true;
+                }
+
+                if (inst->src[i].file == QFILE_VARY &&
+                    c->input_slots[inst->src[i].index].slot == 0xff) {
+                        return true;
+                }
+        }
+
+        return false;
 }
 
 bool
@@ -52,22 +83,24 @@ qir_opt_dead_code(struct vc4_compile *c)
         bool progress = false;
         bool *used = calloc(c->num_temps, sizeof(bool));
         bool sf_used = false;
-        /* Whether we're eliminating texture setup currently. */
-        bool dce_tex = false;
-
-        struct simple_node *node, *t;
-        for (node = c->instructions.prev, t = node->prev;
-             &c->instructions != node;
-             node = t, t = t->prev) {
-                struct qinst *inst = (struct qinst *)node;
 
+        list_for_each_entry_safe_rev(struct qinst, inst, &c->instructions,
+                                     link) {
                 if (inst->dst.file == QFILE_TEMP &&
                     !used[inst->dst.index] &&
-                    (!qir_has_side_effects(c, inst) ||
-                     inst->op == QOP_TEX_RESULT)) {
-                        if (inst->op == QOP_TEX_RESULT) {
-                                dce_tex = true;
-                                c->num_texture_samples--;
+                    !inst->sf &&
+                    !qir_has_side_effects(c, inst) &&
+                    !has_nonremovable_reads(c, inst)) {
+                        for (int i = 0; i < qir_get_op_nsrc(inst->op); i++) {
+                                if (inst->src[i].file != QFILE_VPM)
+                                        continue;
+                                uint32_t attr = inst->src[i].index / 4;
+                                uint32_t offset = (inst->src[i].index % 4) * 4;
+
+                                if (c->vattr_sizes[attr] == offset + 4) {
+                                        c->num_inputs--;
+                                        c->vattr_sizes[attr] -= 4;
+                                }
                         }
 
                         dce(c, inst);
@@ -77,28 +110,20 @@ qir_opt_dead_code(struct vc4_compile *c)
 
                 if (qir_depends_on_flags(inst))
                         sf_used = true;
-                if (inst->op == QOP_SF) {
+                if (inst->sf) {
                         if (!sf_used) {
-                                dce(c, inst);
+                                if (debug) {
+                                        fprintf(stderr, "Removing SF on: ");
+                                        qir_dump_inst(c, inst);
+                                        fprintf(stderr, "\n");
+                                }
+
+                                inst->sf = false;
                                 progress = true;
-                                continue;
                         }
                         sf_used = false;
                 }
 
-                if (inst->op == QOP_TEX_RESULT)
-                        dce_tex = false;
-
-                if (dce_tex && (inst->op == QOP_TEX_S ||
-                                inst->op == QOP_TEX_T ||
-                                inst->op == QOP_TEX_R ||
-                                inst->op == QOP_TEX_B ||
-                                inst->op == QOP_TEX_DIRECT)) {
-                        dce(c, inst);
-                        progress = true;
-                        continue;
-                }
-
                 for (int i = 0; i < qir_get_op_nsrc(inst->op); i++) {
                         if (inst->src[i].file == QFILE_TEMP)
                                 used[inst->src[i].index] = true;