From 3283df14257b7fcbe704b4a4f7c0e43b2a15cf4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 19 Dec 2021 20:48:45 -0500 Subject: [PATCH] radeonsi: remove unused si_shader::prolog2 This became unused when the GS prolog was removed. Acked-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/gallium/drivers/radeonsi/si_debug.c | 4 ---- src/gallium/drivers/radeonsi/si_shader.c | 11 ----------- src/gallium/drivers/radeonsi/si_shader.h | 1 - 3 files changed, 16 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_debug.c b/src/gallium/drivers/radeonsi/si_debug.c index c88eb734241..5a8da6d39e4 100644 --- a/src/gallium/drivers/radeonsi/si_debug.c +++ b/src/gallium/drivers/radeonsi/si_debug.c @@ -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, &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, instructions, stage, shader->wave_size); if (shader->epilog) { diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index fd2e04f57e9..9cdf8e9da29 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -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->previous_stage); - add_part(shader->prolog2); add_part(shader); add_part(shader->epilog); @@ -1137,10 +1136,6 @@ void si_shader_dump(struct si_screen *sscreen, struct si_shader *shader, if (shader->previous_stage) si_shader_dump_disassembly(sscreen, &shader->previous_stage->binary, stage, 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", 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->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) { shader->config.num_sgprs = MAX2(shader->config.num_sgprs, shader->epilog->config.num_sgprs); diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h index 4fb01cb82dc..f967ccea7af 100644 --- a/src/gallium/drivers/radeonsi/si_shader.h +++ b/src/gallium/drivers/radeonsi/si_shader.h @@ -813,7 +813,6 @@ struct si_shader { struct si_shader_part *prolog; struct si_shader *previous_stage; /* for GFX9 */ - struct si_shader_part *prolog2; struct si_shader_part *epilog; struct si_resource *bo;