From 4532cac06a9da527549efb685c6f37ffed24ddbf Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Tue, 29 Oct 2013 21:39:52 -0700 Subject: [PATCH] i965/fs: Extend SEL peephole to handle only matching MOVs. Before this patch, the following code would not be optimized even though the first two instructions were common to the then and else blocks: (+f0) IF MOV dst0 ... MOV dst1 ... MOV dst2 ... ELSE MOV dst0 ... MOV dst1 ... MOV dst3 ... ENDIF This commit extends the peephole to handle this case. No shader-db changes. Reviewed-by: Paul Berry Reviewed-by: Eric Anholt --- src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp b/src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp index 52be1b772e4..f2749945813 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp @@ -147,7 +147,6 @@ fs_visitor::opt_peephole_sel() fs_inst *else_mov[MAX_MOVS] = { NULL }; fs_inst *then_mov[MAX_MOVS] = { NULL }; - bool malformed_mov_found = false; int movs = count_movs_from_if(then_mov, else_mov, if_inst, else_inst); @@ -166,7 +165,7 @@ fs_visitor::opt_peephole_sel() if (!then_mov[i]->dst.equals(else_mov[i]->dst) || then_mov[i]->is_partial_write() || else_mov[i]->is_partial_write()) { - malformed_mov_found = true; + movs = i; break; } @@ -193,7 +192,7 @@ fs_visitor::opt_peephole_sel() } } - if (malformed_mov_found) + if (movs == 0) continue; /* Emit a CMP if our IF used the embedded comparison */ -- 2.30.2