case BRW_OPCODE_MAD:
case BRW_OPCODE_LRP:
case FS_OPCODE_UNIFORM_PULL_CONSTANT_LOAD:
+ case FS_OPCODE_VARYING_PULL_CONSTANT_LOAD_GEN7:
+ case FS_OPCODE_VARYING_PULL_CONSTANT_LOAD:
case FS_OPCODE_CINTERP:
case FS_OPCODE_LINTERP:
return true;
inst = (fs_inst *) inst->next) {
/* Skip some cases. */
- if (is_expression(inst) && !inst->predicate && inst->mlen == 0 &&
- !inst->force_uncompressed && !inst->force_sechalf &&
+ if (is_expression(inst) &&
+ !inst->predicate &&
+ !inst->is_partial_write() &&
!inst->conditional_mod)
{
bool found = false;
*/
bool no_existing_temp = entry->tmp.file == BAD_FILE;
if (no_existing_temp) {
- entry->tmp = fs_reg(this, glsl_type::float_type);
- entry->tmp.type = inst->dst.type;
-
- fs_inst *copy = new(ralloc_parent(inst))
- fs_inst(BRW_OPCODE_MOV, entry->generator->dst, entry->tmp);
- entry->generator->insert_after(copy);
- entry->generator->dst = entry->tmp;
+ int written = entry->generator->regs_written;
+
+ fs_reg orig_dst = entry->generator->dst;
+ fs_reg tmp = fs_reg(GRF, virtual_grf_alloc(written),
+ orig_dst.type);
+ entry->tmp = tmp;
+ entry->generator->dst = tmp;
+
+ for (int i = 0; i < written; i++) {
+ fs_inst *copy = MOV(orig_dst, tmp);
+ copy->force_writemask_all =
+ entry->generator->force_writemask_all;
+ entry->generator->insert_after(copy);
+
+ orig_dst.reg_offset++;
+ tmp.reg_offset++;
+ }
}
/* dest <- temp */
+ int written = inst->regs_written;
+ assert(written == entry->generator->regs_written);
assert(inst->dst.type == entry->tmp.type);
- fs_inst *copy = new(ralloc_parent(inst))
- fs_inst(BRW_OPCODE_MOV, inst->dst, entry->tmp);
- copy->force_writemask_all = inst->force_writemask_all;
- inst->replace_with(copy);
+ fs_reg dst = inst->dst;
+ fs_reg tmp = entry->tmp;
+ fs_inst *copy = NULL;
+ for (int i = 0; i < written; i++) {
+ copy = MOV(dst, tmp);
+ copy->force_writemask_all = inst->force_writemask_all;
+ inst->insert_before(copy);
+
+ dst.reg_offset++;
+ tmp.reg_offset++;
+ }
+ inst->remove();
/* Appending an instruction may have changed our bblock end. */
if (inst == block->end) {
/* Kill any AEB entries using registers that don't get reused any
* more -- a sure sign they'll fail operands_match().
*/
- if (src_reg->file == GRF && virtual_grf_use[src_reg->reg] < ip) {
+ if (src_reg->file == GRF && virtual_grf_end[src_reg->reg] < ip) {
entry->remove();
ralloc_free(entry);
break;