ac/llvm: skip ballot zext for 32-bit dest with wave32-as-wave64
authorRhys Perry <pendingchaos02@gmail.com>
Thu, 13 Jul 2023 15:37:11 +0000 (16:37 +0100)
committerMarge Bot <emma+marge@anholt.net>
Mon, 17 Jul 2023 11:21:35 +0000 (11:21 +0000)
NGG lowering can ballots with a 32-bit destination even if the ballot bit
size is 64.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24140>

src/amd/llvm/ac_nir_to_llvm.c

index 0f63dc5..03b74cb 100644 (file)
@@ -3043,8 +3043,10 @@ static bool visit_intrinsic(struct ac_nir_context *ctx, nir_intrinsic_instr *ins
    switch (instr->intrinsic) {
    case nir_intrinsic_ballot:
       result = ac_build_ballot(&ctx->ac, get_src(ctx, instr->src[0]));
-      if (ctx->ac.ballot_mask_bits > ctx->ac.wave_size)
-         result = LLVMBuildZExt(ctx->ac.builder, result, ctx->ac.iN_ballotmask, "");
+      if (instr->dest.ssa.bit_size > ctx->ac.wave_size) {
+         LLVMTypeRef dest_type = LLVMIntTypeInContext(ctx->ac.context, instr->dest.ssa.bit_size);
+         result = LLVMBuildZExt(ctx->ac.builder, result, dest_type, "");
+      }
       break;
    case nir_intrinsic_read_invocation:
       result =