OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeonsi: change prototypes of si_is_multi_part_shader & si_is_merged_shader

Browse Source 
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3421>
This commit is contained in:
Marek Olšák
2020-01-15 19:08:44 -05:00
committed by Marge Bot
parent 7ce84b256e
commit 1a0890dcf3
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gallium/drivers/radeonsi/si_shader.c
View File

@@ -44,21 +44,21 @@ static const char scratch_rsrc_dword1_symbol[] =
static void si_dump_shader_key(const struct si_shader *shader, FILE *f); static void si_dump_shader_key(const struct si_shader *shader, FILE *f);
/** Whether the shader runs as a combination of multiple API shaders */ /** Whether the shader runs as a combination of multiple API shaders */
bool si_is_multi_part_shader(struct si_shader_context *ctx) bool si_is_multi_part_shader(struct si_shader *shader)
{ {
if (ctx->screen->info.chip_class <= GFX8) if (shader->selector->screen->info.chip_class <= GFX8)
return false; return false;
return ctx->shader->key.as_ls || return shader->key.as_ls ||
ctx->shader->key.as_es || shader->key.as_es ||
ctx->type == PIPE_SHADER_TESS_CTRL || shader->selector->type == PIPE_SHADER_TESS_CTRL ||
ctx->type == PIPE_SHADER_GEOMETRY; shader->selector->type == PIPE_SHADER_GEOMETRY;
} }
/** Whether the shader runs on a merged HW stage (LSHS or ESGS) */ /** Whether the shader runs on a merged HW stage (LSHS or ESGS) */
bool si_is_merged_shader(struct si_shader_context *ctx) bool si_is_merged_shader(struct si_shader *shader)
{ {
return ctx->shader->key.as_ngg || si_is_multi_part_shader(ctx); return shader->key.as_ngg || si_is_multi_part_shader(shader);
} }
/** /**
@@ -286,7 +286,7 @@ static void declare_vb_descriptor_input_sgprs(struct si_shader_context *ctx)
if (num_vbos_in_user_sgprs) { if (num_vbos_in_user_sgprs) {
unsigned user_sgprs = ctx->args.num_sgprs_used; unsigned user_sgprs = ctx->args.num_sgprs_used;
if (si_is_merged_shader(ctx)) if (si_is_merged_shader(ctx->shader))
user_sgprs -= 8; user_sgprs -= 8;
assert(user_sgprs <= SI_SGPR_VS_VB_DESCRIPTOR_FIRST); assert(user_sgprs <= SI_SGPR_VS_VB_DESCRIPTOR_FIRST);
@@ -2016,7 +2016,7 @@ bool si_compile_shader(struct si_screen *sscreen,
} }
/* Add the scratch offset to input SGPRs. */ /* Add the scratch offset to input SGPRs. */
if (shader->config.scratch_bytes_per_wave && !si_is_merged_shader(&ctx)) if (shader->config.scratch_bytes_per_wave && !si_is_merged_shader(shader))
shader->info.num_input_sgprs += 1; /* scratch byte offset */ shader->info.num_input_sgprs += 1; /* scratch byte offset */
/* Calculate the number of fragment input VGPRs. */ /* Calculate the number of fragment input VGPRs. */

4
src/gallium/drivers/radeonsi/si_shader_internal.h
View File

@@ -196,8 +196,8 @@ si_shader_context_from_abi(struct ac_shader_abi *abi)
return container_of(abi, ctx, abi); return container_of(abi, ctx, abi);
} }
bool si_is_multi_part_shader(struct si_shader_context *ctx); bool si_is_multi_part_shader(struct si_shader *shader);
bool si_is_merged_shader(struct si_shader_context *ctx); bool si_is_merged_shader(struct si_shader *shader);
void si_add_arg_checked(struct ac_shader_args *args, void si_add_arg_checked(struct ac_shader_args *args,
enum ac_arg_regfile file, enum ac_arg_regfile file,
unsigned registers, enum ac_arg_type type, unsigned registers, enum ac_arg_type type,

8
src/gallium/drivers/radeonsi/si_shader_llvm.c
View File

@@ -298,7 +298,7 @@ LLVMValueRef si_insert_input_ptr(struct si_shader_context *ctx, LLVMValueRef ret
LLVMValueRef si_prolog_get_rw_buffers(struct si_shader_context *ctx) LLVMValueRef si_prolog_get_rw_buffers(struct si_shader_context *ctx)
{ {
LLVMValueRef ptr[2], list; LLVMValueRef ptr[2], list;
bool merged_shader = si_is_merged_shader(ctx); bool merged_shader = si_is_merged_shader(ctx->shader);
ptr[0] = LLVMGetParam(ctx->main_fn, (merged_shader ? 8 : 0) + SI_SGPR_RW_BUFFERS); ptr[0] = LLVMGetParam(ctx->main_fn, (merged_shader ? 8 : 0) + SI_SGPR_RW_BUFFERS);
list = LLVMBuildIntToPtr(ctx->ac.builder, ptr[0], list = LLVMBuildIntToPtr(ctx->ac.builder, ptr[0],
@@ -634,7 +634,7 @@ void si_build_wrapper_function(struct si_shader_context *ctx, LLVMValueRef *part
si_llvm_create_func(ctx, "wrapper", returns, num_returns, si_llvm_create_func(ctx, "wrapper", returns, num_returns,
si_get_max_workgroup_size(ctx->shader)); si_get_max_workgroup_size(ctx->shader));
if (si_is_merged_shader(ctx)) if (si_is_merged_shader(ctx->shader))
ac_init_exec_full_mask(&ctx->ac); ac_init_exec_full_mask(&ctx->ac);
/* Record the arguments of the function as if they were an output of /* Record the arguments of the function as if they were an output of
@@ -692,7 +692,7 @@ void si_build_wrapper_function(struct si_shader_context *ctx, LLVMValueRef *part
/* Merged shaders are executed conditionally depending /* Merged shaders are executed conditionally depending
* on the number of enabled threads passed in the input SGPRs. */ * on the number of enabled threads passed in the input SGPRs. */
if (si_is_multi_part_shader(ctx) && part == 0) { if (si_is_multi_part_shader(ctx->shader) && part == 0) {
LLVMValueRef ena, count = initial[3]; LLVMValueRef ena, count = initial[3];
count = LLVMBuildAnd(builder, count, count = LLVMBuildAnd(builder, count,
@@ -754,7 +754,7 @@ void si_build_wrapper_function(struct si_shader_context *ctx, LLVMValueRef *part
ret = ac_build_call(&ctx->ac, parts[part], in, num_params); ret = ac_build_call(&ctx->ac, parts[part], in, num_params);
if (si_is_multi_part_shader(ctx) && if (si_is_multi_part_shader(ctx->shader) &&
part + 1 == next_shader_first_part) { part + 1 == next_shader_first_part) {
ac_build_endif(&ctx->ac, 6506); ac_build_endif(&ctx->ac, 6506);