[Mesa-dev] [PATCH 4/5] i965/fs: Use correct spill offsets

[Jason Ekstrand]

On Mon, Oct 27, 2014 at 10:36 AM, Kristian Høgsberg <hoegsberg at gmail.com>
wrote:

> On Fri, Oct 24, 2014 at 12:25:06PM -0700, Jason Ekstrand wrote:
> > ---
> >  src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp | 11 +++++------
> >  1 file changed, 5 insertions(+), 6 deletions(-)
> >
> > diff --git a/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
> b/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
> > index d4b72d8..49b50ee 100644
> > --- a/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
> > +++ b/src/mesa/drivers/dri/i965/brw_fs_reg_allocate.cpp
> > @@ -651,7 +651,7 @@ fs_visitor::emit_unspill(bblock_t *block, fs_inst
> *inst, fs_reg dst,
> >        inst->insert_before(block, unspill_inst);
> >
> >        dst.reg_offset += reg_size;
> > -      spill_offset += reg_size * 8 * sizeof(float);
> > +      spill_offset += reg_size * REG_SIZE;
> >     }
> >  }
> >
> > @@ -671,7 +671,7 @@ fs_visitor::emit_spill(bblock_t *block, fs_inst
> *inst, fs_reg src,
> >           new(mem_ctx) fs_inst(SHADER_OPCODE_GEN4_SCRATCH_WRITE,
> >                                reg_null_f, src);
> >        src.reg_offset += reg_size;
> > -      spill_inst->offset = spill_offset + i * reg_size;
> > +      spill_inst->offset = spill_offset + i * reg_size * REG_SIZE;
>
> I would split this functional change into its own commit and leave all
> the s/reg_size/REG_SIZE/ type changes in a different commit.
>

That change is also functinoal.  Just a different function.  I'll give it a
better commit message.
--Jason


>
> Other than that, series
>
> Reviewed-by: Kristian Høgsberg <krh at bitplanet.net>
>
>
> >        spill_inst->ir = inst->ir;
> >        spill_inst->annotation = inst->annotation;
> >        spill_inst->mlen = 1 + reg_size; /* header, value */
> > @@ -759,7 +759,6 @@ fs_visitor::choose_spill_reg(struct ra_graph *g)
> >  void
> >  fs_visitor::spill_reg(int spill_reg)
> >  {
> > -   int reg_size = dispatch_width * sizeof(float);
> >     int size = virtual_grf_sizes[spill_reg];
> >     unsigned int spill_offset = last_scratch;
> >     assert(ALIGN(spill_offset, 16) == spill_offset); /* oword read/write
> req. */
> > @@ -786,7 +785,7 @@ fs_visitor::spill_reg(int spill_reg)
> >        spilled_any_registers = true;
> >     }
> >
> > -   last_scratch += size * reg_size;
> > +   last_scratch += size * REG_SIZE;
> >
> >     /* Generate spill/unspill instructions for the objects being
> >      * spilled.  Right now, we spill or unspill the whole thing to a
> > @@ -799,7 +798,7 @@ fs_visitor::spill_reg(int spill_reg)
> >            inst->src[i].reg == spill_reg) {
> >              int regs_read = inst->regs_read(this, i);
> >              int subset_spill_offset = (spill_offset +
> > -                                       reg_size *
> inst->src[i].reg_offset);
> > +                                       REG_SIZE *
> inst->src[i].reg_offset);
> >              fs_reg unspill_dst(GRF, virtual_grf_alloc(regs_read));
> >
> >              inst->src[i].reg = unspill_dst.reg;
> > @@ -813,7 +812,7 @@ fs_visitor::spill_reg(int spill_reg)
> >        if (inst->dst.file == GRF &&
> >         inst->dst.reg == spill_reg) {
> >           int subset_spill_offset = (spill_offset +
> > -                                    reg_size * inst->dst.reg_offset);
> > +                                    REG_SIZE * inst->dst.reg_offset);
> >           fs_reg spill_src(GRF, virtual_grf_alloc(inst->regs_written));
> >
> >           inst->dst.reg = spill_src.reg;
> > --
> > 2.1.0
> >
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20141027/00b5924b/attachment-0001.html>