fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 11:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ac,radeonsi: increase the maximum number of shader args and return values

Browse source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
This commit is contained in:
Marek Olšák 2020-01-08 15:52:44 -05:00
parent ef253c6789
commit 220d00314f
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/amd/common/ac_shader_args.h
View file

@ -50,7 +50,8 @@ struct ac_arg {
}; };
#define AC_MAX_ARGS 64 #define AC_MAX_ARGS 128
struct ac_shader_args { struct ac_shader_args {
/* Info on how to declare arguments */ /* Info on how to declare arguments */
struct { struct {

12
src/gallium/drivers/radeonsi/si_shader.c
View file

@ -3447,7 +3447,7 @@ static void add_arg_checked(struct ac_shader_args *args,
static void create_function(struct si_shader_context *ctx) static void create_function(struct si_shader_context *ctx)
{ {
struct si_shader *shader = ctx->shader; struct si_shader *shader = ctx->shader;
LLVMTypeRef returns[16+32*4]; LLVMTypeRef returns[AC_MAX_ARGS];
unsigned i, num_return_sgprs; unsigned i, num_return_sgprs;
unsigned num_returns = 0; unsigned num_returns = 0;
unsigned num_prolog_vgprs = 0; unsigned num_prolog_vgprs = 0;
@ -5307,7 +5307,7 @@ static void si_build_gs_prolog_function(struct si_shader_context *ctx,
{ {
unsigned num_sgprs, num_vgprs; unsigned num_sgprs, num_vgprs;
LLVMBuilderRef builder = ctx->ac.builder; LLVMBuilderRef builder = ctx->ac.builder;
LLVMTypeRef returns[48]; LLVMTypeRef returns[AC_MAX_ARGS];
LLVMValueRef func, ret; LLVMValueRef func, ret;
memset(&ctx->args, 0, sizeof(ctx->args)); memset(&ctx->args, 0, sizeof(ctx->args));
@ -5434,9 +5434,9 @@ static void si_build_wrapper_function(struct si_shader_context *ctx,
{ {
LLVMBuilderRef builder = ctx->ac.builder; LLVMBuilderRef builder = ctx->ac.builder;
/* PS epilog has one arg per color component; gfx9 merged shader /* PS epilog has one arg per color component; gfx9 merged shader
* prologs need to forward 32 user SGPRs. * prologs need to forward 40 SGPRs.
*/ */
LLVMValueRef initial[64], out[64]; LLVMValueRef initial[AC_MAX_ARGS], out[AC_MAX_ARGS];
LLVMTypeRef function_type; LLVMTypeRef function_type;
unsigned num_first_params; unsigned num_first_params;
unsigned num_out, initial_num_out; unsigned num_out, initial_num_out;
@ -5502,7 +5502,7 @@ static void si_build_wrapper_function(struct si_shader_context *ctx,
/* Prepare the return type. */ /* Prepare the return type. */
unsigned num_returns = 0; unsigned num_returns = 0;
LLVMTypeRef returns[32], last_func_type, return_type; LLVMTypeRef returns[AC_MAX_ARGS], last_func_type, return_type;
last_func_type = LLVMGetElementType(LLVMTypeOf(parts[num_parts - 1])); last_func_type = LLVMGetElementType(LLVMTypeOf(parts[num_parts - 1]));
return_type = LLVMGetReturnType(last_func_type); return_type = LLVMGetReturnType(last_func_type);
@ -5573,7 +5573,7 @@ static void si_build_wrapper_function(struct si_shader_context *ctx,
/* Now chain the parts. */ /* Now chain the parts. */
LLVMValueRef ret = NULL; LLVMValueRef ret = NULL;
for (unsigned part = 0; part < num_parts; ++part) { for (unsigned part = 0; part < num_parts; ++part) {
LLVMValueRef in[48]; LLVMValueRef in[AC_MAX_ARGS];
LLVMTypeRef ret_type; LLVMTypeRef ret_type;
unsigned out_idx = 0; unsigned out_idx = 0;
unsigned num_params = LLVMCountParams(parts[part]); unsigned num_params = LLVMCountParams(parts[part]);