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

util/ra: Use the conflicting neighbor to skip unavailable registers.

Browse source 
Now that we have an idea of how many regs the conflicting allocation uses,
we can just skip to the next one and save repeated tests to find the same
conflicting neighbor again.

shadowrun-returns shader-db time on skl -1.62821% +/- 1.58079% (n=679),
now there's no statistically significant change from the start of the series
(n=420)

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9437>
This commit is contained in:
Emma Anholt 2021-06-03 17:21:44 -07:00 • committed by Marge Bot
parent 23df5dba92
commit d6d7421e98
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/util/register_allocate.c
View file

@ -804,8 +804,8 @@ ra_class_allocations_conflict(struct ra_class *c1, unsigned int r1,
}
}
static bool
ra_any_neighbors_conflict(struct ra_graph *g, unsigned int n, unsigned int r)
static struct ra_node *
ra_find_conflicting_neighbor(struct ra_graph *g, unsigned int n, unsigned int r)
{
util_dynarray_foreach(&g->nodes[n].adjacency_list, unsigned int, n2p) {
unsigned int n2 = *n2p;
@ -814,11 +814,11 @@ ra_any_neighbors_conflict(struct ra_graph *g, unsigned int n, unsigned int r)
if (!BITSET_TEST(g->tmp.in_stack, n2) &&
ra_class_allocations_conflict(g->regs->classes[g->nodes[n].class], r,
g->regs->classes[g->nodes[n2].class], g->nodes[n2].reg)) {
return true;
return &g->nodes[n2];
}
}
return false;
return NULL;
}
/* Computes a bitfield of what regs are available for a given register
@ -907,8 +907,21 @@ ra_select(struct ra_graph *g)
if (!reg_belongs_to_class(r, c))
continue;
if (!ra_any_neighbors_conflict(g, n, r))
struct ra_node *conflicting = ra_find_conflicting_neighbor(g, n, r);
if (!conflicting) {
/* Found a reg! */
break;
}
if (g->regs->classes[conflicting->class]->contig_len) {
/* Skip to point at the last base reg of the conflicting reg
* allocation -- the loop will increment us to check the next reg
* after the conflicting allocaiton.
*/
unsigned conflicting_end = (conflicting->reg +
g->regs->classes[conflicting->class]->contig_len - 1);
assert(conflicting_end >= r);
ri += conflicting_end - r;
}
}
if (ri >= g->regs->count)