Mesa (master): glsl: fix potential slow compile times for GLSLOptimizeConservatively
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sun Jun 7 05:40:47 UTC 2020
Module: Mesa
Branch: master
Commit: e43ab7bb05857461609ed2bd43703eb272a3ebe1
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e43ab7bb05857461609ed2bd43703eb272a3ebe1
Author: Timothy Arceri <tarceri at itsqueeze.com>
Date: Fri Jun 5 13:57:40 2020 +1000
glsl: fix potential slow compile times for GLSLOptimizeConservatively
See code comment for full description of the change.
Fixes: 0a5018c1a483 ("mesa: add gl_constants::GLSLOptimizeConservatively")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3034
Tested-by: Witold Baryluk <witold.baryluk at gmail.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5346>
---
src/compiler/glsl/glsl_parser_extras.cpp | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp
index c0f116b8fb4..e5c9f83e63a 100644
--- a/src/compiler/glsl/glsl_parser_extras.cpp
+++ b/src/compiler/glsl/glsl_parser_extras.cpp
@@ -2361,7 +2361,20 @@ do_common_optimization(exec_list *ir, bool linked,
OPT(lower_vector_insert, ir, false);
OPT(optimize_swizzles, ir);
- OPT(optimize_split_arrays, ir, linked);
+ /* Some drivers only call do_common_optimization() once rather than in a
+ * loop, and split arrays causes each element of a constant array to
+ * dereference is own copy of the entire array initilizer. This IR is not
+ * something that can be generated manually in a shader and is not
+ * accounted for by NIR optimisations, the result is an exponential slow
+ * down in compilation speed as a constant arrays element count grows. To
+ * avoid that here we make sure to always clean up the mess split arrays
+ * causes to constant arrays.
+ */
+ bool array_split = optimize_split_arrays(ir, linked);
+ if (array_split)
+ do_constant_propagation(ir);
+ progress |= array_split;
+
OPT(optimize_redundant_jumps, ir);
if (options->MaxUnrollIterations) {
More information about the mesa-commit
mailing list