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

ir3/ra: create merge sets for splits/collects inserted for shared RA

Browse source 
Since shared RA happens after creating merge sets, newly inserted
splits/collects did not have merge sets created for them. Fix this by
creating merge sets for new instructions after shared RA.

Signed-off-by: Job Noorman <jnoorman@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33319>
This commit is contained in:
Job Noorman 2025-03-14 09:00:04 +01:00 • committed by Marge Bot
parent 0cafd07b0c
commit 45a5ccbf07
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1464,6 +1464,9 @@ ir3_ra_shared(struct ir3_shader_variant *v, struct ir3_liveness **live_ptr)
ctx.live = live;
ctx.pcopy_src_map = _mesa_pointer_hash_table_create(NULL);
/* Used to detect instructions inserted by this pass. */
unsigned last_old_serialno = v->ir->instr_count;
foreach_block (block, &v->ir->block_list) {
handle_block(&ctx, block);
}
@ -1494,6 +1497,16 @@ ir3_ra_shared(struct ir3_shader_variant *v, struct ir3_liveness **live_ptr)
*live_ptr = ir3_calc_liveness(live_mem_ctx, v->ir);
(*live_ptr)->interval_offset = interval_offset;
/* Create merge sets for the splits/collects created by this pass. */
foreach_block (block, &v->ir->block_list) {
foreach_instr (instr, &block->instr_list) {
if (instr->serialno > last_old_serialno &&
(instr->opc == OPC_META_SPLIT || instr->opc == OPC_META_COLLECT)) {
ir3_aggressive_coalesce(*live_ptr, instr);
}
}
}
/* We've created instructions that will be handled by regular RA (e.g.,
* shared spills) so make sure they have their interval offsets assigned.
*/