projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965/fs: Add support for removing MOV.NZ instructions.
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i965
/
brw_fs_cmod_propagation.cpp
diff --git
a/src/mesa/drivers/dri/i965/brw_fs_cmod_propagation.cpp
b/src/mesa/drivers/dri/i965/brw_fs_cmod_propagation.cpp
index 8a03315bc4c4071c45e620428b2eff36279f863e..ec9f812ea11440c996cda616bb366e40605218a3 100644
(file)
--- a/
src/mesa/drivers/dri/i965/brw_fs_cmod_propagation.cpp
+++ b/
src/mesa/drivers/dri/i965/brw_fs_cmod_propagation.cpp
@@
-57,12
+57,20
@@
opt_cmod_propagation_local(fs_visitor *v, bblock_t *block)
foreach_inst_in_block_reverse_safe(fs_inst, inst, block) {
ip--;
foreach_inst_in_block_reverse_safe(fs_inst, inst, block) {
ip--;
- if (inst->opcode != BRW_OPCODE_CMP ||
+ if ((inst->opcode != BRW_OPCODE_CMP &&
+ inst->opcode != BRW_OPCODE_MOV) ||
inst->predicate != BRW_PREDICATE_NONE ||
!inst->dst.is_null() ||
inst->src[0].file != GRF ||
inst->predicate != BRW_PREDICATE_NONE ||
!inst->dst.is_null() ||
inst->src[0].file != GRF ||
- inst->src[0].abs ||
- !inst->src[1].is_zero())
+ inst->src[0].abs)
+ continue;
+
+ if (inst->opcode == BRW_OPCODE_CMP && !inst->src[1].is_zero())
+ continue;
+
+ if (inst->opcode == BRW_OPCODE_MOV &&
+ (inst->conditional_mod != BRW_CONDITIONAL_NZ ||
+ inst->src[0].negate))
continue;
bool read_flag = false;
continue;
bool read_flag = false;
@@
-73,6
+81,15
@@
opt_cmod_propagation_local(fs_visitor *v, bblock_t *block)
scan_inst->dst.reg_offset != inst->src[0].reg_offset)
break;
scan_inst->dst.reg_offset != inst->src[0].reg_offset)
break;
+ if (inst->opcode == BRW_OPCODE_MOV) {
+ if (!scan_inst->writes_flag())
+ break;
+
+ inst->remove(block);
+ progress = true;
+ break;
+ }
+
enum brw_conditional_mod cond =
inst->src[0].negate ? brw_swap_cmod(inst->conditional_mod)
: inst->conditional_mod;
enum brw_conditional_mod cond =
inst->src[0].negate ? brw_swap_cmod(inst->conditional_mod)
: inst->conditional_mod;