[Mesa-dev] [PATCH 06/10] nir: create helper for fixing phi srcs when cloning
This will be useful for fixing phi srcs when cloning a loop body
during loop unrolling.
---
src/compiler/nir/nir_clone.c | 36 +---
1 file changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/compiler/nir/nir_clone.c b/src/compiler/nir/nir_clone.c
index 4f7bdd9..e6483b1 100644
--- a/src/compiler/nir/nir_clone.c
+++ b/src/compiler/nir/nir_clone.c
@@ -593,6 +593,26 @@ clone_cf_list(clone_state *state, struct exec_list *dst,
}
}
+/* After we've cloned almost everything, we have to walk the list of phi
+ * sources and fix them up. Thanks to loops, the block and SSA value for a
+ * phi source may not be defined when we first encounter it. Instead, we
+ * add it to the phi_srcs list and we fix it up here.
+ */
+static void
+fixup_phi_srcs(clone_state *state)
+{
+ list_for_each_entry_safe(nir_phi_src, src, >phi_srcs, src.use_link) {
+ src->pred = remap_local(state, src->pred);
+ assert(src->src.is_ssa);
+ src->src.ssa = remap_local(state, src->src.ssa);
+
+ /* Remove from this list and place in the uses of the SSA def */
+ list_del(>src.use_link);
+ list_addtail(>src.use_link, >src.ssa->uses);
+ }
+ assert(list_empty(>phi_srcs));
+}
+
static nir_function_impl *
clone_function_impl(clone_state *state, const nir_function_impl *fi)
{
@@ -614,21 +634,7 @@ clone_function_impl(clone_state *state, const
nir_function_impl *fi)
clone_cf_list(state, >body, >body);
- /* After we've cloned almost everything, we have to walk the list of phi
-* sources and fix them up. Thanks to loops, the block and SSA value for a
-* phi source may not be defined when we first encounter it. Instead, we
-* add it to the phi_srcs list and we fix it up here.
-*/
- list_for_each_entry_safe(nir_phi_src, src, >phi_srcs, src.use_link) {
- src->pred = remap_local(state, src->pred);
- assert(src->src.is_ssa);
- src->src.ssa = remap_local(state, src->src.ssa);
-
- /* Remove from this list and place in the uses of the SSA def */
- list_del(>src.use_link);
- list_addtail(>src.use_link, >src.ssa->uses);
- }
- assert(list_empty(>phi_srcs));
+ fixup_phi_srcs(state);
/* All metadata is invalidated in the cloning process */
nfi->valid_metadata = 0;
--
2.7.4
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [PATCH 06/10] nir: create helper for fixing phi srcs when cloning
This will be useful for fixing phi srcs when cloning a loop body
during loop unrolling.
---
src/compiler/nir/nir_clone.c | 36 +---
1 file changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/compiler/nir/nir_clone.c b/src/compiler/nir/nir_clone.c
index 0e397b0..8808333 100644
--- a/src/compiler/nir/nir_clone.c
+++ b/src/compiler/nir/nir_clone.c
@@ -593,6 +593,26 @@ clone_cf_list(clone_state *state, struct exec_list *dst,
}
}
+/* After we've cloned almost everything, we have to walk the list of phi
+ * sources and fix them up. Thanks to loops, the block and SSA value for a
+ * phi source may not be defined when we first encounter it. Instead, we
+ * add it to the phi_srcs list and we fix it up here.
+ */
+static void
+fixup_phi_srcs(clone_state *state)
+{
+ list_for_each_entry_safe(nir_phi_src, src, >phi_srcs, src.use_link) {
+ src->pred = remap_local(state, src->pred);
+ assert(src->src.is_ssa);
+ src->src.ssa = remap_local(state, src->src.ssa);
+
+ /* Remove from this list and place in the uses of the SSA def */
+ list_del(>src.use_link);
+ list_addtail(>src.use_link, >src.ssa->uses);
+ }
+ assert(list_empty(>phi_srcs));
+}
+
static nir_function_impl *
clone_function_impl(clone_state *state, const nir_function_impl *fi)
{
@@ -614,21 +634,7 @@ clone_function_impl(clone_state *state, const
nir_function_impl *fi)
clone_cf_list(state, >body, >body);
- /* After we've cloned almost everything, we have to walk the list of phi
-* sources and fix them up. Thanks to loops, the block and SSA value for a
-* phi source may not be defined when we first encounter it. Instead, we
-* add it to the phi_srcs list and we fix it up here.
-*/
- list_for_each_entry_safe(nir_phi_src, src, >phi_srcs, src.use_link) {
- src->pred = remap_local(state, src->pred);
- assert(src->src.is_ssa);
- src->src.ssa = remap_local(state, src->src.ssa);
-
- /* Remove from this list and place in the uses of the SSA def */
- list_del(>src.use_link);
- list_addtail(>src.use_link, >src.ssa->uses);
- }
- assert(list_empty(>phi_srcs));
+ fixup_phi_srcs(state);
/* All metadata is invalidated in the cloning process */
nfi->valid_metadata = 0;
--
2.7.4
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
