From: Samuel Iglesias Gonsálvez Date: Tue, 28 Mar 2017 04:25:13 +0000 (+0200) Subject: Revert "i965/fs: Don't emit SEL instructions for type-converting MOVs." X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dee31311eb024a636466e359b43d3a67b0135f32;p=mesa.git Revert "i965/fs: Don't emit SEL instructions for type-converting MOVs." This reverts commit 7dccd38b400d3a65da20ddefe282a7bb0b7ccb58. d2x pass fixes SEL instructions when there is a type conversion by doing a SEL without type conversion and then convert the result. This pass also takes into account the non-uniform control flow. Then, 7dccd38b400d3a65da20ddefe282a7bb0b7ccb58 is not needed anymore. Signed-off-by: Samuel Iglesias Gonsálvez Reviewed-by: Francisco Jerez Reviewed-by: Matt Turner --- diff --git a/src/intel/compiler/brw_fs_sel_peephole.cpp b/src/intel/compiler/brw_fs_sel_peephole.cpp index 4c1c1607978..8cd897f72e0 100644 --- a/src/intel/compiler/brw_fs_sel_peephole.cpp +++ b/src/intel/compiler/brw_fs_sel_peephole.cpp @@ -165,8 +165,6 @@ fs_visitor::opt_peephole_sel() then_mov[i]->exec_size != else_mov[i]->exec_size || then_mov[i]->group != else_mov[i]->group || then_mov[i]->force_writemask_all != else_mov[i]->force_writemask_all || - then_mov[i]->dst.type != then_mov[i]->src[0].type || - else_mov[i]->dst.type != else_mov[i]->src[0].type || then_mov[i]->is_partial_write() || else_mov[i]->is_partial_write() || then_mov[i]->conditional_mod != BRW_CONDITIONAL_NONE ||