diff options
| -rw-r--r-- | src/gallium/drivers/lima/ir/pp/nir.c | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/lima/ir/pp/node.c | 21 | ||||
| -rw-r--r-- | src/gallium/drivers/lima/ir/pp/ppir.h | 1 |
3 files changed, 27 insertions, 1 deletions
diff --git a/src/gallium/drivers/lima/ir/pp/nir.c b/src/gallium/drivers/lima/ir/pp/nir.c index 78220aefb03..a1d10a0be37 100644 --- a/src/gallium/drivers/lima/ir/pp/nir.c +++ b/src/gallium/drivers/lima/ir/pp/nir.c @@ -117,7 +117,11 @@ static void ppir_node_add_src(ppir_compiler *comp, ppir_node *node, if (!is_load_coords) { /* Clone varying loads for each block */ if (child->block != node->block) { - child = ppir_node_clone(node->block, child); + ppir_node *new = ppir_node_clone(node->block, child); + /* If we clone it for every block and there is no user of + * the original load left, delete the original one. */ + ppir_delete_if_orphan(node->block, child); + child = new; comp->var_nodes[ns->ssa->index] = child; } break; diff --git a/src/gallium/drivers/lima/ir/pp/node.c b/src/gallium/drivers/lima/ir/pp/node.c index a5748a22200..bf713f80715 100644 --- a/src/gallium/drivers/lima/ir/pp/node.c +++ b/src/gallium/drivers/lima/ir/pp/node.c @@ -669,6 +669,27 @@ ppir_node_clone_load(ppir_block *block, ppir_node *node) return &new_lnode->node; } +void +ppir_delete_if_orphan(ppir_block *block, ppir_node *node) +{ + ppir_dest *dest = ppir_node_get_dest(node); + if (!dest) + return; + + ppir_node_foreach_succ_safe(node, dep) { + ppir_node *succ = dep->succ; + for (int i = 0; i < ppir_node_get_src_num(succ); i++) { + ppir_src *src = ppir_node_get_src(succ, i); + if (!src) + continue; + if (ppir_node_target_equal(src, dest)) + return; + } + } + + ppir_node_delete(node); +} + ppir_node *ppir_node_clone(ppir_block *block, ppir_node *node) { switch (node->op) { diff --git a/src/gallium/drivers/lima/ir/pp/ppir.h b/src/gallium/drivers/lima/ir/pp/ppir.h index 6b550a3c9d1..592fa6cf8a5 100644 --- a/src/gallium/drivers/lima/ir/pp/ppir.h +++ b/src/gallium/drivers/lima/ir/pp/ppir.h @@ -396,6 +396,7 @@ void ppir_node_print_prog(ppir_compiler *comp); void ppir_node_replace_child(ppir_node *parent, ppir_node *old_child, ppir_node *new_child); void ppir_node_replace_all_succ(ppir_node *dst, ppir_node *src); void ppir_node_replace_pred(ppir_dep *dep, ppir_node *new_pred); +void ppir_delete_if_orphan(ppir_block *block, ppir_node *node); ppir_dep *ppir_dep_for_pred(ppir_node *node, ppir_node *pred); ppir_node *ppir_node_clone(ppir_block *block, ppir_node *node); /* Assumes that node successors are in the same block */ |