Mesa (main): ir3/postsched: Rename tex/sfu to sy/ss
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Jan 7 15:02:56 UTC 2022
Module: Mesa
Branch: main
Commit: d45678cac46a911230cb35bdcf65e538a4e5dd8b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d45678cac46a911230cb35bdcf65e538a4e5dd8b
Author: Connor Abbott <cwabbott0 at gmail.com>
Date: Fri Dec 17 20:08:03 2021 +0100
ir3/postsched: Rename tex/sfu to sy/ss
Analogous to the previous commit.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14246>
---
src/freedreno/ir3/ir3_postsched.c | 50 +++++++++++++++++++--------------------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/freedreno/ir3/ir3_postsched.c b/src/freedreno/ir3/ir3_postsched.c
index 402262053c9..39de84addbf 100644
--- a/src/freedreno/ir3/ir3_postsched.c
+++ b/src/freedreno/ir3/ir3_postsched.c
@@ -70,8 +70,8 @@ struct ir3_postsched_ctx {
unsigned ip;
- int sfu_delay;
- int tex_delay;
+ int ss_delay;
+ int sy_delay;
};
struct ir3_postsched_node {
@@ -81,7 +81,7 @@ struct ir3_postsched_node {
unsigned earliest_ip;
- bool has_tex_src, has_sfu_src;
+ bool has_sy_src, has_ss_src;
unsigned delay;
unsigned max_delay;
@@ -91,17 +91,17 @@ struct ir3_postsched_node {
list_for_each_entry (struct ir3_postsched_node, __n, __list, dag.link)
static bool
-has_tex_src(struct ir3_instruction *instr)
+has_sy_src(struct ir3_instruction *instr)
{
struct ir3_postsched_node *node = instr->data;
- return node->has_tex_src;
+ return node->has_sy_src;
}
static bool
-has_sfu_src(struct ir3_instruction *instr)
+has_ss_src(struct ir3_instruction *instr)
{
struct ir3_postsched_node *node = instr->data;
- return node->has_sfu_src;
+ return node->has_ss_src;
}
static void
@@ -141,19 +141,19 @@ schedule(struct ir3_postsched_ctx *ctx, struct ir3_instruction *instr)
return;
if (is_ss_producer(instr)) {
- ctx->sfu_delay = soft_ss_delay(instr);
- } else if (has_sfu_src(instr)) {
- ctx->sfu_delay = 0;
- } else if (ctx->sfu_delay > 0) {
- ctx->sfu_delay--;
+ ctx->ss_delay = soft_ss_delay(instr);
+ } else if (has_ss_src(instr)) {
+ ctx->ss_delay = 0;
+ } else if (ctx->ss_delay > 0) {
+ ctx->ss_delay--;
}
if (is_sy_producer(instr)) {
- ctx->tex_delay = soft_sy_delay(instr, ctx->block->shader);
- } else if (has_tex_src(instr)) {
- ctx->tex_delay = 0;
- } else if (ctx->tex_delay > 0) {
- ctx->tex_delay--;
+ ctx->sy_delay = soft_sy_delay(instr, ctx->block->shader);
+ } else if (has_sy_src(instr)) {
+ ctx->sy_delay = 0;
+ } else if (ctx->sy_delay > 0) {
+ ctx->sy_delay--;
}
}
@@ -189,10 +189,10 @@ node_delay_soft(struct ir3_postsched_ctx *ctx, struct ir3_postsched_node *n)
/* This takes into account that as when we schedule multiple tex or sfu, the
* first user has to wait for all of them to complete.
*/
- if (n->has_sfu_src)
- delay = MAX2(delay, ctx->sfu_delay);
- if (n->has_tex_src)
- delay = MAX2(delay, ctx->tex_delay);
+ if (n->has_ss_src)
+ delay = MAX2(delay, ctx->ss_delay);
+ if (n->has_sy_src)
+ delay = MAX2(delay, ctx->sy_delay);
return delay;
}
@@ -404,9 +404,9 @@ add_single_reg_dep(struct ir3_postsched_deps_state *state,
d = ir3_delayslots_with_repeat(dep->instr, node->instr, dst_n, src_n);
node->delay = MAX2(node->delay, d_soft);
if (is_sy_producer(dep->instr))
- node->has_tex_src = true;
+ node->has_sy_src = true;
if (is_ss_producer(dep->instr))
- node->has_sfu_src = true;
+ node->has_ss_src = true;
}
add_dep(state, dep, node, d);
@@ -637,8 +637,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;
+ ctx->sy_delay = 0;
+ ctx->ss_delay = 0;
/* move all instructions to the unscheduled list, and
* empty the block's instruction list (to which we will
More information about the mesa-commit
mailing list