From e591c4625cae63660c5000fbab366e40fe154ab0 Mon Sep 17 00:00:00 2001 From: Luca Barbieri Date: Sun, 5 Sep 2010 22:29:58 +0200 Subject: glsl: add several EmitNo* options, and MaxUnrollIterations This increases the chance that GLSL programs will actually work. Note that continues and returns are not yet lowered, so linking will just fail if not supported. Signed-off-by: Ian Romanick --- src/glsl/glsl_parser_extras.cpp | 4 ++-- src/glsl/ir_optimization.h | 2 +- src/glsl/linker.cpp | 2 +- src/glsl/loop_analysis.h | 2 +- src/glsl/loop_unroll.cpp | 10 ++++++---- src/glsl/main.cpp | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) (limited to 'src/glsl') diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp index 3dbec5d52c..400203d261 100644 --- a/src/glsl/glsl_parser_extras.cpp +++ b/src/glsl/glsl_parser_extras.cpp @@ -685,7 +685,7 @@ ast_struct_specifier::ast_struct_specifier(char *identifier, } bool -do_common_optimization(exec_list *ir, bool linked) +do_common_optimization(exec_list *ir, bool linked, unsigned max_unroll_iterations) { GLboolean progress = GL_FALSE; @@ -718,7 +718,7 @@ do_common_optimization(exec_list *ir, bool linked) loop_state *ls = analyze_loop_variables(ir); progress = set_loop_controls(ir, ls) || progress; - progress = unroll_loops(ir, ls) || progress; + progress = unroll_loops(ir, ls, max_unroll_iterations) || progress; delete ls; return progress; diff --git a/src/glsl/ir_optimization.h b/src/glsl/ir_optimization.h index 33f4bc78f7..df25673593 100644 --- a/src/glsl/ir_optimization.h +++ b/src/glsl/ir_optimization.h @@ -28,7 +28,7 @@ * Prototypes for optimization passes to be called by the compiler and drivers. */ -bool do_common_optimization(exec_list *ir, bool linked); +bool do_common_optimization(exec_list *ir, bool linked, unsigned max_unroll_iterations); bool do_algebraic(exec_list *instructions); bool do_constant_folding(exec_list *instructions); diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index 78f3a7402b..c2c662152e 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -1471,7 +1471,7 @@ link_shaders(GLcontext *ctx, struct gl_shader_program *prog) * some of that unused. */ for (unsigned i = 0; i < prog->_NumLinkedShaders; i++) { - while (do_common_optimization(prog->_LinkedShaders[i]->ir, true)) + while (do_common_optimization(prog->_LinkedShaders[i]->ir, true, 32)) ; } diff --git a/src/glsl/loop_analysis.h b/src/glsl/loop_analysis.h index 893dd46db0..7b0511fbbe 100644 --- a/src/glsl/loop_analysis.h +++ b/src/glsl/loop_analysis.h @@ -57,7 +57,7 @@ set_loop_controls(exec_list *instructions, loop_state *ls); extern bool -unroll_loops(exec_list *instructions, loop_state *ls); +unroll_loops(exec_list *instructions, loop_state *ls, unsigned max_iterations); /** diff --git a/src/glsl/loop_unroll.cpp b/src/glsl/loop_unroll.cpp index e204251e9c..80f9217159 100644 --- a/src/glsl/loop_unroll.cpp +++ b/src/glsl/loop_unroll.cpp @@ -27,10 +27,11 @@ class loop_unroll_visitor : public ir_hierarchical_visitor { public: - loop_unroll_visitor(loop_state *state) + loop_unroll_visitor(loop_state *state, unsigned max_iterations) { this->state = state; this->progress = false; + this->max_iterations = max_iterations; } virtual ir_visitor_status visit_leave(ir_loop *ir); @@ -38,6 +39,7 @@ public: loop_state *state; bool progress; + unsigned max_iterations; }; @@ -62,7 +64,7 @@ loop_unroll_visitor::visit_leave(ir_loop *ir) /* Don't try to unroll loops that have zillions of iterations either. */ - if (ls->max_iterations > 32) + if (ls->max_iterations > max_iterations) return visit_continue; if (ls->num_loop_jumps > 0) @@ -90,9 +92,9 @@ loop_unroll_visitor::visit_leave(ir_loop *ir) bool -unroll_loops(exec_list *instructions, loop_state *ls) +unroll_loops(exec_list *instructions, loop_state *ls, unsigned max_iterations) { - loop_unroll_visitor v(ls); + loop_unroll_visitor v(ls, max_iterations); v.run(instructions); diff --git a/src/glsl/main.cpp b/src/glsl/main.cpp index 2a7a7136ff..94c14a58a7 100644 --- a/src/glsl/main.cpp +++ b/src/glsl/main.cpp @@ -215,7 +215,7 @@ compile_shader(GLcontext *ctx, struct gl_shader *shader) loop_state *ls = analyze_loop_variables(shader->ir); progress = set_loop_controls(shader->ir, ls) || progress; - progress = unroll_loops(shader->ir, ls) || progress; + progress = unroll_loops(shader->ir, ls, 32) || progress; delete ls; } while (progress); -- cgit v1.2.3