Revert "i965/compiler: handle conversion to smaller type in the lowering pass for that"

This reverts commit 96b5153790.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106393
Reviewed-by: Scott D Phillips <scott.d.phillips@intel.com>
This commit is contained in:
Mark Janes
2018-05-03 14:28:00 -07:00
parent 589622a2fe
commit 7b9c15628a
2 changed files with 12 additions and 7 deletions

View File

@@ -54,7 +54,7 @@ fs_visitor::lower_conversions()
bool saturate = inst->saturate;
if (supports_type_conversion(inst)) {
if (type_sz(inst->dst.type) < get_exec_type_size(inst)) {
if (get_exec_type_size(inst) == 8 && type_sz(inst->dst.type) < 8) {
/* From the Broadwell PRM, 3D Media GPGPU, "Double Precision Float to
* Single Precision Float":
*
@@ -64,9 +64,6 @@ fs_visitor::lower_conversions()
* So we need to allocate a temporary that's two registers, and then do
* a strided MOV to get the lower DWord of every Qword that has the
* result.
*
* This restriction applies, in general, whenever we convert to
* a type with a smaller bit-size.
*/
fs_reg temp = ibld.vgrf(get_exec_type(inst));
fs_reg strided_temp = subscript(temp, dst.type, 0);

View File

@@ -755,9 +755,19 @@ fs_visitor::nir_emit_alu(const fs_builder &bld, nir_alu_instr *instr)
*/
case nir_op_f2f16_undef:
inst = bld.MOV(result, op[0]);
case nir_op_i2i16:
case nir_op_u2u16: {
/* TODO: Fixing aligment rules for conversions from 32-bits to
* 16-bit types should be moved to lower_conversions
*/
fs_reg tmp = bld.vgrf(op[0].type, 1);
tmp = subscript(tmp, result.type, 0);
inst = bld.MOV(tmp, op[0]);
inst->saturate = instr->dest.saturate;
inst = bld.MOV(result, tmp);
inst->saturate = instr->dest.saturate;
break;
}
case nir_op_f2f64:
case nir_op_f2i64:
@@ -797,8 +807,6 @@ fs_visitor::nir_emit_alu(const fs_builder &bld, nir_alu_instr *instr)
case nir_op_f2u16:
case nir_op_i2i32:
case nir_op_u2u32:
case nir_op_i2i16:
case nir_op_u2u16:
case nir_op_i2f16:
case nir_op_u2f16:
inst = bld.MOV(result, op[0]);