From: Eric Anholt <eric@anholt.net>
Date: Sun, 25 Oct 2015 00:49:03 +0000 (-0700)
Subject: vc4: Only copy propagate raw MOVs.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6eb0760f4896d2dd45820ec1fcab36496228b761;p=mesa.git

vc4: Only copy propagate raw MOVs.

No problems being fixed, but needed for the new unpack changes.
---

diff --git a/src/gallium/drivers/vc4/vc4_opt_copy_propagation.c b/src/gallium/drivers/vc4/vc4_opt_copy_propagation.c
index fd2539aed95..b46be24ad0c 100644
--- a/src/gallium/drivers/vc4/vc4_opt_copy_propagation.c
+++ b/src/gallium/drivers/vc4/vc4_opt_copy_propagation.c
@@ -45,14 +45,9 @@ qir_opt_copy_propagation(struct vc4_compile *c)
                         int index = inst->src[i].index;
                         if (inst->src[i].file == QFILE_TEMP &&
                             c->defs[index] &&
-                            c->defs[index]->op == QOP_MOV &&
+                            qir_is_raw_mov(c->defs[index]) &&
                             (c->defs[index]->src[0].file == QFILE_TEMP ||
                              c->defs[index]->src[0].file == QFILE_UNIF)) {
-                                /* If it has a pack, it shouldn't be an SSA
-                                 * def.
-                                 */
-                                assert(!c->defs[index]->dst.pack);
-
                                 if (debug) {
                                         fprintf(stderr, "Copy propagate: ");
                                         qir_dump_inst(c, inst);