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

r600/sfn: lower to scalar for some optimizations and vectortize later

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6879>
This commit is contained in:
Gert Wollny
2020-09-24 08:46:53 +02:00
committed by Marge Bot
parent d55404b39c
commit 972dd730d9
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gallium/drivers/r600/sfn/sfn_nir.cpp
View File

@@ -699,7 +699,7 @@ r600_lower_shared_io(nir_shader *nir)
} }
static bool static bool
optimize_once(nir_shader *shader) optimize_once(nir_shader *shader, bool vectorize)
{ {
bool progress = false; bool progress = false;
NIR_PASS(progress, shader, nir_copy_prop); NIR_PASS(progress, shader, nir_copy_prop);
@@ -707,7 +707,8 @@ optimize_once(nir_shader *shader)
NIR_PASS(progress, shader, nir_opt_algebraic); NIR_PASS(progress, shader, nir_opt_algebraic);
NIR_PASS(progress, shader, nir_opt_constant_folding); NIR_PASS(progress, shader, nir_opt_constant_folding);
NIR_PASS(progress, shader, nir_opt_copy_prop_vars); NIR_PASS(progress, shader, nir_opt_copy_prop_vars);
NIR_PASS(progress, shader, nir_opt_vectorize, NULL, NULL); if (vectorize)
NIR_PASS(progress, shader, nir_opt_vectorize, NULL, NULL);
NIR_PASS(progress, shader, nir_opt_remove_phis); NIR_PASS(progress, shader, nir_opt_remove_phis);
@@ -816,11 +817,9 @@ int r600_shader_from_nir(struct r600_context *rctx,
NIR_PASS_V(sel->nir, nir_lower_ubo_vec4); NIR_PASS_V(sel->nir, nir_lower_ubo_vec4);
/* It seems the output of this optimization is cached somewhere, and /* Lower to scalar to let some optimization work out better */
* when there are registers, then we can no longer copy propagate, so NIR_PASS_V(sel->nir, nir_lower_alu_to_scalar, NULL, NULL);
* skip the optimization then. (There is probably a better way, but yeah) while(optimize_once(sel->nir, false));
*/
while(optimize_once(sel->nir));
NIR_PASS_V(sel->nir, nir_remove_dead_variables, nir_var_shader_in, NULL); NIR_PASS_V(sel->nir, nir_remove_dead_variables, nir_var_shader_in, NULL);
NIR_PASS_V(sel->nir, nir_remove_dead_variables, nir_var_shader_out, NULL); NIR_PASS_V(sel->nir, nir_remove_dead_variables, nir_var_shader_out, NULL);
@@ -831,7 +830,7 @@ int r600_shader_from_nir(struct r600_context *rctx,
40, 40,
r600_get_natural_size_align_bytes); r600_get_natural_size_align_bytes);
while (optimize_once(sel->nir)); while (optimize_once(sel->nir, true));
auto sh = nir_shader_clone(sel->nir, sel->nir); auto sh = nir_shader_clone(sel->nir, sel->nir);
NIR_PASS_V(sh, nir_opt_algebraic_late); NIR_PASS_V(sh, nir_opt_algebraic_late);