Mesa (main): glsl: move common link time optimisation calls to linker code

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: a14e2733cef03ff6a8fb69e49308af4308c21568
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a14e2733cef03ff6a8fb69e49308af4308c21568

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Tue May 31 09:44:21 2022 +1000

glsl: move common link time optimisation calls to linker code

In the following patch we will move the users of this function to
this file too and make it static again.

Acked-by: Emma Anholt <emma at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16770>

---

 src/compiler/glsl/gl_nir_linker.c         | 39 +++++++++++++++++++++++++
 src/compiler/glsl/gl_nir_linker.h         |  2 ++
 src/mesa/state_tracker/st_glsl_to_nir.cpp | 47 +++----------------------------
 3 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/src/compiler/glsl/gl_nir_linker.c b/src/compiler/glsl/gl_nir_linker.c
index 9bbef29d0bc..6b26b9c1042 100644
--- a/src/compiler/glsl/gl_nir_linker.c
+++ b/src/compiler/glsl/gl_nir_linker.c
@@ -117,6 +117,45 @@ gl_nir_opts(nir_shader *nir)
    } while (progress);
 }
 
+void
+gl_nir_link_opts(nir_shader *producer, nir_shader *consumer)
+{
+   if (producer->options->lower_to_scalar) {
+      NIR_PASS_V(producer, nir_lower_io_to_scalar_early, nir_var_shader_out);
+      NIR_PASS_V(consumer, nir_lower_io_to_scalar_early, nir_var_shader_in);
+   }
+
+   nir_lower_io_arrays_to_elements(producer, consumer);
+
+   gl_nir_opts(producer);
+   gl_nir_opts(consumer);
+
+   if (nir_link_opt_varyings(producer, consumer))
+      gl_nir_opts(consumer);
+
+   NIR_PASS_V(producer, nir_remove_dead_variables, nir_var_shader_out, NULL);
+   NIR_PASS_V(consumer, nir_remove_dead_variables, nir_var_shader_in, NULL);
+
+   if (nir_remove_unused_varyings(producer, consumer)) {
+      NIR_PASS_V(producer, nir_lower_global_vars_to_local);
+      NIR_PASS_V(consumer, nir_lower_global_vars_to_local);
+
+      gl_nir_opts(producer);
+      gl_nir_opts(consumer);
+
+      /* Optimizations can cause varyings to become unused.
+       * nir_compact_varyings() depends on all dead varyings being removed so
+       * we need to call nir_remove_dead_variables() again here.
+       */
+      NIR_PASS_V(producer, nir_remove_dead_variables, nir_var_shader_out,
+                 NULL);
+      NIR_PASS_V(consumer, nir_remove_dead_variables, nir_var_shader_in,
+                 NULL);
+   }
+
+   nir_link_varying_precision(producer, consumer);
+}
+
 static bool
 can_remove_uniform(nir_variable *var, UNUSED void *data)
 {
diff --git a/src/compiler/glsl/gl_nir_linker.h b/src/compiler/glsl/gl_nir_linker.h
index 4454c110f6d..892f4d7660b 100644
--- a/src/compiler/glsl/gl_nir_linker.h
+++ b/src/compiler/glsl/gl_nir_linker.h
@@ -54,6 +54,8 @@ struct gl_nir_linker_options {
 
 void gl_nir_opts(nir_shader *nir);
 
+void gl_nir_link_opts(nir_shader *producer, nir_shader *consumer);
+
 bool gl_nir_link_spirv(const struct gl_constants *consts,
                        struct gl_shader_program *prog,
                        const struct gl_nir_linker_options *options);
diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index e6bf9b8fd91..23c6e8f88a5 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -583,45 +583,6 @@ st_nir_vectorize_io(nir_shader *producer, nir_shader *consumer)
    NIR_PASS_V(producer, nir_opt_dce);
 }
 
-static void
-st_nir_link_shaders(nir_shader *producer, nir_shader *consumer)
-{
-   if (producer->options->lower_to_scalar) {
-      NIR_PASS_V(producer, nir_lower_io_to_scalar_early, nir_var_shader_out);
-      NIR_PASS_V(consumer, nir_lower_io_to_scalar_early, nir_var_shader_in);
-   }
-
-   nir_lower_io_arrays_to_elements(producer, consumer);
-
-   gl_nir_opts(producer);
-   gl_nir_opts(consumer);
-
-   if (nir_link_opt_varyings(producer, consumer))
-      gl_nir_opts(consumer);
-
-   NIR_PASS_V(producer, nir_remove_dead_variables, nir_var_shader_out, NULL);
-   NIR_PASS_V(consumer, nir_remove_dead_variables, nir_var_shader_in, NULL);
-
-   if (nir_remove_unused_varyings(producer, consumer)) {
-      NIR_PASS_V(producer, nir_lower_global_vars_to_local);
-      NIR_PASS_V(consumer, nir_lower_global_vars_to_local);
-
-      gl_nir_opts(producer);
-      gl_nir_opts(consumer);
-
-      /* Optimizations can cause varyings to become unused.
-       * nir_compact_varyings() depends on all dead varyings being removed so
-       * we need to call nir_remove_dead_variables() again here.
-       */
-      NIR_PASS_V(producer, nir_remove_dead_variables, nir_var_shader_out,
-                 NULL);
-      NIR_PASS_V(consumer, nir_remove_dead_variables, nir_var_shader_in,
-                 NULL);
-   }
-
-   nir_link_varying_precision(producer, consumer);
-}
-
 static void
 st_lower_patch_vertices_in(struct gl_shader_program *shader_prog)
 {
@@ -757,8 +718,8 @@ st_link_nir(struct gl_context *ctx,
        * stage.
        */
       for (int i = num_shaders - 2; i >= 0; i--) {
-         st_nir_link_shaders(linked_shader[i]->Program->nir,
-                             linked_shader[i + 1]->Program->nir);
+         gl_nir_link_opts(linked_shader[i]->Program->nir,
+                          linked_shader[i + 1]->Program->nir);
       }
 
       static const gl_nir_linker_options opts = {
@@ -777,8 +738,8 @@ st_link_nir(struct gl_context *ctx,
        * stage.
        */
       for (int i = num_shaders - 2; i >= 0; i--) {
-         st_nir_link_shaders(linked_shader[i]->Program->nir,
-                             linked_shader[i + 1]->Program->nir);
+         gl_nir_link_opts(linked_shader[i]->Program->nir,
+                          linked_shader[i + 1]->Program->nir);
       }
 
       /* Tidy up any left overs from the linking process for single shaders.