diff options
author | Matt Turner <mattst88@gmail.com> | 2014-01-27 10:49:12 -0800 |
---|---|---|
committer | Matt Turner <mattst88@gmail.com> | 2014-01-27 21:15:35 -0800 |
commit | 37f1903e007e30892ce39e6e2493c9e88dacf7cc (patch) | |
tree | 7f53429945fa7598fd70ed1caad00a87d70dbe11 /src/glsl | |
parent | 8e2b8bd0e613d1e24860d9572fc16893ad11a2da (diff) | |
download | external_mesa3d-37f1903e007e30892ce39e6e2493c9e88dacf7cc.zip external_mesa3d-37f1903e007e30892ce39e6e2493c9e88dacf7cc.tar.gz external_mesa3d-37f1903e007e30892ce39e6e2493c9e88dacf7cc.tar.bz2 |
glsl: Avoid combining statements from different basic blocks.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74113
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/glsl')
-rw-r--r-- | src/glsl/opt_vectorize.cpp | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/src/glsl/opt_vectorize.cpp b/src/glsl/opt_vectorize.cpp index ac43a29..5ad1320 100644 --- a/src/glsl/opt_vectorize.cpp +++ b/src/glsl/opt_vectorize.cpp @@ -82,6 +82,8 @@ public: virtual ir_visitor_status visit_enter(ir_assignment *); virtual ir_visitor_status visit_enter(ir_swizzle *); + virtual ir_visitor_status visit_enter(ir_if *); + virtual ir_visitor_status visit_enter(ir_loop *); virtual ir_visitor_status visit_leave(ir_assignment *); @@ -285,6 +287,39 @@ ir_vectorize_visitor::visit_enter(ir_swizzle *ir) return visit_continue; } +/* Since there is no statement to visit between the "then" and "else" + * instructions try to vectorize before, in between, and after them to avoid + * combining statements from different basic blocks. + */ +ir_visitor_status +ir_vectorize_visitor::visit_enter(ir_if *ir) +{ + try_vectorize(); + + visit_list_elements(this, &ir->then_instructions); + try_vectorize(); + + visit_list_elements(this, &ir->else_instructions); + try_vectorize(); + + return visit_continue_with_parent; +} + +/* Since there is no statement to visit between the instructions in the body of + * the loop and the instructions after it try to vectorize before and after the + * body to avoid combining statements from different basic blocks. + */ +ir_visitor_status +ir_vectorize_visitor::visit_enter(ir_loop *ir) +{ + try_vectorize(); + + visit_list_elements(this, &ir->body_instructions); + try_vectorize(); + + return visit_continue_with_parent; +} + /** * Upon leaving an ir_assignment, save a pointer to it in ::assignment[] if * the swizzle mask(s) found were appropriate. Also save a pointer in |