Jerome Glisse [2010-11-21 11:07]:
> On Sun, Nov 21, 2010 at 10:30 AM, Tilman Sauerbeck
> <til...@code-monkey.de> wrote:
> > Signed-off-by: Tilman Sauerbeck <til...@code-monkey.de>
> > ---
> >
> > This is pretty ugly, but hopefully it will make a proper fix easier
> > to implement :)
> >
> > src/gallium/drivers/r600/r600_asm.c | 30
> > +++++++++++++++++++++++++++++-
> > src/gallium/drivers/r600/r600_asm.h | 1 +
> > src/gallium/drivers/r600/r600_shader.c | 7 ++++++-
> > 3 files changed, 36 insertions(+), 2 deletions(-)
> >
> > diff --git a/src/gallium/drivers/r600/r600_asm.c
> > b/src/gallium/drivers/r600/r600_asm.c
> > index ba1471e..fc85432 100644
> > --- a/src/gallium/drivers/r600/r600_asm.c
> > +++ b/src/gallium/drivers/r600/r600_asm.c
> > @@ -410,6 +410,7 @@ int r600_bc_add_alu_type(struct r600_bc *bc, const
> > struct r600_bc_alu *alu, int
> > {
> > struct r600_bc_alu *nalu = r600_bc_alu();
> > struct r600_bc_alu *lalu;
> > + unsigned kcache1_addr = 0;
> > int i, r;
> >
> > if (nalu == NULL)
> > @@ -440,13 +441,37 @@ int r600_bc_add_alu_type(struct r600_bc *bc, const
> > struct r600_bc_alu *alu, int
> > }
> > /* number of gpr == the last gpr used in any alu */
> > for (i = 0; i < 3; i++) {
> > + unsigned const_index;
> > +
> > if (alu->src[i].sel >= bc->ngpr && alu->src[i].sel < 128) {
> > bc->ngpr = alu->src[i].sel + 1;
> > }
> > +
> > + if (alu->src[i].is_const) {
> > + const_index = alu->src[i].sel - 128;
> > + unsigned want_addr;
> > +
> > + /* Constants 0-31 will be read from the first
> > + * set of constants (kcache0_*).
> > + *
> > + * Constants > 31 will be read from the second set
> > + * of constants (kcache1_*).
> > + */
> > + if (const_index > 31) {
> > + want_addr = (const_index / 32) * 2;
> > +
> > + if (!kcache1_addr || kcache1_addr ==
> > want_addr) {
> > + kcache1_addr = want_addr;
> > + nalu->src[i].sel = 160 +
> > (const_index % 32);
> > + } else
> > + fprintf(stderr, "kcache1_addr
> > already in use (want_addr %i, is %i)\n", want_addr, kcache1_addr);
>
> Here instead of printing and error you should add a new clause
> r600_add_cf iirc and this should work. Also you might want to check if
> want_addr is in [kache1_addr ; kcache1_addr+32] range in which case
> you don't need a new cf.My code doesn't even find the most simple kcache address clashes. With TGSI code as this: > 0: MUL TEMP[0], CONST[32], CONST[0] we'd have _one_ CF clause with one MOV instruction copying one constant to a temporary, and then the MUL for the temporary and the second const. The first instruction might set bc->cf_last->kcache1_addr = 2, but the second instruction would overwrite kcache1_addr with zero again. So at the very least we'd need to remember if we already stored kcache1_addr across calls to r600_bc_add_alu(). Regards, Tilman -- A: Because it messes up the order in which people normally read text. Q: Why is top-posting such a bad thing? A: Top-posting. Q: What is the most annoying thing on usenet and in e-mail?
pgp9QfHaqgBDq.pgp
Description: PGP signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
