Mesa (master): nv50: fix for GPR allocation granularity being 16 bit

[Christoph Bumiller]

Module: Mesa
Branch: master
Commit: c3526585b79f6865bfedd15a7336027597555ec7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c3526585b79f6865bfedd15a7336027597555ec7

Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date:   Thu Mar 31 16:36:31 2011 +0200

nv50: fix for GPR allocation granularity being 16 bit

---

 src/gallium/drivers/nv50/nv50_pc_regalloc.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/nv50/nv50_pc_regalloc.c b/src/gallium/drivers/nv50/nv50_pc_regalloc.c
index 657df2c..df3ac54 100644
--- a/src/gallium/drivers/nv50/nv50_pc_regalloc.c
+++ b/src/gallium/drivers/nv50/nv50_pc_regalloc.c
@@ -971,6 +971,9 @@ pass_allocate_constrained_values(struct nv_pc_pass *ctx)
          continue;
       }
 
+      /* Compute registers available for this "vector" of consecutive registers.
+       * Each value (component) has its own independent live interval.
+       */
       for (c = 0; c < vsize; ++c) {
          nv50_ctor_register_set(ctx->pc, &regs[c]);
 
@@ -978,10 +981,13 @@ pass_allocate_constrained_values(struct nv_pc_pass *ctx)
             if (val->reg.id >= 0 && livei_have_overlap(val, defs[c]))
                reg_occupy(&regs[c], val);
          }
-         mask = 0x11111111;
+         /* Only 32 bit GPRs will be allocated here, but register set
+          * granularity for GPRs is 16 bit.
+          */
+         mask = 0x03030303;
          if (vsize == 2) /* granularity is 2 and not 4 */
-            mask |= 0x11111111 << 2;
-         mask_register_set(&regs[c], 0, mask << c);
+            mask |= 0x03030303 << 4;
+         mask_register_set(&regs[c], 0, mask << (c * 2));
 
          if (defs[c]->livei)
             insert_ordered_tail(&regvals, defs[c]);