this->min_branch_cost = min_branch_cost;
this->depth = 0;
- this->condition_variables =
- _mesa_set_create(NULL, _mesa_hash_pointer,
- _mesa_key_pointer_equal);
+ this->condition_variables = _mesa_pointer_set_create(NULL);
}
~ir_if_to_cond_assign_visitor()
bool found_unsupported_op;
bool found_expensive_op;
+ bool found_dynamic_arrayref;
bool is_then;
bool progress;
gl_shader_stage stage;
return v.progress;
}
-void
+static void
check_ir_node(ir_instruction *ir, void *data)
{
ir_if_to_cond_assign_visitor *v = (ir_if_to_cond_assign_visitor *)data;
v->found_expensive_op = true;
break;
+ case ir_type_dereference_array: {
+ ir_dereference_array *deref = ir->as_dereference_array();
+
+ if (deref->array_index->ir_type != ir_type_constant)
+ v->found_dynamic_arrayref = true;
+ } /* fall-through */
case ir_type_expression:
- case ir_type_dereference_array:
case ir_type_dereference_record:
if (v->is_then)
v->then_cost++;
}
}
-void
+static void
move_block_to_cond_assign(void *mem_ctx,
- ir_if *if_ir, ir_rvalue *cond_expr,
- exec_list *instructions,
- struct set *set)
+ ir_if *if_ir, ir_rvalue *cond_expr,
+ exec_list *instructions,
+ struct set *set)
{
foreach_in_list_safe(ir_instruction, ir, instructions) {
if (ir->ir_type == ir_type_assignment) {
- ir_assignment *assign = (ir_assignment *)ir;
-
- if (_mesa_set_search(set, assign) == NULL) {
- _mesa_set_add(set, assign);
-
- /* If the LHS of the assignment is a condition variable that was
- * previously added, insert an additional assignment of false to
- * the variable.
- */
- const bool assign_to_cv =
- _mesa_set_search(
- set, assign->lhs->variable_referenced()) != NULL;
-
- if (!assign->condition) {
- if (assign_to_cv) {
- assign->rhs =
- new(mem_ctx) ir_expression(ir_binop_logic_and,
- glsl_type::bool_type,
- cond_expr->clone(mem_ctx, NULL),
- assign->rhs);
- } else {
- assign->condition = cond_expr->clone(mem_ctx, NULL);
- }
- } else {
- assign->condition =
- new(mem_ctx) ir_expression(ir_binop_logic_and,
- glsl_type::bool_type,
- cond_expr->clone(mem_ctx, NULL),
- assign->condition);
- }
- }
+ ir_assignment *assign = (ir_assignment *)ir;
+
+ if (_mesa_set_search(set, assign) == NULL) {
+ _mesa_set_add(set, assign);
+
+ /* If the LHS of the assignment is a condition variable that was
+ * previously added, insert an additional assignment of false to
+ * the variable.
+ */
+ const bool assign_to_cv =
+ _mesa_set_search(
+ set, assign->lhs->variable_referenced()) != NULL;
+
+ if (!assign->condition) {
+ if (assign_to_cv) {
+ assign->rhs =
+ new(mem_ctx) ir_expression(ir_binop_logic_and,
+ glsl_type::bool_type,
+ cond_expr->clone(mem_ctx, NULL),
+ assign->rhs);
+ } else {
+ assign->condition = cond_expr->clone(mem_ctx, NULL);
+ }
+ } else {
+ assign->condition =
+ new(mem_ctx) ir_expression(ir_binop_logic_and,
+ glsl_type::bool_type,
+ cond_expr->clone(mem_ctx, NULL),
+ assign->condition);
+ }
+ }
}
/* Now, move from the if block to the block surrounding it. */
}
ir_visitor_status
-ir_if_to_cond_assign_visitor::visit_enter(ir_if *ir)
+ir_if_to_cond_assign_visitor::visit_enter(ir_if *)
{
- (void) ir;
this->depth++;
return visit_continue;
this->found_unsupported_op = false;
this->found_expensive_op = false;
+ this->found_dynamic_arrayref = false;
this->then_cost = 0;
this->else_cost = 0;
if (this->found_unsupported_op)
return visit_continue; /* can't handle inner unsupported opcodes */
- /* Skip if the branch cost is high enough or if there's an expensive op. */
+ /* Skip if the branch cost is high enough or if there's an expensive op.
+ *
+ * Also skip if non-constant array indices were encountered, since those
+ * can be out-of-bounds for a not-taken branch, and so generating an
+ * assignment would be incorrect. In the case of must_lower, it's up to the
+ * backend to deal with any potential fall-out (perhaps by translating the
+ * assignments to hardware-predicated moves).
+ */
if (!must_lower &&
(this->found_expensive_op ||
+ this->found_dynamic_arrayref ||
MAX2(this->then_cost, this->else_cost) >= this->min_branch_cost))
return visit_continue;
*/
ir_variable *const then_var =
new(mem_ctx) ir_variable(glsl_type::bool_type,
- "if_to_cond_assign_then",
- ir_var_temporary);
+ "if_to_cond_assign_then",
+ ir_var_temporary);
ir->insert_before(then_var);
ir_dereference_variable *then_cond =
ir->insert_before(assign);
move_block_to_cond_assign(mem_ctx, ir, then_cond,
- &ir->then_instructions,
- this->condition_variables);
+ &ir->then_instructions,
+ this->condition_variables);
/* Add the new condition variable to the hash table. This allows us to
* find this variable when lowering other (enclosing) if-statements.
*/
if (!ir->else_instructions.is_empty()) {
ir_variable *const else_var =
- new(mem_ctx) ir_variable(glsl_type::bool_type,
- "if_to_cond_assign_else",
- ir_var_temporary);
+ new(mem_ctx) ir_variable(glsl_type::bool_type,
+ "if_to_cond_assign_else",
+ ir_var_temporary);
ir->insert_before(else_var);
ir_dereference_variable *else_cond =
- new(mem_ctx) ir_dereference_variable(else_var);
+ new(mem_ctx) ir_dereference_variable(else_var);
ir_rvalue *inverse =
- new(mem_ctx) ir_expression(ir_unop_logic_not,
- then_cond->clone(mem_ctx, NULL));
+ new(mem_ctx) ir_expression(ir_unop_logic_not,
+ then_cond->clone(mem_ctx, NULL));
assign = new(mem_ctx) ir_assignment(else_cond, inverse);
ir->insert_before(assign);
move_block_to_cond_assign(mem_ctx, ir, else_cond,
- &ir->else_instructions,
- this->condition_variables);
+ &ir->else_instructions,
+ this->condition_variables);
/* Add the new condition variable to the hash table. This allows us to
* find this variable when lowering other (enclosing) if-statements.
projects / mesa.git / blobdiff