fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-15 02:00:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

aco/sched: don't use previously unused preserved registers

Browse source 
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38679>
This commit is contained in:
Rhys Perry 2025-11-19 11:53:07 +00:00 • committed by Marge Bot
parent da1dca28a7
commit 8a3cc7200e
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/amd/compiler/aco_scheduler.cpp
View file

@ -1311,8 +1311,10 @@ schedule_program(Program* program)
RegisterDemand demand;
for (Block& block : program->blocks)
demand.update(block.register_demand);
demand.vgpr += program->config->num_shared_vgprs / 2;
demand.update(program->fixed_reg_demand);
RegisterDemand usage = demand;
usage.vgpr += program->config->num_shared_vgprs / 2;
usage.update(program->fixed_reg_demand);
sched_ctx ctx;
ctx.gfx_level = program->gfx_level;
@ -1326,7 +1328,7 @@ schedule_program(Program* program)
/* If we already have less waves than the minimum, don't reduce them further.
* Otherwise, sacrifice some waves and use more VGPRs, in order to improve scheduling.
*/
int vgpr_demand = std::max<int>(24, demand.vgpr) + 12 * reg_file_multiple;
int vgpr_demand = std::max<int>(24, usage.vgpr) + 12 * reg_file_multiple;
int target_waves = std::max(wave_minimum, program->dev.physical_vgprs / vgpr_demand);
target_waves = max_suitable_waves(program, std::min<int>(program->num_waves, target_waves));
assert(target_waves >= program->min_waves);
@ -1334,6 +1336,14 @@ schedule_program(Program* program)
ctx.mv.max_registers = get_addr_regs_from_waves(program, target_waves);
ctx.mv.max_registers.vgpr -= 2;
/* If this is a callee, don't use unneeded preserved VGPRs. */
if (program->is_callee) {
RegisterDemand limit = get_addr_regs_from_waves(program, program->min_waves);
RegisterDemand max_clobbered_regs = program->callee_abi.numClobbered(limit);
ctx.mv.max_registers.vgpr = std::min(ctx.mv.max_registers.vgpr, max_clobbered_regs.vgpr);
ctx.mv.max_registers.update(demand);
}
/* VMEM_MAX_MOVES and such assume pre-GFX10 wave count */
ctx.occupancy_factor = target_waves / wave_factor;