From 403cdacaff85c02d12c761dc7c5768f483a7b7fa Mon Sep 17 00:00:00 2001 From: Qiang Yu Date: Wed, 25 Dec 2024 17:33:57 +0800 Subject: [PATCH] radeonsi: replace ac_nir_lower_subdword_loads MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ac_nir_lower_mem_access_bit_sizes() does the work of it. Reviewed-by: Marek Olšák Part-of: --- src/gallium/drivers/radeonsi/si_shader.c | 7 ++++++- src/gallium/drivers/radeonsi/si_shader_nir.c | 5 ----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 2fe34c49175..34a6fc1a5bd 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -2614,8 +2614,13 @@ static struct nir_shader *si_get_nir_shader(struct si_shader *shader, struct si_ }); NIR_PASS(progress, nir, nir_opt_shrink_stores, false); + nir_divergence_analysis(nir); + NIR_PASS(progress, nir, ac_nir_flag_smem_for_loads, sel->screen->info.gfx_level, + !nir->info.use_aco_amd, false); + NIR_PASS(progress, nir, ac_nir_lower_mem_access_bit_sizes, + sel->screen->info.gfx_level, !nir->info.use_aco_amd); + if (sel->stage == MESA_SHADER_KERNEL) { - NIR_PASS(progress, nir, ac_nir_lower_mem_access_bit_sizes, sel->screen->info.gfx_level, !nir->info.use_aco_amd); NIR_PASS(progress, nir, ac_nir_lower_global_access); if (nir->info.bit_sizes_int & (8 | 16)) { diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c index 1db50f87ec7..aa12aded4ce 100644 --- a/src/gallium/drivers/radeonsi/si_shader_nir.c +++ b/src/gallium/drivers/radeonsi/si_shader_nir.c @@ -415,11 +415,6 @@ char *si_finalize_nir(struct pipe_screen *screen, struct nir_shader *nir) if (nir->info.stage == MESA_SHADER_FRAGMENT) NIR_PASS_V(nir, nir_lower_color_inputs); - NIR_PASS_V(nir, ac_nir_lower_subdword_loads, - (ac_nir_lower_subdword_options) { - .modes_1_comp = nir_var_mem_ubo, - .modes_N_comps = nir_var_mem_ubo | nir_var_mem_ssbo - }); NIR_PASS_V(nir, nir_lower_explicit_io, nir_var_mem_shared, nir_address_format_32bit_offset); /* Remove dead derefs, so that we can remove uniforms. */