Mesa (main): r600/sfn: Add lowering pass to legalize image access
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue May 18 20:31:05 UTC 2021
Module: Mesa
Branch: main
Commit: 27f51577774149d788adc2e3221a1b2b733ebb9f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=27f51577774149d788adc2e3221a1b2b733ebb9f
Author: Gert Wollny <gert.wollny at collabora.com>
Date: Mon May 10 07:57:43 2021 +0200
r600/sfn: Add lowering pass to legalize image access
Make sure only existing images are accessed and that the accessed
coordinates are within the image.
The generated code is quite exponsive, because it encapsulates each
access to an image with two if statements, one to check whether the
image index actually exists (this will get optimized away if the
image selection is direct), and one if statement to check whether
the coordinates are in range. For that reason it will only be enabled
for Cayman were invalid access seems to raise more issues.
Signed-off-by: Gert Wollny <gert.wollny at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10608>
---
src/gallium/drivers/r600/Makefile.sources | 1 +
src/gallium/drivers/r600/meson.build | 1 +
src/gallium/drivers/r600/sfn/sfn_nir.h | 4 +
.../r600/sfn/sfn_nir_legalize_image_load_store.cpp | 183 +++++++++++++++++++++
4 files changed, 189 insertions(+)
diff --git a/src/gallium/drivers/r600/Makefile.sources b/src/gallium/drivers/r600/Makefile.sources
index 52563b25770..312497b4918 100644
--- a/src/gallium/drivers/r600/Makefile.sources
+++ b/src/gallium/drivers/r600/Makefile.sources
@@ -132,6 +132,7 @@ CXX_SOURCES = \
sfn/sfn_liverange.h \
sfn/sfn_nir.cpp \
sfn/sfn_nir.h \
+ sfn/sfn_nir_legalize_image_load_store.cpp \
sfn/sfn_nir_lower_64bit.cpp \
sfn/sfn_nir_lower_fs_out_to_vector.cpp \
sfn/sfn_nir_lower_fs_out_to_vector.h \
diff --git a/src/gallium/drivers/r600/meson.build b/src/gallium/drivers/r600/meson.build
index 424ac3ca01a..2dd39d26420 100644
--- a/src/gallium/drivers/r600/meson.build
+++ b/src/gallium/drivers/r600/meson.build
@@ -149,6 +149,7 @@ files_r600 = files(
'sfn/sfn_liverange.h',
'sfn/sfn_nir.cpp',
'sfn/sfn_nir.h',
+ 'sfn/sfn_nir_legalize_image_load_store.cpp',
'sfn/sfn_nir_lower_64bit.cpp',
'sfn/sfn_nir_lower_fs_out_to_vector.cpp',
'sfn/sfn_nir_lower_fs_out_to_vector.h',
diff --git a/src/gallium/drivers/r600/sfn/sfn_nir.h b/src/gallium/drivers/r600/sfn/sfn_nir.h
index 6bac550ac2c..695be1af162 100644
--- a/src/gallium/drivers/r600/sfn/sfn_nir.h
+++ b/src/gallium/drivers/r600/sfn/sfn_nir.h
@@ -136,6 +136,10 @@ bool r600_lower_tess_io(nir_shader *shader, enum pipe_prim_type prim_type);
bool r600_append_tcs_TF_emission(nir_shader *shader, enum pipe_prim_type prim_type);
bool r600_lower_tess_coord(nir_shader *sh, enum pipe_prim_type prim_type);
+bool
+r600_legalize_image_load_store(nir_shader *shader);
+
+
#else
#include "gallium/drivers/r600/r600_shader.h"
#endif
diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_legalize_image_load_store.cpp b/src/gallium/drivers/r600/sfn/sfn_nir_legalize_image_load_store.cpp
new file mode 100644
index 00000000000..4929cbc5ac2
--- /dev/null
+++ b/src/gallium/drivers/r600/sfn/sfn_nir_legalize_image_load_store.cpp
@@ -0,0 +1,183 @@
+/* -*- mesa-c++ -*-
+ *
+ * Copyright (c) 2021 Collabora LTD
+ *
+ * Author: Gert Wollny <gert.wollny at collabora.com>
+ *
+ * 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
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHOR(S) AND/OR THEIR SUPPLIERS 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.
+ */
+
+
+#include "sfn_nir.h"
+
+#include "nir.h"
+#include "nir_builder.h"
+
+
+static nir_ssa_def *
+r600_legalize_image_load_store_impl(nir_builder *b, nir_instr *instr, void *_options)
+{
+ b->cursor = nir_before_instr(instr);
+ auto ir = nir_instr_as_intrinsic(instr);
+
+ nir_ssa_def *default_value = nir_imm_vec4(b, 0.0, 0.0, 0.0, 0.0);
+
+ nir_ssa_def *result = NIR_LOWER_INSTR_PROGRESS_REPLACE;
+
+ bool load_value = ir->intrinsic != nir_intrinsic_image_store;
+
+ if (load_value)
+ default_value = nir_imm_zero(b, nir_dest_num_components(ir->dest),
+ nir_dest_bit_size(ir->dest));
+
+ auto image_exists = nir_ult(b, ir->src[0].ssa, nir_imm_int(b, b->shader->info.num_images));
+
+ nir_if *if_exists = nir_push_if(b, image_exists);
+
+ nir_if *load_if = nullptr;
+
+ if (ir->intrinsic != nir_intrinsic_image_size) {
+
+ /* Image exists start */
+ auto new_index = nir_umin(b, ir->src[0].ssa,
+ nir_imm_int(b, b->shader->info.num_images - 1));
+ nir_instr_rewrite_src_ssa(instr, &ir->src[0], new_index);
+
+ enum glsl_sampler_dim dim = nir_intrinsic_image_dim(ir);
+
+ unsigned num_components = 2;
+ switch (dim) {
+ case GLSL_SAMPLER_DIM_BUF:
+ case GLSL_SAMPLER_DIM_1D:
+ num_components = 1; break;
+ case GLSL_SAMPLER_DIM_2D:
+ case GLSL_SAMPLER_DIM_RECT:
+ case GLSL_SAMPLER_DIM_CUBE:
+ num_components = 2; break;
+ case GLSL_SAMPLER_DIM_3D:
+ num_components = 3; break;
+ default:
+ unreachable("Unexpected image size");
+ }
+
+ if (num_components < 3 && nir_intrinsic_image_array(ir))
+ num_components++;
+
+ auto img_size = nir_image_size(b, num_components, 32, ir->src[0].ssa, nir_imm_int(b, 0),
+ dim, nir_intrinsic_image_array(ir),
+ nir_intrinsic_format(ir),
+ nir_intrinsic_access(ir));
+
+ unsigned mask = (1 << num_components) - 1;
+ unsigned num_src1_comp = MIN2(ir->src[1].ssa->num_components, num_components);
+ unsigned src1_mask = (1 << num_src1_comp) - 1;
+
+ auto in_range = nir_ult(b,
+ nir_channels(b, ir->src[1].ssa, src1_mask),
+ nir_channels(b, img_size, mask));
+
+ switch (num_components) {
+ case 2: in_range = nir_iand(b, nir_channel(b, in_range, 0), nir_channel(b, in_range, 1)); break;
+ case 3: {
+ auto tmp = nir_iand(b, nir_channel(b, in_range, 0), nir_channel(b, in_range, 1));
+ in_range = nir_iand(b, tmp, nir_channel(b, in_range, 2));
+ break;
+ }
+ }
+
+ /* Access is in range start */
+ load_if = nir_push_if(b, in_range);
+ }
+
+ auto new_load = nir_instr_clone(b->shader, instr);
+ auto new_load_ir = nir_instr_as_intrinsic(new_load);
+
+ nir_builder_instr_insert(b, new_load);
+
+ if (load_value)
+ result = &new_load_ir->dest.ssa;
+
+ if (ir->intrinsic != nir_intrinsic_image_size) {
+ /* Access is out of range start */
+ nir_if *load_else = nir_push_else(b, load_if);
+
+ nir_pop_if(b, load_else);
+ /* End range check */
+
+ if (load_value)
+ result = nir_if_phi(b, result, default_value);
+ }
+
+ /* Start image doesn't exists */
+ nir_if *else_exists = nir_push_else(b, if_exists);
+
+ /* Nothing to do, default is already set */
+ nir_pop_if(b, else_exists);
+
+ if (load_value)
+ result = nir_if_phi(b, result, default_value);
+
+ if (load_value)
+ b->cursor = nir_after_instr(result->parent_instr);
+ else
+ b->cursor = nir_after_cf_node(&else_exists->cf_node);
+
+ return result;
+}
+
+static bool
+r600_legalize_image_load_store_filter(const nir_instr *instr, const void *_options)
+{
+ if (instr->type != nir_instr_type_intrinsic)
+ return false;
+
+ auto ir = nir_instr_as_intrinsic(instr);
+ switch (ir->intrinsic) {
+ case nir_intrinsic_image_store:
+ case nir_intrinsic_image_load:
+ case nir_intrinsic_image_atomic_add:
+ case nir_intrinsic_image_atomic_and:
+ case nir_intrinsic_image_atomic_or:
+ case nir_intrinsic_image_atomic_xor:
+ case nir_intrinsic_image_atomic_exchange:
+ case nir_intrinsic_image_atomic_comp_swap:
+ case nir_intrinsic_image_atomic_umin:
+ case nir_intrinsic_image_atomic_umax:
+ case nir_intrinsic_image_atomic_imin:
+ case nir_intrinsic_image_atomic_imax:
+ case nir_intrinsic_image_size:
+ return true;
+ default:
+ return false;
+ }
+}
+
+/* This pass makes sure only existing images are accessd and
+ * the access is withing range, if not zero is returned by all
+ * image ops that return a value.
+ */
+bool
+r600_legalize_image_load_store(nir_shader *shader)
+{
+ return nir_shader_lower_instructions(shader,
+ r600_legalize_image_load_store_filter,
+ r600_legalize_image_load_store_impl,
+ nullptr);
+};
More information about the mesa-commit
mailing list