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

radeonsi: remove unused si_shader::prolog2

Browse Source 
This became unused when the GS prolog was removed.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14266>
This commit is contained in:
Marek Olšák
2021-12-19 20:48:45 -05:00
committed by Marge Bot
parent 054d50904b
commit 3283df1425
3 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/radeonsi/si_debug.c
View File

@@ -931,10 +931,6 @@ static void si_print_annotated_shader(struct si_shader *shader, struct ac_wave_i
si_add_split_disasm(screen, &rtld_binaries[1], &shader->previous_stage->binary, &inst_addr, si_add_split_disasm(screen, &rtld_binaries[1], &shader->previous_stage->binary, &inst_addr,
&num_inst, instructions, stage, shader->wave_size); &num_inst, instructions, stage, shader->wave_size);
} }
if (shader->prolog2) {
si_add_split_disasm(screen, &rtld_binaries[2], &shader->prolog2->binary, &inst_addr,
&num_inst, instructions, stage, shader->wave_size);
}
si_add_split_disasm(screen, &rtld_binaries[3], &shader->binary, &inst_addr, &num_inst, si_add_split_disasm(screen, &rtld_binaries[3], &shader->binary, &inst_addr, &num_inst,
instructions, stage, shader->wave_size); instructions, stage, shader->wave_size);
if (shader->epilog) { if (shader->epilog) {

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

@@ -788,7 +788,6 @@ static bool si_shader_binary_open(struct si_screen *screen, struct si_shader *sh
add_part(shader->prolog); add_part(shader->prolog);
add_part(shader->previous_stage); add_part(shader->previous_stage);
add_part(shader->prolog2);
add_part(shader); add_part(shader);
add_part(shader->epilog); add_part(shader->epilog);
@@ -1137,10 +1136,6 @@ void si_shader_dump(struct si_screen *sscreen, struct si_shader *shader,
if (shader->previous_stage) if (shader->previous_stage)
si_shader_dump_disassembly(sscreen, &shader->previous_stage->binary, stage, si_shader_dump_disassembly(sscreen, &shader->previous_stage->binary, stage,
shader->wave_size, debug, "previous stage", file); shader->wave_size, debug, "previous stage", file);
if (shader->prolog2)
si_shader_dump_disassembly(sscreen, &shader->prolog2->binary, stage, shader->wave_size,
debug, "prolog2", file);
si_shader_dump_disassembly(sscreen, &shader->binary, stage, shader->wave_size, debug, "main", si_shader_dump_disassembly(sscreen, &shader->binary, stage, shader->wave_size, debug, "main",
file); file);
@@ -2132,12 +2127,6 @@ bool si_create_shader_variant(struct si_screen *sscreen, struct ac_llvm_compiler
shader->previous_stage->config.scratch_bytes_per_wave); shader->previous_stage->config.scratch_bytes_per_wave);
shader->info.uses_instanceid |= shader->previous_stage->info.uses_instanceid; shader->info.uses_instanceid |= shader->previous_stage->info.uses_instanceid;
} }
if (shader->prolog2) {
shader->config.num_sgprs =
MAX2(shader->config.num_sgprs, shader->prolog2->config.num_sgprs);
shader->config.num_vgprs =
MAX2(shader->config.num_vgprs, shader->prolog2->config.num_vgprs);
}
if (shader->epilog) { if (shader->epilog) {
shader->config.num_sgprs = shader->config.num_sgprs =
MAX2(shader->config.num_sgprs, shader->epilog->config.num_sgprs); MAX2(shader->config.num_sgprs, shader->epilog->config.num_sgprs);

1
src/gallium/drivers/radeonsi/si_shader.h
View File

@@ -813,7 +813,6 @@ struct si_shader {
struct si_shader_part *prolog; struct si_shader_part *prolog;
struct si_shader *previous_stage; /* for GFX9 */ struct si_shader *previous_stage; /* for GFX9 */
struct si_shader_part *prolog2;
struct si_shader_part *epilog; struct si_shader_part *epilog;
struct si_resource *bo; struct si_resource *bo;