Mesa (master): freedreno/ir3/ra: fix failed assert for a0/p0

[Rob Clark]

Module: Mesa
Branch: master
Commit: a1a6f007823f203755fb54a1f3b7f53ae6cbfef0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a1a6f007823f203755fb54a1f3b7f53ae6cbfef0

Author: Rob Clark <robclark at freedesktop.org>
Date:   Sun Jul  5 19:53:10 2015 -0400

freedreno/ir3/ra: fix failed assert for a0/p0

The address and predicate register are special, they don't get assigned
in RA.  So do a better job of ignoring them rather than hitting later
asserts.

Signed-off-by: Rob Clark <robclark at freedesktop.org>

---

 src/gallium/drivers/freedreno/ir3/ir3_ra.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gallium/drivers/freedreno/ir3/ir3_ra.c b/src/gallium/drivers/freedreno/ir3/ir3_ra.c
index de48ecf..eaf3b3c 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3_ra.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_ra.c
@@ -469,6 +469,11 @@ ra_block_find_definers(struct ir3_ra_ctx *ctx, struct ir3_block *block)
 		struct ir3_ra_instr_data *id = &ctx->instrd[instr->ip];
 		if (instr->regs_count == 0)
 			continue;
+		/* couple special cases: */
+		if (writes_addr(instr) || writes_pred(instr)) {
+			id->cls = -1;
+			continue;
+		}
 		id->defn = get_definer(ctx, instr, &id->sz, &id->off);
 		id->cls = size_to_class(id->sz, is_half(id->defn));
 	}