AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ir3/cp: make try_swap_mad_two_srcs more generic

Browse Source 
In preparation for supporting sad, rename to try_swap_cat3_two_srcs and
add argument for src n.

Signed-off-by: Job Noorman <jnoorman@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32501>
This commit is contained in:
Job Noorman
2024-12-11 13:40:25 +01:00
committed by Marge Bot
parent 00656526d8
commit ea2a75f81a
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/freedreno/ir3/ir3_cp.c
+6 -5
View File
@@ -242,9 +242,10 @@ try_swap_two_srcs(struct ir3_instruction *instr, unsigned n, unsigned new_flags,
* possible to swap the 1st and 2nd sources.
*/
static bool
try_swap_mad_two_srcs(struct ir3_instruction *instr, unsigned new_flags)
try_swap_cat3_two_srcs(struct ir3_instruction *instr, unsigned n,
unsigned new_flags)
{
if (!is_mad(instr->opc))
if (!(is_mad(instr->opc) && n == 1))
return false;
/* If we've already tried, nothing more to gain.. we will only
@@ -269,7 +270,7 @@ try_swap_mad_two_srcs(struct ir3_instruction *instr, unsigned new_flags)
if (!(new_flags & (IR3_REG_CONST | IR3_REG_SHARED)))
return false;
return try_swap_two_srcs(instr, 1, new_flags, 0);
return try_swap_two_srcs(instr, n, new_flags, 0);
}
/**
@@ -307,7 +308,7 @@ reg_cp(struct ir3_cp_ctx *ctx, struct ir3_instruction *instr,
reg->def->instr->use_count++;
return true;
} else if (n == 1 && try_swap_mad_two_srcs(instr, new_flags)) {
} else if (try_swap_cat3_two_srcs(instr, n, new_flags)) {
return true;
}
} else if ((is_same_type_mov(src) || is_const_mov(src)) &&
@@ -334,7 +335,7 @@ reg_cp(struct ir3_cp_ctx *ctx, struct ir3_instruction *instr,
* src prior to multiply) can swap their first two srcs if
* src[0] is !CONST and src[1] is CONST:
*/
if ((n == 1) && try_swap_mad_two_srcs(instr, new_flags)) {
if (try_swap_cat3_two_srcs(instr, n, new_flags)) {
return true;
} else {
return false;