fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-29 08:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ir3/ra: ignore phis handled by shared RA

Browse source 
If shared RA is used, it may have handled some phis. These are already
ignored by regular RA in handle_phi but were used before that in
potentially dangerous ways. More specifically, the interval of such phis
was accessed which may cause an out-of-bounds read since it was never
created. Fix this by skipping such phis earlier.

Signed-off-by: Job Noorman <jnoorman@igalia.com>
Fixes: c6a932d4b3 ("ir3/ra: handle phis with preferred regs first")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34503>
This commit is contained in:
Job Noorman 2025-04-14 16:00:13 +02:00 • committed by Marge Bot
parent d8033ba173
commit af8105d085
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2035,9 +2035,6 @@ handle_live_out(struct ra_ctx *ctx, struct ir3_register *def)
static void
handle_phi(struct ra_ctx *ctx, struct ir3_register *def)
{
if (!(def->flags & IR3_REG_SSA))
return;
struct ra_file *file = ra_get_file(ctx, def);
struct ra_interval *interval = ra_interval_get(ctx, def);
@ -2311,6 +2308,11 @@ handle_block(struct ra_ctx *ctx, struct ir3_block *block)
if (instr->opc == OPC_META_PHI) {
struct ir3_register *dst = instr->dsts[0];
/* Some phis may have been handled by shared RA already. */
if (!(dst->flags & IR3_REG_SSA)) {
continue;
}
if (dst->merge_set && dst->merge_set->preferred_reg != (physreg_t)~0) {
handle_phi(ctx, dst);
} else {
@ -2329,6 +2331,10 @@ handle_block(struct ra_ctx *ctx, struct ir3_block *block)
if (instr->opc == OPC_META_PHI) {
struct ir3_register *dst = instr->dsts[0];
if (!(dst->flags & IR3_REG_SSA)) {
continue;
}
if (!ra_interval_get(ctx, dst)->interval.inserted) {
handle_phi(ctx, dst);
}