r600g: optimize away CF ALU instructions even if type doesn't match

diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
index 1d951a12de602eec61e577fc6b5ff283323a3df7..e792168a679911d3c0d34f94f4983930cad0fe36 100644 (file)
--- a/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@ -421,16 +421,29 @@ int r600_bc_add_alu_type(struct r600_bc *bc, const struct r600_bc_alu *alu, int
        memcpy(nalu, alu, sizeof(struct r600_bc_alu));
        nalu->nliteral = 0;
 
+       if (bc->cf_last != NULL && bc->cf_last->inst != (type << 3)) {
+               /* check if we could add it anyway */
+               if (bc->cf_last->inst == (V_SQ_CF_ALU_WORD1_SQ_CF_INST_ALU << 3) &&
+                       type == V_SQ_CF_ALU_WORD1_SQ_CF_INST_ALU_PUSH_BEFORE) {
+                       LIST_FOR_EACH_ENTRY(alu, &bc->cf_last->alu, list) {
+                               if (alu->predicate) {
+                                       bc->force_add_cf = 1;
+                                       break;
+                               }
+                       }
+               } else
+                       bc->force_add_cf = 1;
+       }
+
        /* cf can contains only alu or only vtx or only tex */
-       if (bc->cf_last == NULL || bc->cf_last->inst != (type << 3) ||
-               bc->force_add_cf) {
+       if (bc->cf_last == NULL || bc->force_add_cf) {
                r = r600_bc_add_cf(bc);
                if (r) {
                        free(nalu);
                        return r;
                }
-               bc->cf_last->inst = (type << 3);
        }
+       bc->cf_last->inst = (type << 3);
        if (!bc->cf_last->curr_bs_head) {
                bc->cf_last->curr_bs_head = nalu;
                LIST_INITHEAD(&nalu->bs_list);