diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/intel/compiler/brw_fs_cmod_propagation.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/intel/compiler/brw_fs_cmod_propagation.cpp b/src/intel/compiler/brw_fs_cmod_propagation.cpp index a821d4e5481..a2c11e0959c 100644 --- a/src/intel/compiler/brw_fs_cmod_propagation.cpp +++ b/src/intel/compiler/brw_fs_cmod_propagation.cpp @@ -244,8 +244,7 @@ opt_cmod_propagation_local(const gen_device_info *devinfo, /* CMP's result is the same regardless of dest type. */ if (inst->conditional_mod == BRW_CONDITIONAL_NZ && scan_inst->opcode == BRW_OPCODE_CMP && - (inst->dst.type == BRW_REGISTER_TYPE_D || - inst->dst.type == BRW_REGISTER_TYPE_UD)) { + brw_reg_type_is_integer(inst->dst.type)) { inst->remove(block); progress = true; break; @@ -266,6 +265,12 @@ opt_cmod_propagation_local(const gen_device_info *devinfo, /* Comparisons operate differently for ints and floats */ if (scan_inst->dst.type != inst->dst.type) { + /* Comparison result may be altered if the bit-size changes + * since that affects range, denorms, etc + */ + if (type_sz(scan_inst->dst.type) != type_sz(inst->dst.type)) + break; + /* We should propagate from a MOV to another instruction in a * sequence like: * @@ -279,8 +284,8 @@ opt_cmod_propagation_local(const gen_device_info *devinfo, scan_inst->dst.type != BRW_REGISTER_TYPE_UD)) { break; } - } else if (scan_inst->dst.type == BRW_REGISTER_TYPE_F || - inst->dst.type == BRW_REGISTER_TYPE_F) { + } else if (brw_reg_type_is_floating_point(scan_inst->dst.type) != + brw_reg_type_is_floating_point(inst->dst.type)) { break; } } |