[Mesa-dev] [PATCH 2/3] ac/nir: add 64-bit SSBO atomic operations support

[Marek Olšák]

On Tue, Apr 16, 2019 at 4:35 AM Samuel Pitoiset <samuel.pitoiset at gmail.com>
wrote:

> Except compare&swap which is still buggy.
>
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
> ---
>  src/amd/common/ac_nir_to_llvm.c | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/src/amd/common/ac_nir_to_llvm.c
> b/src/amd/common/ac_nir_to_llvm.c
> index de2a9ed8f67..26ad30387a9 100644
> --- a/src/amd/common/ac_nir_to_llvm.c
> +++ b/src/amd/common/ac_nir_to_llvm.c
> @@ -1643,8 +1643,9 @@ static void visit_store_ssbo(struct ac_nir_context
> *ctx,
>  static LLVMValueRef visit_atomic_ssbo(struct ac_nir_context *ctx,
>                                        const nir_intrinsic_instr *instr)
>  {
> +       LLVMTypeRef return_type = LLVMTypeOf(get_src(ctx, instr->src[2]));
>         const char *op;
> -       char name[64];
> +       char name[64], type[8];
>         LLVMValueRef params[6];
>         int arg_count = 0;
>
> @@ -1697,18 +1698,22 @@ static LLVMValueRef visit_atomic_ssbo(struct
> ac_nir_context *ctx,
>                 params[arg_count++] = ctx->ac.i32_0; /* soffset */
>                 params[arg_count++] = ctx->ac.i32_0; /* slc */
>
> +


The extra empty line is unnecessary.

Marek

+               ac_build_type_name_for_intr(return_type, type,
> sizeof(type));
>                 snprintf(name, sizeof(name),
> -                        "llvm.amdgcn.raw.buffer.atomic.%s.i32", op);
> +                        "llvm.amdgcn.raw.buffer.atomic.%s.%s", op, type);
>         } else {
>                 params[arg_count++] = ctx->ac.i32_0; /* vindex */
>                 params[arg_count++] = get_src(ctx, instr->src[1]); /*
> voffset */
>                 params[arg_count++] = ctx->ac.i1false; /* slc */
>
> +               assert(return_type == ctx->ac.i32);
>                 snprintf(name, sizeof(name),
>                          "llvm.amdgcn.buffer.atomic.%s", op);
>         }
>
> -       return ac_build_intrinsic(&ctx->ac, name, ctx->ac.i32, params,
> arg_count, 0);
> +       return ac_build_intrinsic(&ctx->ac, name, return_type, params,
> +                                 arg_count, 0);
>  }
>
>  static LLVMValueRef visit_load_buffer(struct ac_nir_context *ctx,
> --
> 2.21.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20190416/d7817926/attachment-0001.html>