KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lima/ppir: optimize tex loads with single successor 

These don't need a mov, and can be used directly with pipeline output.

Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
Reviewed-by: Vasily Khoruzhick <anarsoul@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4975>
This commit is contained in:
Erico Nunes 2020-04-23 20:12:01 +02:00
parent a4b7699d84
commit 632a921bd0
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gallium/drivers/lima/ir/pp/lower.c
View File

@ -162,7 +162,22 @@ static bool ppir_lower_texture(ppir_block *block, ppir_node *node)
{
ppir_dest *dest = ppir_node_get_dest(node);
/* Always create move node since there can be successors in other blocks */
if (ppir_node_has_single_succ(node)) {
ppir_node *succ = ppir_node_first_succ(node);
dest->type = ppir_target_pipeline;
dest->pipeline = ppir_pipeline_reg_sampler;
for (int i = 0; i < ppir_node_get_src_num(succ); i++) {
ppir_src *src = ppir_node_get_src(succ, i);
if (src && src->node == node) {
src->type = ppir_target_pipeline;
src->pipeline = ppir_pipeline_reg_sampler;
}
}
return true;
}
/* Create move node as fallback */
ppir_node *move = ppir_node_insert_mov(node);
if (unlikely(!move))
return false;
@ -170,7 +185,7 @@ static bool ppir_lower_texture(ppir_block *block, ppir_node *node)
ppir_debug("lower texture create move %d for %d\n",
move->index, node->index);
ppir_src *mov_src= ppir_node_get_src(move, 0);
ppir_src *mov_src = ppir_node_get_src(move, 0);
mov_src->type = dest->type = ppir_target_pipeline;
mov_src->pipeline = dest->pipeline = ppir_pipeline_reg_sampler;

1
src/gallium/drivers/lima/ir/pp/nir.c
View File

@ -349,6 +349,7 @@ static bool ppir_emit_intrinsic(ppir_block *block, nir_instr *ni)
node = block->comp->var_nodes[instr->src->ssa->index];
switch (node->op) {
case ppir_op_load_uniform:
case ppir_op_load_texture:
case ppir_op_const:
break;
default: