From db095eb43bd02414e71f93e72ff61b463bef0ece Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Fri, 13 Mar 2015 14:34:06 -0700 Subject: i965: De-duplicate is_expression_commutative() functions. Create a backend_inst::is_commutative() method to replace two static functions that did the exact same thing. Signed-off-by: Kenneth Graunke Reviewed-by: Topi Pohjolainen --- src/mesa/drivers/dri/i965/brw_fs_cse.cpp | 24 +----------------------- src/mesa/drivers/dri/i965/brw_shader.cpp | 22 ++++++++++++++++++++++ src/mesa/drivers/dri/i965/brw_shader.h | 1 + src/mesa/drivers/dri/i965/brw_vec4_cse.cpp | 24 +----------------------- 4 files changed, 25 insertions(+), 46 deletions(-) (limited to 'src') diff --git a/src/mesa/drivers/dri/i965/brw_fs_cse.cpp b/src/mesa/drivers/dri/i965/brw_fs_cse.cpp index ae069bb757a..ca5b32f4301 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_cse.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_cse.cpp @@ -108,28 +108,6 @@ is_expression(const fs_inst *const inst) } } -static bool -is_expression_commutative(const fs_inst *inst) -{ - 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(const fs_inst *a, const fs_inst *b) { @@ -140,7 +118,7 @@ operands_match(const fs_inst *a, const 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)) { + } else if (!a->is_commutative()) { 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_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp index ff0ef4b8f82..51c965c4e77 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.cpp +++ b/src/mesa/drivers/dri/i965/brw_shader.cpp @@ -768,6 +768,28 @@ backend_reg::is_accumulator() const fixed_hw_reg.nr == BRW_ARF_ACCUMULATOR; } +bool +backend_instruction::is_commutative() const +{ + switch (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 (conditional_mod == BRW_CONDITIONAL_GE || + conditional_mod == BRW_CONDITIONAL_L) { + return true; + } + /* fallthrough */ + default: + return false; + } +} + bool backend_instruction::is_3src() const { diff --git a/src/mesa/drivers/dri/i965/brw_shader.h b/src/mesa/drivers/dri/i965/brw_shader.h index 5c9535536bf..f8cc98afd91 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.h +++ b/src/mesa/drivers/dri/i965/brw_shader.h @@ -94,6 +94,7 @@ struct backend_instruction : public exec_node { bool is_tex() const; bool is_math() const; bool is_control_flow() const; + bool is_commutative() const; bool can_do_source_mods() const; bool can_do_saturate() const; bool can_do_cmod() const; diff --git a/src/mesa/drivers/dri/i965/brw_vec4_cse.cpp b/src/mesa/drivers/dri/i965/brw_vec4_cse.cpp index 5fb8f3166ce..2c29d9f8999 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_cse.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_cse.cpp @@ -88,28 +88,6 @@ is_expression(const vec4_instruction *const inst) } } -static bool -is_expression_commutative(const vec4_instruction *inst) -{ - 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(const vec4_instruction *a, const vec4_instruction *b) { @@ -120,7 +98,7 @@ operands_match(const vec4_instruction *a, const vec4_instruction *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)) { + } else if (!a->is_commutative()) { 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])) || -- cgit v1.2.3