fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glsl: interleave constant propagation and folding

Browse source 
The constant folding pass can take a long time to complete
so rather than running through the entire pass each time
a new constant is propagated (and vice versa) interleave them.

This change helps ES31-CTS.arrays_of_arrays.InteractionFunctionCalls1
go from around 2 min -> 23 sec.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Timothy Arceri 2015-08-16 14:26:23 +10:00
parent 8483577f6b
commit dd6a6dbaf7
1 changed files with 43 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/glsl/opt_constant_propagation.cpp
View file

@ -110,6 +110,8 @@ public:
virtual ir_visitor_status visit_enter(class ir_if *);
void add_constant(ir_assignment *ir);
void constant_folding(ir_rvalue **rvalue);
void constant_propagation(ir_rvalue **rvalue);
void kill(ir_variable *ir, unsigned write_mask);
void handle_if_block(exec_list *instructions);
void handle_rvalue(ir_rvalue **rvalue);
@ -132,8 +134,38 @@ public:
void
ir_constant_propagation_visitor::handle_rvalue(ir_rvalue **rvalue)
{
ir_constant_propagation_visitor::constant_folding(ir_rvalue **rvalue) {
if (*rvalue == NULL || (*rvalue)->ir_type == ir_type_constant)
return;
/* Note that we visit rvalues one leaving. So if an expression has a
* non-constant operand, no need to go looking down it to find if it's
* constant. This cuts the time of this pass down drastically.
*/
ir_expression *expr = (*rvalue)->as_expression();
if (expr) {
for (unsigned int i = 0; i < expr->get_num_operands(); i++) {
if (!expr->operands[i]->as_constant())
return;
}
}
/* Ditto for swizzles. */
ir_swizzle *swiz = (*rvalue)->as_swizzle();
if (swiz && !swiz->val->as_constant())
return;
ir_constant *constant = (*rvalue)->constant_expression_value();
if (constant) {
*rvalue = constant;
this->progress = true;
}
}
void
ir_constant_propagation_visitor::constant_propagation(ir_rvalue **rvalue) {
if (this->in_assignee || !*rvalue)
return;
@ -216,6 +248,13 @@ ir_constant_propagation_visitor::handle_rvalue(ir_rvalue **rvalue)
this->progress = true;
}
void
ir_constant_propagation_visitor::handle_rvalue(ir_rvalue **rvalue)
{
constant_propagation(rvalue);
constant_folding(rvalue);
}
ir_visitor_status
ir_constant_propagation_visitor::visit_enter(ir_function_signature *ir)
{
@ -243,6 +282,8 @@ ir_constant_propagation_visitor::visit_enter(ir_function_signature *ir)
ir_visitor_status
ir_constant_propagation_visitor::visit_leave(ir_assignment *ir)
{
constant_folding(&ir->rhs);
if (this->in_assignee)
return visit_continue;