Mesa (master): freedreno/ir3: sched fix

[GitLab Mirror]

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

Author: Rob Clark <robdclark at gmail.com>
Date:   Sun Mar 24 11:16:12 2019 -0400

freedreno/ir3: sched fix

Not sure why new-style frag inputs start triggering this.  But we
probably shouldn't consider src's from other blocks.

Signed-off-by: Rob Clark <robdclark at gmail.com>

---

 src/freedreno/ir3/ir3_sched.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/freedreno/ir3/ir3_sched.c b/src/freedreno/ir3/ir3_sched.c
index 4380fdf2f9a..94a7fed4c95 100644
--- a/src/freedreno/ir3/ir3_sched.c
+++ b/src/freedreno/ir3/ir3_sched.c
@@ -452,7 +452,7 @@ find_instr_recursive(struct ir3_sched_ctx *ctx, struct ir3_sched_notes *notes,
 
 	/* find unscheduled srcs: */
 	foreach_ssa_src(src, instr) {
-		if (!is_scheduled(src)) {
+		if (!is_scheduled(src) && (src->block == instr->block)) {
 			debug_assert(nsrcs < ARRAY_SIZE(srcs));
 			srcs[nsrcs++] = src;
 		}