KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i965/fs: Migrate opt_peephole_sel to the IR builder. 

Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Francisco Jerez 2015-06-03 19:51:47 +03:00
parent 78f7c9edeb
commit a800ec04ad
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/mesa/drivers/dri/i965/brw_fs_sel_peephole.cpp
View File

@ -37,6 +37,8 @@
*/ */
#define MAX_MOVS 8 /**< The maximum number of MOVs to attempt to match. */ #define MAX_MOVS 8 /**< The maximum number of MOVs to attempt to match. */
using namespace brw;
/** /**
* Scans forwards from an IF counting consecutive MOV instructions in the * Scans forwards from an IF counting consecutive MOV instructions in the
* "then" and "else" blocks of the if statement. * "then" and "else" blocks of the if statement.
@ -190,17 +192,16 @@ fs_visitor::opt_peephole_sel()
if (movs == 0) if (movs == 0)
continue; continue;
const fs_builder ibld = bld.at(block, if_inst);
/* Emit a CMP if our IF used the embedded comparison */ /* Emit a CMP if our IF used the embedded comparison */
if (devinfo->gen == 6 && if_inst->conditional_mod) { if (devinfo->gen == 6 && if_inst->conditional_mod)
fs_inst *cmp_inst = CMP(reg_null_d, if_inst->src[0], if_inst->src[1], ibld.CMP(ibld.null_reg_d(), if_inst->src[0], if_inst->src[1],
if_inst->conditional_mod); if_inst->conditional_mod);
if_inst->insert_before(block, cmp_inst);
}
for (int i = 0; i < movs; i++) { for (int i = 0; i < movs; i++) {
if (then_mov[i]->src[0].equals(else_mov[i]->src[0])) { if (then_mov[i]->src[0].equals(else_mov[i]->src[0])) {
fs_inst *inst = MOV(then_mov[i]->dst, then_mov[i]->src[0]); ibld.MOV(then_mov[i]->dst, then_mov[i]->src[0]);
if_inst->insert_before(block, inst);
} else { } else {
/* Only the last source register can be a constant, so if the MOV /* Only the last source register can be a constant, so if the MOV
* in the "then" clause uses a constant, we need to put it in a * in the "then" clause uses a constant, we need to put it in a
@ -210,14 +211,12 @@ fs_visitor::opt_peephole_sel()
if (src0.file == IMM) { if (src0.file == IMM) {
src0 = vgrf(glsl_type::float_type); src0 = vgrf(glsl_type::float_type);
src0.type = then_mov[i]->src[0].type; src0.type = then_mov[i]->src[0].type;
fs_inst *inst = MOV(src0, then_mov[i]->src[0]); ibld.MOV(src0, then_mov[i]->src[0]);
if_inst->insert_before(block, inst);
} }
fs_inst *inst = SEL(then_mov[i]->dst, src0, else_mov[i]->src[0]); set_predicate_inv(predicate, predicate_inverse,
inst->predicate = predicate; ibld.SEL(then_mov[i]->dst, src0,
inst->predicate_inverse = predicate_inverse; else_mov[i]->src[0]));
if_inst->insert_before(block, inst);
} }
then_mov[i]->remove(then_block); then_mov[i]->remove(then_block);