radv: Only allow 16 user SGPRs for compute on GFX9+.
authorBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Sun, 16 Sep 2018 10:28:33 +0000 (12:28 +0200)
committerBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Sun, 16 Sep 2018 10:50:58 +0000 (12:50 +0200)
Apparently for compute there are only 16 instead of the 32 for the
graphics path.

Fixes dEQP-VK.binding_model.descriptorset_random.sets16.noarray.ubolimitlow.sbolimitlow.imglimitlow.noiub.comp.0

CC: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
src/amd/vulkan/radv_nir_to_llvm.c

index 968d96fc056138f6bde4aeebd6cfaaa2a0e26dda..32d347ebd0fc4c7211a5771d11c2b2fdfada74ce 100644 (file)
@@ -689,7 +689,7 @@ static void allocate_user_sgprs(struct radv_shader_context *ctx,
        if (ctx->shader_info->info.loads_push_constants)
                user_sgpr_count += HAVE_32BIT_POINTERS ? 1 : 2;
 
-       uint32_t available_sgprs = ctx->options->chip_class >= GFX9 ? 32 : 16;
+       uint32_t available_sgprs = ctx->options->chip_class >= GFX9 && stage != MESA_SHADER_COMPUTE ? 32 : 16;
        uint32_t remaining_sgprs = available_sgprs - user_sgpr_count;
        uint32_t num_desc_set =
                util_bitcount(ctx->shader_info->info.desc_set_used_mask);