Mesa (master): nir/cf: Remove phi sources if needed in nir_handle_add_jump
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Oct 2 15:25:14 UTC 2018
Module: Mesa
Branch: master
Commit: bfc89c668e288747f51e447729914c91d27207e8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bfc89c668e288747f51e447729914c91d27207e8
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date: Fri Sep 21 09:27:48 2018 -0500
nir/cf: Remove phi sources if needed in nir_handle_add_jump
If the block in which the jump is inserted is the predecessor of a phi
then we need to remove phi sources otherwise the phi may end up with
things improperly connected. This fixes the following CTS test when
dEQP is run with SPIR-V optimization recipe 1:
dEQP-VK.glsl.functions.control_flow.return_in_nested_loop_vertex
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
---
src/compiler/nir/nir_control_flow.c | 38 ++++++++++++++++++++-----------------
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/src/compiler/nir/nir_control_flow.c b/src/compiler/nir/nir_control_flow.c
index 3b0a0f1a5b..92e92c5dea 100644
--- a/src/compiler/nir/nir_control_flow.c
+++ b/src/compiler/nir/nir_control_flow.c
@@ -437,6 +437,23 @@ nearest_loop(nir_cf_node *node)
return nir_cf_node_as_loop(node);
}
+static void
+remove_phi_src(nir_block *block, nir_block *pred)
+{
+ nir_foreach_instr(instr, block) {
+ if (instr->type != nir_instr_type_phi)
+ break;
+
+ nir_phi_instr *phi = nir_instr_as_phi(instr);
+ nir_foreach_phi_src_safe(src, phi) {
+ if (src->pred == pred) {
+ list_del(&src->src.use_link);
+ exec_node_remove(&src->node);
+ }
+ }
+ }
+}
+
/*
* update the CFG after a jump instruction has been added to the end of a block
*/
@@ -447,6 +464,10 @@ nir_handle_add_jump(nir_block *block)
nir_instr *instr = nir_block_last_instr(block);
nir_jump_instr *jump_instr = nir_instr_as_jump(instr);
+ if (block->successors[0])
+ remove_phi_src(block->successors[0], block);
+ if (block->successors[1])
+ remove_phi_src(block->successors[1], block);
unlink_block_successors(block);
nir_function_impl *impl = nir_cf_node_get_function(&block->cf_node);
@@ -470,23 +491,6 @@ nir_handle_add_jump(nir_block *block)
}
}
-static void
-remove_phi_src(nir_block *block, nir_block *pred)
-{
- nir_foreach_instr(instr, block) {
- if (instr->type != nir_instr_type_phi)
- break;
-
- nir_phi_instr *phi = nir_instr_as_phi(instr);
- nir_foreach_phi_src_safe(src, phi) {
- if (src->pred == pred) {
- list_del(&src->src.use_link);
- exec_node_remove(&src->node);
- }
- }
- }
-}
-
/* Removes the successor of a block with a jump. Note that the jump to be
* eliminated may be free-floating.
*/
More information about the mesa-commit
mailing list