Mesa (master): freedreno/sched: reset delay counters at start of block

[GitLab Mirror]

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

Author: Rob Clark <robdclark at chromium.org>
Date:   Mon May 25 12:08:03 2020 -0700

freedreno/sched: reset delay counters at start of block

Signed-off-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5280>

---

 src/freedreno/ir3/ir3_postsched.c | 2 ++
 src/freedreno/ir3/ir3_sched.c     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/freedreno/ir3/ir3_postsched.c b/src/freedreno/ir3/ir3_postsched.c
index 91283cb5ea1..fd36fdc0cdd 100644
--- a/src/freedreno/ir3/ir3_postsched.c
+++ b/src/freedreno/ir3/ir3_postsched.c
@@ -581,6 +581,8 @@ static void
 sched_block(struct ir3_postsched_ctx *ctx, struct ir3_block *block)
 {
 	ctx->block = block;
+	ctx->tex_delay = 0;
+	ctx->sfu_delay = 0;
 
 	/* move all instructions to the unscheduled list, and
 	 * empty the block's instruction list (to which we will
diff --git a/src/freedreno/ir3/ir3_sched.c b/src/freedreno/ir3/ir3_sched.c
index bd5471d7f02..6448987e3c2 100644
--- a/src/freedreno/ir3/ir3_sched.c
+++ b/src/freedreno/ir3/ir3_sched.c
@@ -979,6 +979,8 @@ sched_block(struct ir3_sched_ctx *ctx, struct ir3_block *block)
 	ctx->addr0 = NULL;
 	ctx->addr1 = NULL;
 	ctx->pred = NULL;
+	ctx->tex_delay = 0;
+	ctx->sfu_delay = 0;
 
 	/* move all instructions to the unscheduled list, and
 	 * empty the block's instruction list (to which we will