summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/i965
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2014-12-20 12:21:46 -0800
committerMatt Turner <mattst88@gmail.com>2015-01-08 15:38:16 -0800
commit3d8188d4f898afcf4f181de29e12c5b218bbd393 (patch)
treef6c1b532bd0b90717ea205ab395bb462fe8bc9df /src/mesa/drivers/dri/i965
parent7f813bf53d1c728c888ceffae2140f32697b8ffd (diff)
i965: Consider SEL.{GE,L} to be commutative operations.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/i965')
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs_cse.cpp15
-rw-r--r--src/mesa/drivers/dri/i965/brw_vec4_cse.cpp22
2 files changed, 27 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_cse.cpp b/src/mesa/drivers/dri/i965/brw_fs_cse.cpp
index 38fae17811..f87601ce0e 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_cse.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_cse.cpp
@@ -109,22 +109,29 @@ is_expression(const fs_inst *const inst)
}
static bool
-is_expression_commutative(enum opcode op)
+is_expression_commutative(const fs_inst *inst)
{
- switch (op) {
+ switch (inst->opcode) {
case BRW_OPCODE_AND:
case BRW_OPCODE_OR:
case BRW_OPCODE_XOR:
case BRW_OPCODE_ADD:
case BRW_OPCODE_MUL:
return true;
+ case BRW_OPCODE_SEL:
+ /* MIN and MAX are commutative. */
+ if (inst->conditional_mod == BRW_CONDITIONAL_GE ||
+ inst->conditional_mod == BRW_CONDITIONAL_L) {
+ return true;
+ }
+ /* fallthrough */
default:
return false;
}
}
static bool
-operands_match(fs_inst *a, fs_inst *b)
+operands_match(const fs_inst *a, const fs_inst *b)
{
fs_reg *xs = a->src;
fs_reg *ys = b->src;
@@ -133,7 +140,7 @@ operands_match(fs_inst *a, fs_inst *b)
return xs[0].equals(ys[0]) &&
((xs[1].equals(ys[1]) && xs[2].equals(ys[2])) ||
(xs[2].equals(ys[1]) && xs[1].equals(ys[2])));
- } else if (!is_expression_commutative(a->opcode)) {
+ } else if (!is_expression_commutative(a)) {
bool match = true;
for (int i = 0; i < a->sources; i++) {
if (!xs[i].equals(ys[i])) {
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_cse.cpp b/src/mesa/drivers/dri/i965/brw_vec4_cse.cpp
index 37c930c746..30a4098b33 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_cse.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_cse.cpp
@@ -89,28 +89,38 @@ is_expression(const vec4_instruction *const inst)
}
static bool
-is_expression_commutative(enum opcode op)
+is_expression_commutative(const vec4_instruction *inst)
{
- switch (op) {
+ switch (inst->opcode) {
case BRW_OPCODE_AND:
case BRW_OPCODE_OR:
case BRW_OPCODE_XOR:
case BRW_OPCODE_ADD:
case BRW_OPCODE_MUL:
return true;
+ case BRW_OPCODE_SEL:
+ /* MIN and MAX are commutative. */
+ if (inst->conditional_mod == BRW_CONDITIONAL_GE ||
+ inst->conditional_mod == BRW_CONDITIONAL_L) {
+ return true;
+ }
+ /* fallthrough */
default:
return false;
}
}
static bool
-operands_match(enum opcode op, src_reg *xs, src_reg *ys)
+operands_match(const vec4_instruction *a, const vec4_instruction *b)
{
- if (op == BRW_OPCODE_MAD) {
+ const src_reg *xs = a->src;
+ const src_reg *ys = b->src;
+
+ if (a->opcode == BRW_OPCODE_MAD) {
return xs[0].equals(ys[0]) &&
((xs[1].equals(ys[1]) && xs[2].equals(ys[2])) ||
(xs[2].equals(ys[1]) && xs[1].equals(ys[2])));
- } else if (!is_expression_commutative(op)) {
+ } else if (!is_expression_commutative(a)) {
return xs[0].equals(ys[0]) && xs[1].equals(ys[1]) && xs[2].equals(ys[2]);
} else {
return (xs[0].equals(ys[0]) && xs[1].equals(ys[1])) ||
@@ -126,7 +136,7 @@ instructions_match(vec4_instruction *a, vec4_instruction *b)
a->conditional_mod == b->conditional_mod &&
a->dst.type == b->dst.type &&
a->dst.writemask == b->dst.writemask &&
- operands_match(a->opcode, a->src, b->src);
+ operands_match(a, b);
}
bool