glsl: Inline builtins in a separate pass

Previously, the ir_call functions for builtin functions were replaced
with the inline implementation immediately after being added to the
instruction list. This patch replaces that with a separate pass that
lowers them after the conversion from AST to IR is complete. This will
be useful to be able to insert some handling for the precision lowering
pass before the inlining. This needs to happen because the precision
of the operations in the inlined implementation depends on the highest
precision of all of the arguments to the call.

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3885>

diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources
index 170201e3d34e927148d921958ec67ae5406b0c99..bda3e13e91eaa2d6cb52b10d1168826779a9dba0 100644 (file)
--- a/src/compiler/Makefile.sources
+++ b/src/compiler/Makefile.sources
@@ -95,6 +95,7 @@ LIBGLSL_FILES = \
        glsl/loop_analysis.h \
        glsl/loop_unroll.cpp \
        glsl/lower_blend_equation_advanced.cpp \
+       glsl/lower_builtins.cpp \
        glsl/lower_buffer_access.cpp \
        glsl/lower_buffer_access.h \
        glsl/lower_const_arrays_to_uniforms.cpp \

diff --git a/src/compiler/glsl/ast_function.cpp b/src/compiler/glsl/ast_function.cpp
index 4fd9b87955560244da2c8cfde6cac9104f8c6417..5cbc713e6e13abcefc9350d9e77eda5ff5cffc8a 100644 (file)
--- a/src/compiler/glsl/ast_function.cpp
+++ b/src/compiler/glsl/ast_function.cpp
@@ -612,11 +612,6 @@ generate_call(exec_list *instructions, ir_function_signature *sig,
    ir_call *call = new(ctx) ir_call(sig, deref,
                                     actual_parameters, sub_var, array_idx);
    instructions->push_tail(call);
-   if (sig->is_builtin()) {
-      /* inline immediately */
-      call->generate_inline(call);
-      call->remove();
-   }
 
    /* Also emit any necessary out-parameter conversions. */
    instructions->append_list(&post_call_conversions);

diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp
index b13e1fe826b01ead21ee38905d57625c56cb840e..d930c30a7e15457e9e8c27ef17a0bd3def148373 100644 (file)
--- a/src/compiler/glsl/glsl_parser_extras.cpp
+++ b/src/compiler/glsl/glsl_parser_extras.cpp
@@ -2238,6 +2238,7 @@ _mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader,
    if (!state->error && !shader->ir->is_empty()) {
       if (options->LowerPrecision && shader->Stage == MESA_SHADER_FRAGMENT)
          lower_precision(shader->ir);
+      lower_builtins(shader->ir);
       assign_subroutine_indexes(state);
       lower_subroutine(shader->ir, state);
       opt_shader_and_create_symbol_table(ctx, state->symbols, shader);

diff --git a/src/compiler/glsl/ir_optimization.h b/src/compiler/glsl/ir_optimization.h
index 9441288476531b87bf64ae035700b5a49304f012..9f302d9fe51da1cfee3441ea14d17c3441fb8281 100644 (file)
--- a/src/compiler/glsl/ir_optimization.h
+++ b/src/compiler/glsl/ir_optimization.h
@@ -176,6 +176,7 @@ bool lower_vertex_id(gl_linked_shader *shader);
 bool lower_cs_derived(gl_linked_shader *shader);
 bool lower_blend_equation_advanced(gl_linked_shader *shader, bool coherent);
 
+bool lower_builtins(exec_list *instructions);
 bool lower_subroutine(exec_list *instructions, struct _mesa_glsl_parse_state *state);
 void propagate_invariance(exec_list *instructions);
 

diff --git a/src/compiler/glsl/lower_builtins.cpp b/src/compiler/glsl/lower_builtins.cpp
new file mode 100644 (file)
index 0000000..e7130df
--- /dev/null
+++ b/src/compiler/glsl/lower_builtins.cpp
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2019 Google, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file lower_builtins.cpp
+ *
+ * Inline calls to builtin functions.
+ */
+
+#include "ir.h"
+#include "ir_optimization.h"
+
+namespace {
+
+class lower_builtins_visitor : public ir_hierarchical_visitor {
+public:
+   lower_builtins_visitor() : progress(false) { }
+   ir_visitor_status visit_leave(ir_call *);
+   bool progress;
+};
+
+}
+
+bool
+lower_builtins(exec_list *instructions)
+{
+   lower_builtins_visitor v;
+   visit_list_elements(&v, instructions);
+   return v.progress;
+}
+
+ir_visitor_status
+lower_builtins_visitor::visit_leave(ir_call *ir)
+{
+   if (!ir->callee->is_builtin())
+      return visit_continue;
+
+   ir->generate_inline(ir);
+   ir->remove();
+
+   this->progress = true;
+
+   return visit_continue;
+}

diff --git a/src/compiler/glsl/meson.build b/src/compiler/glsl/meson.build
index 8985da79b3b1a0b3c16a9e5e848dde8c2a24d84c..eff98fef109edd4c9faede2f961195637bbc1e9b 100644 (file)
--- a/src/compiler/glsl/meson.build
+++ b/src/compiler/glsl/meson.build
@@ -147,6 +147,7 @@ files_libglsl = files(
   'lower_blend_equation_advanced.cpp',
   'lower_buffer_access.cpp',
   'lower_buffer_access.h',
+  'lower_builtins.cpp',
   'lower_const_arrays_to_uniforms.cpp',
   'lower_cs_derived.cpp',
   'lower_discard.cpp',