intel/fs: Remove fs_generator::generate_linterp from gen11+.

We now have a lowering pass that will do this at the fs_visitor level,
so we can remove this code from gen11+.

v2: Reduce size of the "i" array from 4 to 2 (Matt).

Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Rafael Antognolli
2018-10-23 14:06:33 -07:00
parent 9ea90aae1e
commit 70e03e220c

View File

@@ -819,52 +819,14 @@ fs_generator::generate_linterp(fs_inst *inst,
struct brw_reg delta_x = src[0]; struct brw_reg delta_x = src[0];
struct brw_reg delta_y = offset(src[0], inst->exec_size / 8); struct brw_reg delta_y = offset(src[0], inst->exec_size / 8);
struct brw_reg interp = stride(src[1], 0, 1, 0); struct brw_reg interp = stride(src[1], 0, 1, 0);
brw_inst *i[4]; brw_inst *i[2];
if (devinfo->gen >= 11) { /* fs_visitor::lower_linterp() will do the lowering to MAD instructions for
struct brw_reg acc = retype(brw_acc_reg(8), BRW_REGISTER_TYPE_NF); * us on gen11+
struct brw_reg dwP = suboffset(interp, 0); */
struct brw_reg dwQ = suboffset(interp, 1); assert(devinfo->gen < 11);
struct brw_reg dwR = suboffset(interp, 3);
brw_push_insn_state(p); if (devinfo->has_pln) {
brw_set_default_exec_size(p, BRW_EXECUTE_8);
if (inst->exec_size == 8) {
i[0] = brw_MAD(p, acc, dwR, offset(delta_x, 0), dwP);
i[1] = brw_MAD(p, offset(dst, 0), acc, offset(delta_y, 0), dwQ);
brw_inst_set_cond_modifier(p->devinfo, i[1], inst->conditional_mod);
/* brw_set_default_saturate() is called before emitting instructions,
* so the saturate bit is set in each instruction, so we need to unset
* it on the first instruction of each pair.
*/
brw_inst_set_saturate(p->devinfo, i[0], false);
} else {
brw_set_default_group(p, inst->group);
i[0] = brw_MAD(p, acc, dwR, offset(delta_x, 0), dwP);
i[1] = brw_MAD(p, offset(dst, 0), acc, offset(delta_x, 1), dwQ);
brw_set_default_group(p, inst->group + 8);
i[2] = brw_MAD(p, acc, dwR, offset(delta_y, 0), dwP);
i[3] = brw_MAD(p, offset(dst, 1), acc, offset(delta_y, 1), dwQ);
brw_inst_set_cond_modifier(p->devinfo, i[1], inst->conditional_mod);
brw_inst_set_cond_modifier(p->devinfo, i[3], inst->conditional_mod);
/* brw_set_default_saturate() is called before emitting instructions,
* so the saturate bit is set in each instruction, so we need to unset
* it on the first instruction of each pair.
*/
brw_inst_set_saturate(p->devinfo, i[0], false);
brw_inst_set_saturate(p->devinfo, i[2], false);
}
brw_pop_insn_state(p);
return true;
} else if (devinfo->has_pln) {
if (devinfo->gen <= 6 && (delta_x.nr & 1) != 0) { if (devinfo->gen <= 6 && (delta_x.nr & 1) != 0) {
/* From the Sandy Bridge PRM Vol. 4, Pt. 2, Section 8.3.53, "Plane": /* From the Sandy Bridge PRM Vol. 4, Pt. 2, Section 8.3.53, "Plane":
* *