ra: Add q_values parameter to ra_set_finalize()

This allows the user to pass precomputed q values to the allocator.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Tom Stellard
2012-09-03 10:43:45 -04:00
parent cfeb99c7da
commit e0f64a837f
5 changed files with 18 additions and 5 deletions

View File

@@ -629,7 +629,7 @@ static void do_advanced_regalloc(struct regalloc_state * s)
get_reg_id(s->Input[i].Index, writemask)); get_reg_id(s->Input[i].Index, writemask));
} }
ra_set_finalize(regs); ra_set_finalize(regs, NULL);
graph = ra_alloc_interference_graph(regs, node_count + s->NumInputs); graph = ra_alloc_interference_graph(regs, node_count + s->NumInputs);

View File

@@ -142,7 +142,7 @@ brw_alloc_reg_set_for_classes(struct brw_context *brw,
class_count++; class_count++;
} }
ra_set_finalize(brw->wm.regs); ra_set_finalize(brw->wm.regs, NULL);
} }
bool bool

View File

@@ -136,7 +136,7 @@ brw_alloc_reg_set_for_classes(struct brw_context *brw,
} }
assert(reg == ra_reg_count); assert(reg == ra_reg_count);
ra_set_finalize(brw->vs.regs); ra_set_finalize(brw->vs.regs, NULL);
} }
void void

View File

@@ -255,9 +255,11 @@ ra_class_add_reg(struct ra_regs *regs, unsigned int c, unsigned int r)
/** /**
* Must be called after all conflicts and register classes have been * Must be called after all conflicts and register classes have been
* set up and before the register set is used for allocation. * set up and before the register set is used for allocation.
* To avoid costly q value computation, use the q_values paramater
* to pass precomputed q values to this function.
*/ */
void void
ra_set_finalize(struct ra_regs *regs) ra_set_finalize(struct ra_regs *regs, unsigned int **q_values)
{ {
unsigned int b, c; unsigned int b, c;
@@ -265,6 +267,15 @@ ra_set_finalize(struct ra_regs *regs)
regs->classes[b]->q = ralloc_array(regs, unsigned int, regs->class_count); regs->classes[b]->q = ralloc_array(regs, unsigned int, regs->class_count);
} }
if (q_values) {
for (b = 0; b < regs->class_count; b++) {
for (c = 0; c < regs->class_count; c++) {
regs->classes[b]->q[c] = q_values[b][c];
}
}
return;
}
/* Compute, for each class B and C, how many regs of B an /* Compute, for each class B and C, how many regs of B an
* allocation to C could conflict with. * allocation to C could conflict with.
*/ */

View File

@@ -43,7 +43,9 @@ void ra_add_reg_conflict(struct ra_regs *regs,
void ra_add_transitive_reg_conflict(struct ra_regs *regs, void ra_add_transitive_reg_conflict(struct ra_regs *regs,
unsigned int base_reg, unsigned int reg); unsigned int base_reg, unsigned int reg);
void ra_class_add_reg(struct ra_regs *regs, unsigned int c, unsigned int reg); void ra_class_add_reg(struct ra_regs *regs, unsigned int c, unsigned int reg);
void ra_set_finalize(struct ra_regs *regs); void ra_set_num_conflicts(struct ra_regs *regs, unsigned int class_a,
unsigned int class_b, unsigned int num_conflicts);
void ra_set_finalize(struct ra_regs *regs, unsigned int **conflicts);
/** @} */ /** @} */
/** @{ Interference graph setup. /** @{ Interference graph setup.