OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: Don't do constant propagation in opt_constant_folding.

Browse Source 
opt_constant_folding is supposed to fold trees of constants into a
single constant.  Surprisingly, it was also propagating constant values
from variables into expression trees - even when the result couldn't be
folded together.  This is opt_constant_propagation's job.

The ir_dereference_variable::constant_expression_value() method returns
a clone of var->constant_value.  So we would replace the dereference
with a constant, propagating it into the tree.

Skip over ir_dereference_variable to avoid this surprising behavior.
However, add code to explicitly continue doing it in the constant
propagation pass, as it's useful to do so.

shader-db statistics on Broadwell:

total instructions in shared programs: 8905349 -> 8905126 (-0.00%)
instructions in affected programs: 30100 -> 29877 (-0.74%)
helped: 93
HURT: 20

total cycles in shared programs: 71017030 -> 71015944 (-0.00%)
cycles in affected programs: 132456 -> 131370 (-0.82%)
helped: 54
HURT: 45

The only hurt programs are by a single instruction, while the helped
ones are helped by 1-4 instructions.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Kenneth Graunke
2016-04-29 13:13:01 -07:00
parent db8fcbbaf9
commit 8e71ac731b
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/compiler/glsl/opt_constant_propagation.cpp
View File

@@ -138,8 +138,20 @@ public:
void
ir_constant_propagation_visitor::constant_folding(ir_rvalue **rvalue)
{
if (*rvalue == NULL)
return;
if (ir_constant_fold(rvalue))
this->progress = true;
ir_dereference_variable *var_ref = (*rvalue)->as_dereference_variable();
if (var_ref) {
ir_constant *constant = var_ref->constant_expression_value();
if (constant) {
*rvalue = constant;
this->progress = true;
}
}
}
void