fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 13:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965/cfg: Track prev_block and prev_inst explicitly in the whole function

Browse source 
This provides a trivial simplification now, and it makes some future
changes more straight forward.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
This commit is contained in:
Ian Romanick 2016-02-24 19:26:13 -08:00
parent 70cf0eb5c7
commit c7deee69ea
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/mesa/drivers/dri/i965/brw_dead_control_flow.cpp
View file

@ -41,7 +41,9 @@ dead_control_flow_eliminate(backend_shader *s)
bool progress = false; bool progress = false;
foreach_block_safe (block, s->cfg) { foreach_block_safe (block, s->cfg) {
bblock_t *prev_block = block->prev();
backend_instruction *const inst = block->start(); backend_instruction *const inst = block->start();
backend_instruction *prev_inst = prev_block->end();
/* ENDIF instructions, by definition, can only be found at the start of /* ENDIF instructions, by definition, can only be found at the start of
* basic blocks. * basic blocks.
@ -52,20 +54,20 @@ dead_control_flow_eliminate(backend_shader *s)
backend_instruction *endif_inst = inst; backend_instruction *endif_inst = inst;
backend_instruction *if_inst = NULL, *else_inst = NULL; backend_instruction *if_inst = NULL, *else_inst = NULL;
backend_instruction *prev_inst = endif_block->prev()->end();
if (prev_inst->opcode == BRW_OPCODE_ELSE) { if (prev_inst->opcode == BRW_OPCODE_ELSE) {
else_inst = prev_inst; else_inst = prev_inst;
else_block = endif_block->prev(); else_block = endif_block->prev();
found = true; found = true;
if (else_block->start_ip == else_block->end_ip) if (else_block->start_ip == else_block->end_ip) {
prev_inst = else_block->prev()->end(); prev_block = prev_block->prev();
prev_inst = prev_block->end();
}
} }
if (prev_inst->opcode == BRW_OPCODE_IF) { if (prev_inst->opcode == BRW_OPCODE_IF) {
if_inst = prev_inst; if_inst = prev_inst;
if_block = else_block != NULL ? else_block->prev() if_block = prev_block;
: endif_block->prev();
found = true; found = true;
} else { } else {
/* Don't remove the ENDIF if we didn't find a dead IF. */ /* Don't remove the ENDIF if we didn't find a dead IF. */