From 6c350e34eefe483f03c4bd61ae9cbe7b3a66a246 Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Tue, 6 Sep 2016 11:46:26 +0200 Subject: [PATCH] i965/vec4: adjust spilling costs for 64-bit registers. Reviewed-by: Matt Turner --- .../drivers/dri/i965/brw_vec4_reg_allocate.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp b/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp index 2e5bc79b485..e3b46cc2f7f 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_reg_allocate.cpp @@ -369,6 +369,15 @@ can_use_scratch_for_source(const vec4_instruction *inst, unsigned i, return prev_inst_read_scratch_reg; } +static inline unsigned +spill_cost_for_type(enum brw_reg_type type) +{ + /* Spilling of a 64-bit register involves emitting 2 32-bit scratch + * messages plus the 64b/32b shuffling code. + */ + return type_sz(type) == 8 ? 2.25f : 1.0f; +} + void vec4_visitor::evaluate_spill_costs(float *spill_costs, bool *no_spill) { @@ -395,7 +404,8 @@ vec4_visitor::evaluate_spill_costs(float *spill_costs, bool *no_spill) * reg for this instruction. */ if (!can_use_scratch_for_source(inst, i, inst->src[i].nr)) { - spill_costs[inst->src[i].nr] += loop_scale; + spill_costs[inst->src[i].nr] += + loop_scale * spill_cost_for_type(inst->src[i].type); if (inst->src[i].reladdr || inst->src[i].offset >= REG_SIZE) no_spill[inst->src[i].nr] = true; @@ -423,7 +433,8 @@ vec4_visitor::evaluate_spill_costs(float *spill_costs, bool *no_spill) } if (inst->dst.file == VGRF && !no_spill[inst->dst.nr]) { - spill_costs[inst->dst.nr] += loop_scale; + spill_costs[inst->dst.nr] += + loop_scale * spill_cost_for_type(inst->dst.type); if (inst->dst.reladdr || inst->dst.offset >= REG_SIZE) no_spill[inst->dst.nr] = true; -- 2.30.2