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

pan/mdg: Fill from TLS before spilling non-SSA nodes

Browse source 
Otherwise the data already written to the node will get overwritten.

Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11212>
(cherry picked from commit 31d26ebf1b)
This commit is contained in:
Icecream95 2021-06-07 19:30:02 +12:00 • committed by Eric Engestrom
parent 538b8d132b
commit 5c6f340bf5
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -355,7 +355,7 @@
"description": "pan/mdg: Fill from TLS before spilling non-SSA nodes",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

16
src/panfrost/midgard/midgard_ra.c
View file

@ -845,8 +845,14 @@ mir_spill_register(
/* For special reads, figure out how many bytes we need */
unsigned read_bytemask = 0;
/* If multiple instructions write to this destination, we'll have to
* fill from TLS before writing */
unsigned write_count = 0;
mir_foreach_instr_global_safe(ctx, ins) {
read_bytemask |= mir_bytemask_of_read_components(ins, spill_node);
if (ins->dest == spill_node)
++write_count;
}
/* For TLS, replace all stores to the spilled node. For
@ -879,7 +885,15 @@ mir_spill_register(
mir_insert_instruction_after_scheduled(ctx, block, ins, st);
} else {
ins->dest = spill_index++;
unsigned dest = spill_index++;
if (write_count > 1 && mir_bytemask(ins) != 0xF) {
midgard_instruction read =
v_load_store_scratch(dest, spill_slot, false, 0xF);
mir_insert_instruction_before_scheduled(ctx, block, ins, read);
}
ins->dest = dest;
ins->no_spill |= (1 << spill_class);
midgard_instruction st =