[Mesa-dev] [PATCH] nvc0/ir: fix subops for IMAD

[Ilia Mirkin]

On Thu, Sep 15, 2016 at 12:07 PM, Samuel Pitoiset
<samuel.pitoiset at gmail.com> wrote:
> Offset was wrong, it's at bit 8, not 4. Also, uses subr instead
> of sub when src2 has neg. Similar to GK110 now.
>
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
> Cc: mesa-stable at lists.freedesktop.org
> ---
>  src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
> index 47b4e7a..3ed70b5 100644
> --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
> +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_emit_nvc0.cpp
> @@ -736,9 +736,15 @@ CodeEmitterNVC0::emitUADD(const Instruction *i)
>  void
>  CodeEmitterNVC0::emitIMAD(const Instruction *i)
>  {
> +   uint8_t addOp =
> +      (i->src(2).mod.neg() << 1) | (i->src(0).mod.neg() ^ i->src(1).mod.neg());
> +
>     assert(i->encSize == 8);
>     emitForm_A(i, HEX64(20000000, 00000003));
>
> +   assert(addOp != 3);
> +   code[1] |= addOp << 8;

code[0], no?

> +
>     if (isSignedType(i->dType))
>        code[0] |= 1 << 7;
>     if (isSignedType(i->sType))
> @@ -749,10 +755,6 @@ CodeEmitterNVC0::emitIMAD(const Instruction *i)
>     if (i->flagsDef >= 0) code[1] |= 1 << 16;
>     if (i->flagsSrc >= 0) code[1] |= 1 << 23;
>
> -   if (i->src(2).mod.neg()) code[0] |= 0x10;
> -   if (i->src(1).mod.neg() ^
> -       i->src(0).mod.neg()) code[0] |= 0x20;
> -
>     if (i->subOp == NV50_IR_SUBOP_MUL_HIGH)
>        code[0] |= 1 << 6;
>  }
> --
> 2.8.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev