diff options
author | Timothy Arceri <[email protected]> | 2018-04-03 11:38:13 +1000 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2018-04-04 08:40:16 +1000 |
commit | b42633db8e3711e54a5bd10495b1436b8e362801 (patch) | |
tree | d458d50336e52b6eb2beccb6d1c8524f060d2cef /src/compiler/glsl | |
parent | a58fdc61e9f10d91b618c7719a51ea2465a22186 (diff) |
glsl: always call do_lower_jumps() after loop unrolling
This fixes a bug in radeonsi where LLVM cannot handle the case where
a break exists but its not the last instruction in the block.
LLVM would fail with:
Terminator found in the middle of a basic block!
LLVM ERROR: Broken function found, compilation aborted!
Fixes: 96fe8834f539 "glsl_to_tgsi: do fewer optimizations with GLSLOptimizeConservatively"
Reviewed-by: Matt Turner <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105317
Diffstat (limited to 'src/compiler/glsl')
-rw-r--r-- | src/compiler/glsl/glsl_parser_extras.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index 275c4d75711..0cc57f5a887 100644 --- a/src/compiler/glsl/glsl_parser_extras.cpp +++ b/src/compiler/glsl/glsl_parser_extras.cpp @@ -2242,6 +2242,24 @@ do_common_optimization(exec_list *ir, bool linked, loop_progress = false; loop_progress |= do_constant_propagation(ir); loop_progress |= do_if_simplification(ir); + + /* Some drivers only call do_common_optimization() once rather + * than in a loop. So we must call do_lower_jumps() after + * unrolling a loop because for drivers that use LLVM validation + * will fail if a jump is not the last instruction in the block. + * For example the following will fail LLVM validation: + * + * (loop ( + * ... + * break + * (assign (x) (var_ref v124) (expression int + (var_ref v124) + * (constant int (1)) ) ) + * )) + */ + loop_progress |= do_lower_jumps(ir, true, true, + options->EmitNoMainReturn, + options->EmitNoCont, + options->EmitNoLoops); } progress |= loop_progress; } |