* Takes the leaves of expression trees and makes them dereferences of
* assignments of the leaves to temporaries, according to a predicate.
*
- * This is used for automatic function inlining, where we want to take
- * an expression containing a call and move the call out to its own
- * assignment so that we can inline it at the appropriate place in the
- * instruction stream.
+ * This is used for breaking down matrix operations, where it's easier to
+ * create a temporary and work on each of its vector components individually.
*/
#include "ir.h"
-#include "ir_visitor.h"
+#include "ir_rvalue_visitor.h"
#include "ir_expression_flattening.h"
-#include "glsl_types.h"
-class ir_expression_flattening_visitor : public ir_hierarchical_visitor {
+class ir_expression_flattening_visitor : public ir_rvalue_visitor {
public:
- ir_expression_flattening_visitor(ir_instruction *base_ir,
- bool (*predicate)(ir_instruction *ir))
+ ir_expression_flattening_visitor(bool (*predicate)(ir_instruction *ir))
{
- this->base_ir = base_ir;
this->predicate = predicate;
}
/* empty */
}
- virtual ir_visitor_status visit_enter(ir_call *);
- virtual ir_visitor_status visit_enter(ir_return *);
- virtual ir_visitor_status visit_enter(ir_function_signature *);
- virtual ir_visitor_status visit_enter(ir_if *);
- virtual ir_visitor_status visit_enter(ir_loop *);
- virtual ir_visitor_status visit_leave(ir_expression *);
- virtual ir_visitor_status visit_leave(ir_swizzle *);
-
+ void handle_rvalue(ir_rvalue **rvalue);
bool (*predicate)(ir_instruction *ir);
- ir_instruction *base_ir;
};
void
do_expression_flattening(exec_list *instructions,
bool (*predicate)(ir_instruction *ir))
{
- foreach_iter(exec_list_iterator, iter, *instructions) {
- ir_instruction *ir = (ir_instruction *)iter.get();
+ ir_expression_flattening_visitor v(predicate);
- ir_expression_flattening_visitor v(ir, predicate);
+ foreach_in_list(ir_instruction, ir, instructions) {
ir->accept(&v);
}
}
-
-static ir_rvalue *
-operand_to_temp(ir_instruction *base_ir, ir_rvalue *ir)
+void
+ir_expression_flattening_visitor::handle_rvalue(ir_rvalue **rvalue)
{
- void *ctx = talloc_parent(base_ir);
ir_variable *var;
ir_assignment *assign;
+ ir_rvalue *ir = *rvalue;
+
+ if (!ir || !this->predicate(ir))
+ return;
+
+ void *ctx = ralloc_parent(ir);
- var = new(ctx) ir_variable(ir->type, "flattening_tmp");
+ var = new(ctx) ir_variable(ir->type, "flattening_tmp", ir_var_temporary);
base_ir->insert_before(var);
assign = new(ctx) ir_assignment(new(ctx) ir_dereference_variable(var),
NULL);
base_ir->insert_before(assign);
- return new(ctx) ir_dereference_variable(var);
-}
-
-ir_visitor_status
-ir_expression_flattening_visitor::visit_enter(ir_function_signature *ir)
-{
- do_expression_flattening(&ir->body, this->predicate);
-
- return visit_continue_with_parent;
-}
-
-ir_visitor_status
-ir_expression_flattening_visitor::visit_enter(ir_loop *ir)
-{
- do_expression_flattening(&ir->body_instructions, this->predicate);
-
- return visit_continue_with_parent;
-}
-
-ir_visitor_status
-ir_expression_flattening_visitor::visit_enter(ir_if *ir)
-{
- ir->condition->accept(this);
-
- do_expression_flattening(&ir->then_instructions, this->predicate);
- do_expression_flattening(&ir->else_instructions, this->predicate);
-
- return visit_continue_with_parent;
-}
-
-ir_visitor_status
-ir_expression_flattening_visitor::visit_leave(ir_expression *ir)
-{
- unsigned int operand;
-
- for (operand = 0; operand < ir->get_num_operands(); operand++) {
- /* If the operand matches the predicate, then we'll assign its
- * value to a temporary and deref the temporary as the operand.
- */
- if (this->predicate(ir->operands[operand])) {
- ir->operands[operand] = operand_to_temp(base_ir,
- ir->operands[operand]);
- }
- }
-
- return visit_continue;
-}
-
-ir_visitor_status
-ir_expression_flattening_visitor::visit_leave(ir_swizzle *ir)
-{
- if (this->predicate(ir->val)) {
- ir->val = operand_to_temp(this->base_ir, ir->val);
- }
-
- return visit_continue;
-}
-
-ir_visitor_status
-ir_expression_flattening_visitor::visit_enter(ir_call *ir)
-{
- /* FINISHME: Why not process the call parameters? (Same behavior as original
- * FINISHME: code.)
- */
- (void) ir;
- return visit_continue_with_parent;
-}
-
-
-ir_visitor_status
-ir_expression_flattening_visitor::visit_enter(ir_return *ir)
-{
- /* FINISHME: Why not process the return value? (Same behavior as original
- * FINISHME: code.)
- */
- (void) ir;
- return visit_continue_with_parent;
+ *rvalue = new(ctx) ir_dereference_variable(var);
}