From: Luca Barbieri Date: Sun, 5 Sep 2010 20:29:58 +0000 (+0200) Subject: glsl: add several EmitNo* options, and MaxUnrollIterations X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e591c4625cae63660c5000fbab366e40fe154ab0;p=mesa.git 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 --- diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp index 3dbec5d52c1..400203d261a 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 33f4bc78f79..df256735937 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 78f3a7402ba..c2c662152e2 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 893dd46db04..7b0511fbbec 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 e204251e9cc..80f92171590 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 2a7a7136ff9..94c14a58a7b 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); diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index 25a20e76042..c23e7ce78a5 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -141,7 +141,7 @@ brw_link_shader(GLcontext *ctx, struct gl_shader_program *prog) do { progress = false; - progress = do_common_optimization(shader->ir, true) || progress; + progress = do_common_optimization(shader->ir, true, 32) || progress; } while (progress); validate_ir_tree(shader->ir); diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 61cd93c364c..3e54656981d 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2187,7 +2187,6 @@ struct gl_shader_compiler_options { /** Driver-selectable options: */ GLboolean EmitHighLevelInstructions; /**< IF/ELSE/ENDIF vs. BRA, etc. */ - GLboolean EmitContReturn; /**< Emit CONT/RET opcodes? */ GLboolean EmitCondCodes; /**< Use condition codes? */ GLboolean EmitComments; /**< Annotated instructions */ GLboolean EmitNVTempInitialization; /**< 0-fill NV temp registers */ @@ -2196,6 +2195,12 @@ struct gl_shader_compiler_options * support control flow. */ GLboolean EmitNoIfs; + GLboolean EmitNoLoops; + GLboolean EmitNoFunctions; + GLboolean EmitNoCont; /**< Emit CONT opcode? */ + GLboolean EmitNoMainReturn; /**< Emit CONT/RET opcodes? */ + + GLuint MaxUnrollIterations; struct gl_sl_pragmas DefaultPragmas; /**< Default #pragma settings */ }; diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 2977a29ab74..c32c09f8d4b 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -97,10 +97,14 @@ _mesa_init_shader_state(GLcontext *ctx) struct gl_shader_compiler_options options; GLuint i; options.EmitHighLevelInstructions = GL_TRUE; - options.EmitContReturn = GL_TRUE; options.EmitCondCodes = GL_FALSE; options.EmitComments = GL_FALSE; options.EmitNoIfs = GL_FALSE; + options.EmitNoLoops = GL_FALSE; + options.EmitNoFunctions = GL_FALSE; + options.EmitNoCont = GL_FALSE; + options.EmitNoMainReturn = GL_FALSE; + options.MaxUnrollIterations = 32; /* Default pragma settings */ options.DefaultPragmas.IgnoreOptimize = GL_FALSE; diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index b3641032fb0..caa906abfad 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -2719,7 +2719,7 @@ _mesa_ir_link_shader(GLcontext *ctx, struct gl_shader_program *prog) do_div_to_mul_rcp(ir); do_explog_to_explog2(ir); - progress = do_common_optimization(ir, true) || progress; + progress = do_common_optimization(ir, true, options->MaxUnrollIterations) || progress; if (options->EmitNoIfs) progress = do_if_to_cond_assign(ir) || progress; @@ -2799,7 +2799,7 @@ _mesa_glsl_compile_shader(GLcontext *ctx, struct gl_shader *shader) /* Do some optimization at compile time to reduce shader IR size * and reduce later work if the same shader is linked multiple times */ - while (do_common_optimization(shader->ir, false)) + while (do_common_optimization(shader->ir, false, 32)) ; validate_ir_tree(shader->ir); diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 82be1494338..91bd5a92c92 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -135,11 +135,8 @@ void st_init_limits(struct st_context *st) = CLAMP(screen->get_param(screen, PIPE_CAP_MAX_RENDER_TARGETS), 1, MAX_DRAW_BUFFERS); - /* Is TGSI_OPCODE_CONT supported? */ - /* XXX separate query for early function return? */ for(i = 0; i < MESA_SHADER_TYPES; ++i) - st->ctx->ShaderCompilerOptions[i].EmitContReturn = - screen->get_param(screen, PIPE_CAP_TGSI_CONT_SUPPORTED); + st->ctx->ShaderCompilerOptions[i].EmitNoCont = !screen->get_param(screen, PIPE_CAP_TGSI_CONT_SUPPORTED); /* Quads always follow GL provoking rules. */ c->QuadsFollowProvokingVertexConvention = GL_FALSE;