fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ir3/shared_ra: insert reloads before tied dst pcopies

Browse source 
The parallel copies use the reloaded values in their srcs so make sure
reloads happen before them.

Fixes a RA validation error in Windrose.

Signed-off-by: Job Noorman <jnoorman@igalia.com>
Fixes: fa22b0901a ("ir3/ra: Add specialized shared register RA/spilling")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41263>
(cherry picked from commit c67118a6eb)
This commit is contained in:
Job Noorman 2026-04-29 15:31:29 +02:00 • committed by Eric Engestrom
parent dd52c4d3f2
commit e6445291d5
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -434,7 +434,7 @@
"description": "ir3/shared_ra: insert reloads before tied dst pcopies",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "fa22b0901af548d5e1433ad4cdbda314182137c5",
"notes": null

12
src/freedreno/ir3/ir3_shared_ra.c
View file

@ -945,7 +945,7 @@ assign_src(struct ra_ctx *ctx, struct ir3_register *src)
static void
handle_dst(struct ra_ctx *ctx, struct ir3_instruction *instr,
struct ir3_register *dst)
struct ir3_register *dst, struct ir3_cursor *reload_cursor)
{
if (!(dst->flags & IR3_REG_SHARED))
return;
@ -1015,6 +1015,11 @@ handle_dst(struct ra_ctx *ctx, struct ir3_instruction *instr,
mov->cat1.src_type = mov->cat1.dst_type =
(dst->flags & IR3_REG_HALF) ? TYPE_U16 : TYPE_U32;;
dst->tied->num = dst->num;
/* If the tied src needs to be reloaded, this has to happen before the
* parallel copy we just inserted.
*/
*reload_cursor = ir3_before_instr(mov);
}
}
@ -1050,11 +1055,12 @@ handle_normal_instr(struct ra_ctx *ctx, struct ir3_instruction *instr)
ra_foreach_src_rev (src, instr)
assign_src(ctx, src);
struct ir3_cursor reload_cursor = ir3_before_instr(instr);
ra_foreach_dst (dst, instr)
handle_dst(ctx, instr, dst);
handle_dst(ctx, instr, dst, &reload_cursor);
ra_foreach_src (src, instr)
handle_src_late(ctx, ir3_before_instr(instr), src);
handle_src_late(ctx, reload_cursor, src);
}
static void