From: Daniel Schürmann Date: Wed, 3 Apr 2019 15:29:20 +0000 (+0200) Subject: anv,nir: Move lower_input_attachments pass from ANV to NIR. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c31f470066b7534d6bff03674aed78bb3bf7408b;p=mesa.git anv,nir: Move lower_input_attachments pass from ANV to NIR. Reviewed-by: Connor Abbott Reviewed-by: Bas Nieuwenhuizen --- diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources index 213c04840e7..552a7d64fea 100644 --- a/src/compiler/Makefile.sources +++ b/src/compiler/Makefile.sources @@ -256,6 +256,7 @@ NIR_FILES = \ nir/nir_lower_locals_to_regs.c \ nir/nir_lower_idiv.c \ nir/nir_lower_indirect_derefs.c \ + nir/nir_lower_input_attachments.c \ nir/nir_lower_int64.c \ nir/nir_lower_interpolation.c \ nir/nir_lower_int_to_float.c \ diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build index 75dbd2809d0..01ddcdf0ea0 100644 --- a/src/compiler/nir/meson.build +++ b/src/compiler/nir/meson.build @@ -134,6 +134,7 @@ files_libnir = files( 'nir_lower_locals_to_regs.c', 'nir_lower_idiv.c', 'nir_lower_indirect_derefs.c', + 'nir_lower_input_attachments.c', 'nir_lower_int64.c', 'nir_lower_interpolation.c', 'nir_lower_int_to_float.c', diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index 700174ca02a..ffb6908073b 100644 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -3494,6 +3494,8 @@ bool nir_lower_non_uniform_access(nir_shader *shader, bool nir_lower_idiv(nir_shader *shader); +bool nir_lower_input_attachments(nir_shader *shader); + bool nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables, bool use_vars); bool nir_lower_clip_fs(nir_shader *shader, unsigned ucp_enables); bool nir_lower_clip_cull_distance_arrays(nir_shader *nir); diff --git a/src/compiler/nir/nir_lower_input_attachments.c b/src/compiler/nir/nir_lower_input_attachments.c new file mode 100644 index 00000000000..25473eab558 --- /dev/null +++ b/src/compiler/nir/nir_lower_input_attachments.c @@ -0,0 +1,150 @@ +/* + * Copyright © 2016 Intel Corporation + * + * 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. + */ + +#include "nir.h" +#include "nir_builder.h" + +static nir_ssa_def * +load_frag_coord(nir_builder *b) +{ + nir_foreach_variable(var, &b->shader->inputs) { + if (var->data.location == VARYING_SLOT_POS) + return nir_load_var(b, var); + } + + nir_variable *pos = nir_variable_create(b->shader, nir_var_shader_in, + glsl_vec4_type(), NULL); + pos->data.location = VARYING_SLOT_POS; + /** + * From Vulkan spec: + * "The OriginLowerLeft execution mode must not be used; fragment entry + * points must declare OriginUpperLeft." + * + * So at this point origin_upper_left should be true + */ + assert(b->shader->info.fs.origin_upper_left == true); + + return nir_load_var(b, pos); +} + +static bool +try_lower_input_load(nir_function_impl *impl, nir_intrinsic_instr *load) +{ + nir_deref_instr *deref = nir_src_as_deref(load->src[0]); + assert(glsl_type_is_image(deref->type)); + + enum glsl_sampler_dim image_dim = glsl_get_sampler_dim(deref->type); + if (image_dim != GLSL_SAMPLER_DIM_SUBPASS && + image_dim != GLSL_SAMPLER_DIM_SUBPASS_MS) + return false; + + const bool multisampled = (image_dim == GLSL_SAMPLER_DIM_SUBPASS_MS); + + nir_builder b; + nir_builder_init(&b, impl); + b.cursor = nir_instr_remove(&load->instr); + + nir_ssa_def *frag_coord = nir_f2i32(&b, load_frag_coord(&b)); + nir_ssa_def *offset = nir_ssa_for_src(&b, load->src[1], 2); + nir_ssa_def *pos = nir_iadd(&b, frag_coord, offset); + + nir_ssa_def *layer = nir_load_layer_id(&b); + nir_ssa_def *coord = + nir_vec3(&b, nir_channel(&b, pos, 0), nir_channel(&b, pos, 1), layer); + + nir_tex_instr *tex = nir_tex_instr_create(b.shader, 3 + multisampled); + + tex->op = nir_texop_txf; + tex->sampler_dim = image_dim; + + switch (glsl_get_sampler_result_type(deref->type)) { + case GLSL_TYPE_FLOAT: + tex->dest_type = nir_type_float; + break; + case GLSL_TYPE_INT: + tex->dest_type = nir_type_int; + break; + case GLSL_TYPE_UINT: + tex->dest_type = nir_type_uint; + break; + default: + unreachable("Invalid image type"); + } + tex->is_array = true; + tex->is_shadow = false; + + tex->texture_index = 0; + tex->sampler_index = 0; + + tex->src[0].src_type = nir_tex_src_texture_deref; + tex->src[0].src = nir_src_for_ssa(&deref->dest.ssa); + + tex->src[1].src_type = nir_tex_src_coord; + tex->src[1].src = nir_src_for_ssa(coord); + tex->coord_components = 3; + + tex->src[2].src_type = nir_tex_src_lod; + tex->src[2].src = nir_src_for_ssa(nir_imm_int(&b, 0)); + + if (image_dim == GLSL_SAMPLER_DIM_SUBPASS_MS) { + tex->op = nir_texop_txf_ms; + tex->src[3].src_type = nir_tex_src_ms_index; + tex->src[3].src = load->src[2]; + } + + nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32, NULL); + nir_builder_instr_insert(&b, &tex->instr); + + nir_ssa_def_rewrite_uses(&load->dest.ssa, + nir_src_for_ssa(&tex->dest.ssa)); + + return true; +} + +bool +nir_lower_input_attachments(nir_shader *shader) +{ + assert(shader->info.stage == MESA_SHADER_FRAGMENT); + bool progress = false; + + nir_foreach_function(function, shader) { + if (!function->impl) + continue; + + nir_foreach_block(block, function->impl) { + nir_foreach_instr_safe(instr, block) { + if (instr->type != nir_instr_type_intrinsic) + continue; + + nir_intrinsic_instr *load = nir_instr_as_intrinsic(instr); + + if (load->intrinsic != nir_intrinsic_image_deref_load) + continue; + + progress |= try_lower_input_load(function->impl, load); + } + } + } + + return progress; +} diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources index 7a44b72f449..86d900a0bac 100644 --- a/src/intel/Makefile.sources +++ b/src/intel/Makefile.sources @@ -245,7 +245,6 @@ VULKAN_FILES := \ vulkan/anv_nir.h \ vulkan/anv_nir_add_base_work_group_id.c \ vulkan/anv_nir_apply_pipeline_layout.c \ - vulkan/anv_nir_lower_input_attachments.c \ vulkan/anv_nir_lower_multiview.c \ vulkan/anv_nir_lower_push_constants.c \ vulkan/anv_nir_lower_ycbcr_textures.c \ diff --git a/src/intel/vulkan/anv_nir.h b/src/intel/vulkan/anv_nir.h index c132264b299..844e5b0bfd4 100644 --- a/src/intel/vulkan/anv_nir.h +++ b/src/intel/vulkan/anv_nir.h @@ -31,8 +31,6 @@ extern "C" { #endif -void anv_nir_lower_input_attachments(nir_shader *shader); - void anv_nir_lower_push_constants(nir_shader *shader); bool anv_nir_lower_multiview(nir_shader *shader, uint32_t view_mask); diff --git a/src/intel/vulkan/anv_nir_lower_input_attachments.c b/src/intel/vulkan/anv_nir_lower_input_attachments.c deleted file mode 100644 index 9c6f9f434d7..00000000000 --- a/src/intel/vulkan/anv_nir_lower_input_attachments.c +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Copyright © 2016 Intel Corporation - * - * 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. - */ - -#include "anv_nir.h" -#include "nir/nir_builder.h" - -static nir_ssa_def * -load_frag_coord(nir_builder *b) -{ - nir_foreach_variable(var, &b->shader->inputs) { - if (var->data.location == VARYING_SLOT_POS) - return nir_load_var(b, var); - } - - nir_variable *pos = nir_variable_create(b->shader, nir_var_shader_in, - glsl_vec4_type(), NULL); - pos->data.location = VARYING_SLOT_POS; - /** - * From Vulkan spec: - * "The OriginLowerLeft execution mode must not be used; fragment entry - * points must declare OriginUpperLeft." - * - * So at this point origin_upper_left should be true - */ - assert(b->shader->info.fs.origin_upper_left == true); - - return nir_load_var(b, pos); -} - -static void -try_lower_input_load(nir_function_impl *impl, nir_intrinsic_instr *load) -{ - nir_deref_instr *deref = nir_src_as_deref(load->src[0]); - assert(glsl_type_is_image(deref->type)); - - enum glsl_sampler_dim image_dim = glsl_get_sampler_dim(deref->type); - if (image_dim != GLSL_SAMPLER_DIM_SUBPASS && - image_dim != GLSL_SAMPLER_DIM_SUBPASS_MS) - return; - - const bool multisampled = (image_dim == GLSL_SAMPLER_DIM_SUBPASS_MS); - - nir_builder b; - nir_builder_init(&b, impl); - b.cursor = nir_instr_remove(&load->instr); - - nir_ssa_def *frag_coord = nir_f2i32(&b, load_frag_coord(&b)); - nir_ssa_def *offset = nir_ssa_for_src(&b, load->src[1], 2); - nir_ssa_def *pos = nir_iadd(&b, frag_coord, offset); - - nir_ssa_def *layer = nir_load_layer_id(&b); - nir_ssa_def *coord = - nir_vec3(&b, nir_channel(&b, pos, 0), nir_channel(&b, pos, 1), layer); - - nir_tex_instr *tex = nir_tex_instr_create(b.shader, 3 + multisampled); - - tex->op = nir_texop_txf; - - switch (glsl_get_sampler_result_type(deref->type)) { - case GLSL_TYPE_FLOAT: - tex->dest_type = nir_type_float; - break; - case GLSL_TYPE_INT: - tex->dest_type = nir_type_int; - break; - case GLSL_TYPE_UINT: - tex->dest_type = nir_type_uint; - break; - default: - unreachable("Invalid image type"); - } - tex->is_array = true; - tex->is_shadow = false; - - tex->texture_index = 0; - tex->sampler_index = 0; - - tex->src[0].src_type = nir_tex_src_texture_deref; - tex->src[0].src = nir_src_for_ssa(&deref->dest.ssa); - - tex->src[1].src_type = nir_tex_src_coord; - tex->src[1].src = nir_src_for_ssa(coord); - tex->coord_components = 3; - - tex->src[2].src_type = nir_tex_src_lod; - tex->src[2].src = nir_src_for_ssa(nir_imm_int(&b, 0)); - - if (image_dim == GLSL_SAMPLER_DIM_SUBPASS_MS) { - tex->op = nir_texop_txf_ms; - tex->src[3].src_type = nir_tex_src_ms_index; - tex->src[3].src = load->src[2]; - } - - nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32, NULL); - nir_builder_instr_insert(&b, &tex->instr); - - nir_ssa_def_rewrite_uses(&load->dest.ssa, - nir_src_for_ssa(&tex->dest.ssa)); -} - -void -anv_nir_lower_input_attachments(nir_shader *shader) -{ - assert(shader->info.stage == MESA_SHADER_FRAGMENT); - - nir_foreach_function(function, shader) { - if (!function->impl) - continue; - - nir_foreach_block(block, function->impl) { - nir_foreach_instr_safe(instr, block) { - if (instr->type != nir_instr_type_intrinsic) - continue; - - nir_intrinsic_instr *load = nir_instr_as_intrinsic(instr); - - if (load->intrinsic != nir_intrinsic_image_deref_load) - continue; - - try_lower_input_load(function->impl, load); - } - } - } -} diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index ea01b2f04f9..8fa02aedfa1 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -607,7 +607,7 @@ anv_pipeline_lower_nir(struct anv_pipeline *pipeline, if (nir->info.stage == MESA_SHADER_FRAGMENT) { NIR_PASS_V(nir, nir_lower_wpos_center, pipeline->sample_shading_enable); - NIR_PASS_V(nir, anv_nir_lower_input_attachments); + NIR_PASS_V(nir, nir_lower_input_attachments); } NIR_PASS_V(nir, anv_nir_lower_ycbcr_textures, layout); diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index 7fe660983d9..6aa35f3ab3a 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -126,7 +126,6 @@ libanv_files = files( 'anv_nir.h', 'anv_nir_add_base_work_group_id.c', 'anv_nir_apply_pipeline_layout.c', - 'anv_nir_lower_input_attachments.c', 'anv_nir_lower_multiview.c', 'anv_nir_lower_push_constants.c', 'anv_nir_lower_ycbcr_textures.c',