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

radv: move nir_opt_shrink_stores from radv_optimize_nir()

Browse source 
No need to call this pass in a loop.

Reviewed-by: Emma Anholt <emma@anholt.net>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14480>
This commit is contained in:
Daniel Schürmann 2022-01-10 16:16:16 +00:00
parent 2a92452a0e
commit af4b26c53a
3 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/amd/vulkan/radv_pipeline.c
View file

@ -2555,8 +2555,6 @@ radv_link_shaders(struct radv_pipeline *pipeline,
if (nir_lower_io_to_scalar_early(ordered_shaders[i], mask)) {
/* Optimize the new vector code and then remove dead vars */
nir_copy_prop(ordered_shaders[i]);
nir_opt_shrink_stores(ordered_shaders[i],
!pipeline->device->instance->disable_shrink_image_store);
nir_opt_shrink_vectors(ordered_shaders[i]);
if (ordered_shaders[i]->info.stage != last) {
@ -3803,7 +3801,7 @@ radv_create_shaders(struct radv_pipeline *pipeline, struct radv_pipeline_layout
for (int i = 0; i < MESA_VULKAN_SHADER_STAGES; ++i) {
if (nir[i]) {
radv_start_feedback(stage_feedbacks[i]);
radv_optimize_nir(device, nir[i], optimize_conservatively, false);
radv_optimize_nir(nir[i], optimize_conservatively, false);
/* Gather info again, information such as outputs_read can be out-of-date. */
nir_shader_gather_info(nir[i], nir_shader_get_entrypoint(nir[i]));
@ -3889,14 +3887,13 @@ radv_create_shaders(struct radv_pipeline *pipeline, struct radv_pipeline_layout
if (nir_opt_load_store_vectorize(nir[i], &vectorize_opts)) {
NIR_PASS_V(nir[i], nir_copy_prop);
nir_opt_shrink_stores(nir[i], !device->instance->disable_shrink_image_store);
lower_to_scalar = true;
/* Gather info again, to update whether 8/16-bit are used. */
nir_shader_gather_info(nir[i], nir_shader_get_entrypoint(nir[i]));
}
lower_to_scalar |=
nir_opt_shrink_stores(nir[i], !device->instance->disable_shrink_image_store);
nir_opt_shrink_vectors(nir[i]);
if (lower_to_scalar)

10
src/amd/vulkan/radv_shader.c
View file

@ -145,8 +145,7 @@ radv_can_dump_shader_stats(struct radv_device *device, struct vk_shader_module *
}
void
radv_optimize_nir(const struct radv_device *device, struct nir_shader *shader,
bool optimize_conservatively, bool allow_copies)
radv_optimize_nir(struct nir_shader *shader, bool optimize_conservatively, bool allow_copies)
{
bool progress;
@ -192,8 +191,6 @@ radv_optimize_nir(const struct radv_device *device, struct nir_shader *shader,
NIR_PASS(progress, shader, nir_opt_algebraic);
NIR_PASS(progress, shader, nir_opt_undef);
NIR_PASS(progress, shader, nir_opt_shrink_stores,
!device->instance->disable_shrink_image_store);
NIR_PASS(progress, shader, nir_opt_shrink_vectors);
if (shader->options->max_unroll_iterations) {
NIR_PASS(progress, shader, nir_opt_loop_unroll);
@ -824,9 +821,10 @@ radv_shader_compile_to_nir(struct radv_device *device, struct vk_shader_module *
});
nir_lower_load_const_to_scalar(nir);
nir_opt_shrink_stores(nir, !device->instance->disable_shrink_image_store);
if (!key->optimisations_disabled)
radv_optimize_nir(device, nir, false, true);
radv_optimize_nir(nir, false, true);
/* call radv_nir_lower_ycbcr_textures() late as there might still be
* tex with undef texture/sampler before first optimization */
@ -899,7 +897,7 @@ radv_shader_compile_to_nir(struct radv_device *device, struct vk_shader_module *
if (ac_nir_lower_indirect_derefs(nir, device->physical_device->rad_info.chip_class) &&
!key->optimisations_disabled && nir->info.stage != MESA_SHADER_COMPUTE) {
/* Optimize the lowered code before the linking optimizations. */
radv_optimize_nir(device, nir, false, false);
radv_optimize_nir(nir, false, false);
}
return nir;

3
src/amd/vulkan/radv_shader.h
View file

@ -494,8 +494,7 @@ struct radv_shader_prolog {
char *disasm_string;
};
void radv_optimize_nir(const struct radv_device *device, struct nir_shader *shader,
bool optimize_conservatively, bool allow_copies);
void radv_optimize_nir(struct nir_shader *shader, bool optimize_conservatively, bool allow_copies);
void radv_optimize_nir_algebraic(nir_shader *shader, bool opt_offsets);
bool radv_nir_lower_ycbcr_textures(nir_shader *shader, const struct radv_pipeline_layout *layout);