Mesa (master): ra: Create a reg_belongs_to_class() helper function.
Kenneth Graunke
kwg at kemper.freedesktop.org
Tue Mar 18 17:36:10 UTC 2014
Module: Mesa
Branch: master
Commit: 8d856c3937c790da626ef754622df91d562d8507
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d856c3937c790da626ef754622df91d562d8507
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Fri Feb 21 19:31:44 2014 -0800
ra: Create a reg_belongs_to_class() helper function.
This is a little easier to read.
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Christoph Brill <egore911 at gmail.com>
---
src/mesa/program/register_allocate.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/mesa/program/register_allocate.c b/src/mesa/program/register_allocate.c
index edde730..c763b96 100644
--- a/src/mesa/program/register_allocate.c
+++ b/src/mesa/program/register_allocate.c
@@ -284,6 +284,15 @@ ra_class_add_reg(struct ra_regs *regs, unsigned int c, unsigned int r)
}
/**
+ * Returns true if the register belongs to the given class.
+ */
+static bool
+reg_belongs_to_class(unsigned int r, struct ra_class *c)
+{
+ return c->regs[r];
+}
+
+/**
* Must be called after all conflicts and register classes have been
* set up and before the register set is used for allocation.
* To avoid costly q value computation, use the q_values paramater
@@ -319,7 +328,7 @@ ra_set_finalize(struct ra_regs *regs, unsigned int **q_values)
int conflicts = 0;
int i;
- if (!regs->classes[c]->regs[rc])
+ if (!reg_belongs_to_class(rc, regs->classes[c]))
continue;
for (i = 0; i < regs->regs[rc].num_conflicts; i++) {
@@ -479,7 +488,7 @@ ra_select(struct ra_graph *g)
*/
for (ri = 0; ri < g->regs->count; ri++) {
r = (start_search_reg + ri) % g->regs->count;
- if (!c->regs[r])
+ if (!reg_belongs_to_class(r, c))
continue;
/* Check if any of our neighbors conflict with this register choice. */
More information about the mesa-commit
mailing list