projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vtn: handle SpvExecutionModelKernel
[mesa.git]
/
src
/
compiler
/
nir
/
nir_move_vec_src_uses_to_dest.c
diff --git
a/src/compiler/nir/nir_move_vec_src_uses_to_dest.c
b/src/compiler/nir/nir_move_vec_src_uses_to_dest.c
index 5ad17b8507d70bcaae8d7fceab62ec77200eaf75..6acd679a0ad2b7f30420dfe4e22a794432c1d5e8 100644
(file)
--- a/
src/compiler/nir/nir_move_vec_src_uses_to_dest.c
+++ b/
src/compiler/nir/nir_move_vec_src_uses_to_dest.c
@@
-64,6
+64,8
@@
ssa_def_dominates_instr(nir_ssa_def *def, nir_instr *instr)
static bool
move_vec_src_uses_to_dest_block(nir_block *block)
{
static bool
move_vec_src_uses_to_dest_block(nir_block *block)
{
+ bool progress = false;
+
nir_foreach_instr(instr, block) {
if (instr->type != nir_instr_type_alu)
continue;
nir_foreach_instr(instr, block) {
if (instr->type != nir_instr_type_alu)
continue;
@@
-114,10
+116,10
@@
move_vec_src_uses_to_dest_block(nir_block *block)
if (vec->src[j].src.ssa != vec->src[i].src.ssa)
continue;
if (vec->src[j].src.ssa != vec->src[i].src.ssa)
continue;
- /* Mark the given chan
le
as having been handled */
+ /* Mark the given chan
nel
as having been handled */
srcs_remaining &= ~(1 << j);
srcs_remaining &= ~(1 << j);
- /* Mark the appropr
e
ate channel as coming from src j */
+ /* Mark the appropr
i
ate channel as coming from src j */
swizzle[vec->src[j].swizzle[0]] = j;
}
swizzle[vec->src[j].swizzle[0]] = j;
}
@@
-167,34
+169,44
@@
move_vec_src_uses_to_dest_block(nir_block *block)
continue;
use_alu_src->swizzle[j] = swizzle[use_alu_src->swizzle[j]];
continue;
use_alu_src->swizzle[j] = swizzle[use_alu_src->swizzle[j]];
+ progress = true;
}
}
}
}
}
}
}
}
- return
true
;
+ return
progress
;
}
}
-static
void
+static
bool
nir_move_vec_src_uses_to_dest_impl(nir_shader *shader, nir_function_impl *impl)
{
nir_move_vec_src_uses_to_dest_impl(nir_shader *shader, nir_function_impl *impl)
{
+ bool progress = false;
+
nir_metadata_require(impl, nir_metadata_dominance);
nir_index_instrs(impl);
nir_foreach_block(block, impl) {
nir_metadata_require(impl, nir_metadata_dominance);
nir_index_instrs(impl);
nir_foreach_block(block, impl) {
- move_vec_src_uses_to_dest_block(block);
+
progress |=
move_vec_src_uses_to_dest_block(block);
}
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
}
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
+
+ return progress;
}
}
-void
+bool
nir_move_vec_src_uses_to_dest(nir_shader *shader)
{
nir_move_vec_src_uses_to_dest(nir_shader *shader)
{
+ bool progress = false;
+
nir_foreach_function(function, shader) {
if (function->impl)
nir_foreach_function(function, shader) {
if (function->impl)
- nir_move_vec_src_uses_to_dest_impl(shader, function->impl);
+ progress |= nir_move_vec_src_uses_to_dest_impl(shader,
+ function->impl);
}
}
+
+ return progress;
}
}