From c3526585b79f6865bfedd15a7336027597555ec7 Mon Sep 17 00:00:00 2001 From: Christoph Bumiller Date: Thu, 31 Mar 2011 16:36:31 +0200 Subject: nv50: fix for GPR allocation granularity being 16 bit --- src/gallium/drivers/nv50/nv50_pc_regalloc.c | 12 +++++++++--- 1 file 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 657df2c589b..df3ac54dce3 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, ®s[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(®s[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(®s[c], 0, mask << c); + mask |= 0x03030303 << 4; + mask_register_set(®s[c], 0, mask << (c * 2)); if (defs[c]->livei) insert_ordered_tail(®vals, defs[c]); -- cgit v1.2.3