freedreno/ir3: assert that only single address

An instruction can reference only a single address register value.
Add an assert to catch bugs.

Also, address value should also be local to the same block as the
instruction.

(The one spot where changing the instruction address is actually legit
needs to clear the address first.)

Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/freedreno/ir3/ir3.c b/src/freedreno/ir3/ir3.c
index 5c049a5936f29886ab3f1b14d4b3b17698bdc34d..feec723abd0af65d61095ca05e2dc4ce14504d6b 100644 (file)
--- a/src/freedreno/ir3/ir3.c
+++ b/src/freedreno/ir3/ir3.c
@@ -1041,6 +1041,10 @@ ir3_instr_set_address(struct ir3_instruction *instr,
 {
        if (instr->address != addr) {
                struct ir3 *ir = instr->block->shader;
+
+               debug_assert(!instr->address);
+               debug_assert(instr->block == addr->block);
+
                instr->address = addr;
                array_insert(ir, ir->indirects, instr);
        }

diff --git a/src/freedreno/ir3/ir3_sched.c b/src/freedreno/ir3/ir3_sched.c
index 9a544a8e6519846262bcb4893af2b4ace6b4ba28..96897f60e9249ef3c74196d125041fbe543424da 100644 (file)
--- a/src/freedreno/ir3/ir3_sched.c
+++ b/src/freedreno/ir3/ir3_sched.c
@@ -709,6 +709,7 @@ split_addr(struct ir3_sched_ctx *ctx)
                                /* original addr is scheduled, but new one isn't: */
                                new_addr->flags &= ~IR3_INSTR_MARK;
                        }
+                       indirect->address = NULL;
                        ir3_instr_set_address(indirect, new_addr);
                }
        }