{
int then_movs = 0;
foreach_inst_in_block(fs_inst, inst, then_block) {
- if (then_movs == MAX_MOVS || inst->opcode != BRW_OPCODE_MOV)
+ if (then_movs == MAX_MOVS || inst->opcode != BRW_OPCODE_MOV ||
+ inst->flags_written())
break;
then_mov[then_movs] = inst;
int else_movs = 0;
foreach_inst_in_block(fs_inst, inst, else_block) {
- if (else_movs == MAX_MOVS || inst->opcode != BRW_OPCODE_MOV)
+ if (else_movs == MAX_MOVS || inst->opcode != BRW_OPCODE_MOV ||
+ inst->flags_written())
break;
else_mov[else_movs] = inst;
*/
fs_reg src0(then_mov[i]->src[0]);
if (src0.file == IMM) {
- src0 = vgrf(glsl_type::float_type);
- src0.type = then_mov[i]->src[0].type;
+ src0 = ibld.vgrf(then_mov[i]->src[0].type);
ibld.MOV(src0, then_mov[i]->src[0]);
}
+ /* 64-bit immediates can't be placed in src1. */
+ fs_reg src1(else_mov[i]->src[0]);
+ if (src1.file == IMM && type_sz(src1.type) == 8) {
+ src1 = ibld.vgrf(else_mov[i]->src[0].type);
+ ibld.MOV(src1, else_mov[i]->src[0]);
+ }
+
set_predicate_inv(if_inst->predicate, if_inst->predicate_inverse,
- ibld.SEL(then_mov[i]->dst, src0,
- else_mov[i]->src[0]));
+ ibld.SEL(then_mov[i]->dst, src0, src1));
}
then_mov[i]->remove(then_block);
}
if (progress)
- invalidate_live_intervals();
+ invalidate_analysis(DEPENDENCY_INSTRUCTIONS | DEPENDENCY_VARIABLES);
return progress;
}