fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 18:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

anv: Use nir_shader_instructions_pass in apply_pipeline_layout

Browse source 
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8635>
This commit is contained in:
Jason Ekstrand 2021-03-12 13:00:47 -06:00 • committed by Marge Bot
parent bfe92b83db
commit 0aa3d68206
1 changed files with 226 additions and 256 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

222
src/intel/vulkan/anv_nir_apply_pipeline_layout.c
View file

@ -37,9 +37,6 @@
struct apply_pipeline_layout_state { struct apply_pipeline_layout_state {
const struct anv_physical_device *pdevice; const struct anv_physical_device *pdevice;
nir_shader *shader;
nir_builder builder;
const struct anv_pipeline_layout *layout; const struct anv_pipeline_layout *layout;
bool add_bounds_checks; bool add_bounds_checks;
nir_address_format ssbo_addr_format; nir_address_format ssbo_addr_format;
@ -97,11 +94,11 @@ add_tex_src_binding(struct apply_pipeline_layout_state *state,
add_deref_src_binding(state, tex->src[deref_src_idx].src); add_deref_src_binding(state, tex->src[deref_src_idx].src);
} }
static void static bool
get_used_bindings_block(nir_block *block, get_used_bindings(UNUSED nir_builder *_b, nir_instr *instr, void *_state)
struct apply_pipeline_layout_state *state)
{ {
nir_foreach_instr_safe(instr, block) { struct apply_pipeline_layout_state *state = _state;
switch (instr->type) { switch (instr->type) {
case nir_instr_type_intrinsic: { case nir_instr_type_intrinsic: {
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr); nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
@ -147,9 +144,10 @@ get_used_bindings_block(nir_block *block,
break; break;
} }
default: default:
continue; break;
}
} }
return false;
} }
static bool static bool
@ -196,14 +194,12 @@ nir_deref_find_descriptor(nir_deref_instr *deref,
} }
static nir_ssa_def * static nir_ssa_def *
build_index_for_res_reindex(nir_intrinsic_instr *intrin, build_index_for_res_reindex(nir_builder *b, nir_intrinsic_instr *intrin,
struct apply_pipeline_layout_state *state) struct apply_pipeline_layout_state *state)
{ {
nir_builder *b = &state->builder;
if (intrin->intrinsic == nir_intrinsic_vulkan_resource_reindex) { if (intrin->intrinsic == nir_intrinsic_vulkan_resource_reindex) {
nir_ssa_def *bti = nir_intrinsic_instr *parent = nir_src_as_intrinsic(intrin->src[0]);
build_index_for_res_reindex(nir_src_as_intrinsic(intrin->src[0]), state); nir_ssa_def *bti = build_index_for_res_reindex(b, parent, state);
b->cursor = nir_before_instr(&intrin->instr); b->cursor = nir_before_instr(&intrin->instr);
return nir_iadd(b, bti, nir_ssa_for_src(b, intrin->src[1], 1)); return nir_iadd(b, bti, nir_ssa_for_src(b, intrin->src[1], 1));
@ -230,14 +226,12 @@ build_index_for_res_reindex(nir_intrinsic_instr *intrin,
} }
static nir_ssa_def * static nir_ssa_def *
build_index_offset_for_deref(nir_deref_instr *deref, build_index_offset_for_deref(nir_builder *b, nir_deref_instr *deref,
struct apply_pipeline_layout_state *state) struct apply_pipeline_layout_state *state)
{ {
nir_builder *b = &state->builder;
nir_deref_instr *parent = nir_deref_instr_parent(deref); nir_deref_instr *parent = nir_deref_instr_parent(deref);
if (parent) { if (parent) {
nir_ssa_def *addr = build_index_offset_for_deref(parent, state); nir_ssa_def *addr = build_index_offset_for_deref(b, parent, state);
b->cursor = nir_before_instr(&deref->instr); b->cursor = nir_before_instr(&deref->instr);
return nir_explicit_io_address_from_deref(b, deref, addr, return nir_explicit_io_address_from_deref(b, deref, addr,
@ -248,7 +242,7 @@ build_index_offset_for_deref(nir_deref_instr *deref,
assert(load_desc->intrinsic == nir_intrinsic_load_vulkan_descriptor); assert(load_desc->intrinsic == nir_intrinsic_load_vulkan_descriptor);
nir_ssa_def *index = nir_ssa_def *index =
build_index_for_res_reindex(nir_src_as_intrinsic(load_desc->src[0]), state); build_index_for_res_reindex(b, nir_src_as_intrinsic(load_desc->src[0]), state);
/* Return a 0 offset which will get picked up by the recursion */ /* Return a 0 offset which will get picked up by the recursion */
b->cursor = nir_before_instr(&deref->instr); b->cursor = nir_before_instr(&deref->instr);
@ -256,11 +250,10 @@ build_index_offset_for_deref(nir_deref_instr *deref,
} }
static bool static bool
try_lower_direct_buffer_intrinsic(nir_intrinsic_instr *intrin, bool is_atomic, try_lower_direct_buffer_intrinsic(nir_builder *b,
nir_intrinsic_instr *intrin, bool is_atomic,
struct apply_pipeline_layout_state *state) struct apply_pipeline_layout_state *state)
{ {
nir_builder *b = &state->builder;
nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]); nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]);
if (!nir_deref_mode_is(deref, nir_var_mem_ssbo)) if (!nir_deref_mode_is(deref, nir_var_mem_ssbo))
return false; return false;
@ -280,7 +273,7 @@ try_lower_direct_buffer_intrinsic(nir_intrinsic_instr *intrin, bool is_atomic,
if (!nir_deref_find_descriptor(deref, state)) if (!nir_deref_find_descriptor(deref, state))
return false; return false;
nir_ssa_def *addr = build_index_offset_for_deref(deref, state); nir_ssa_def *addr = build_index_offset_for_deref(b, deref, state);
b->cursor = nir_before_instr(&intrin->instr); b->cursor = nir_before_instr(&intrin->instr);
nir_lower_explicit_io_instr(b, intrin, addr, nir_lower_explicit_io_instr(b, intrin, addr,
@ -288,21 +281,20 @@ try_lower_direct_buffer_intrinsic(nir_intrinsic_instr *intrin, bool is_atomic,
return true; return true;
} }
static void static bool
lower_direct_buffer_access(nir_function_impl *impl, lower_direct_buffer_instr(nir_builder *b, nir_instr *instr, void *_state)
struct apply_pipeline_layout_state *state)
{ {
nir_foreach_block(block, impl) { struct apply_pipeline_layout_state *state = _state;
nir_foreach_instr_safe(instr, block) {
if (instr->type != nir_instr_type_intrinsic) if (instr->type != nir_instr_type_intrinsic)
continue; return false;
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr); nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
switch (intrin->intrinsic) { switch (intrin->intrinsic) {
case nir_intrinsic_load_deref: case nir_intrinsic_load_deref:
case nir_intrinsic_store_deref: case nir_intrinsic_store_deref:
try_lower_direct_buffer_intrinsic(intrin, false, state); return try_lower_direct_buffer_intrinsic(b, intrin, false, state);
break;
case nir_intrinsic_deref_atomic_add: case nir_intrinsic_deref_atomic_add:
case nir_intrinsic_deref_atomic_imin: case nir_intrinsic_deref_atomic_imin:
case nir_intrinsic_deref_atomic_umin: case nir_intrinsic_deref_atomic_umin:
@ -316,28 +308,26 @@ lower_direct_buffer_access(nir_function_impl *impl,
case nir_intrinsic_deref_atomic_fmin: case nir_intrinsic_deref_atomic_fmin:
case nir_intrinsic_deref_atomic_fmax: case nir_intrinsic_deref_atomic_fmax:
case nir_intrinsic_deref_atomic_fcomp_swap: case nir_intrinsic_deref_atomic_fcomp_swap:
try_lower_direct_buffer_intrinsic(intrin, true, state); return try_lower_direct_buffer_intrinsic(b, intrin, true, state);
break;
case nir_intrinsic_get_ssbo_size: { case nir_intrinsic_get_ssbo_size: {
/* The get_ssbo_size intrinsic always just takes a /* The get_ssbo_size intrinsic always just takes a
* index/reindex intrinsic. * index/reindex intrinsic.
*/ */
if (!find_descriptor_for_index_src(intrin->src[0], state)) if (!find_descriptor_for_index_src(intrin->src[0], state))
break; return false;
nir_ssa_def *index = nir_ssa_def *index =
build_index_for_res_reindex(nir_src_as_intrinsic(intrin->src[0]), build_index_for_res_reindex(b, nir_src_as_intrinsic(intrin->src[0]),
state); state);
nir_instr_rewrite_src(&intrin->instr, &intrin->src[0], nir_instr_rewrite_src(&intrin->instr, &intrin->src[0],
nir_src_for_ssa(index)); nir_src_for_ssa(index));
_mesa_set_add(state->lowered_instrs, intrin); _mesa_set_add(state->lowered_instrs, intrin);
return true;
} }
default: default:
break; return false;
}
}
} }
} }
@ -350,12 +340,10 @@ desc_addr_format(VkDescriptorType desc_type,
state->ssbo_addr_format : nir_address_format_32bit_index_offset; state->ssbo_addr_format : nir_address_format_32bit_index_offset;
} }
static void static bool
lower_res_index_intrinsic(nir_intrinsic_instr *intrin, lower_res_index_intrinsic(nir_builder *b, nir_intrinsic_instr *intrin,
struct apply_pipeline_layout_state *state) struct apply_pipeline_layout_state *state)
{ {
nir_builder *b = &state->builder;
b->cursor = nir_before_instr(&intrin->instr); b->cursor = nir_before_instr(&intrin->instr);
uint32_t set = nir_intrinsic_desc_set(intrin); uint32_t set = nir_intrinsic_desc_set(intrin);
@ -433,14 +421,14 @@ lower_res_index_intrinsic(nir_intrinsic_instr *intrin,
assert(intrin->dest.is_ssa); assert(intrin->dest.is_ssa);
nir_ssa_def_rewrite_uses(&intrin->dest.ssa, index); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, index);
nir_instr_remove(&intrin->instr); nir_instr_remove(&intrin->instr);
return true;
} }
static void static bool
lower_res_reindex_intrinsic(nir_intrinsic_instr *intrin, lower_res_reindex_intrinsic(nir_builder *b, nir_intrinsic_instr *intrin,
struct apply_pipeline_layout_state *state) struct apply_pipeline_layout_state *state)
{ {
nir_builder *b = &state->builder;
b->cursor = nir_before_instr(&intrin->instr); b->cursor = nir_before_instr(&intrin->instr);
const VkDescriptorType desc_type = nir_intrinsic_desc_type(intrin); const VkDescriptorType desc_type = nir_intrinsic_desc_type(intrin);
@ -490,15 +478,15 @@ lower_res_reindex_intrinsic(nir_intrinsic_instr *intrin,
assert(intrin->dest.is_ssa); assert(intrin->dest.is_ssa);
nir_ssa_def_rewrite_uses(&intrin->dest.ssa, new_index); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, new_index);
nir_instr_remove(&intrin->instr); nir_instr_remove(&intrin->instr);
return true;
} }
static nir_ssa_def * static nir_ssa_def *
build_ssbo_descriptor_load(const VkDescriptorType desc_type, build_ssbo_descriptor_load(nir_builder *b, const VkDescriptorType desc_type,
nir_ssa_def *index, nir_ssa_def *index,
struct apply_pipeline_layout_state *state) struct apply_pipeline_layout_state *state)
{ {
nir_builder *b = &state->builder;
nir_ssa_def *desc_offset, *array_index; nir_ssa_def *desc_offset, *array_index;
switch (state->ssbo_addr_format) { switch (state->ssbo_addr_format) {
case nir_address_format_64bit_bounded_global: case nir_address_format_64bit_bounded_global:
@ -540,12 +528,10 @@ build_ssbo_descriptor_load(const VkDescriptorType desc_type,
return desc_load; return desc_load;
} }
static void static bool
lower_load_vulkan_descriptor(nir_intrinsic_instr *intrin, lower_load_vulkan_descriptor(nir_builder *b, nir_intrinsic_instr *intrin,
struct apply_pipeline_layout_state *state) struct apply_pipeline_layout_state *state)
{ {
nir_builder *b = &state->builder;
b->cursor = nir_before_instr(&intrin->instr); b->cursor = nir_before_instr(&intrin->instr);
const VkDescriptorType desc_type = nir_intrinsic_desc_type(intrin); const VkDescriptorType desc_type = nir_intrinsic_desc_type(intrin);
@ -582,7 +568,7 @@ lower_load_vulkan_descriptor(nir_intrinsic_instr *intrin,
if (state->pdevice->has_a64_buffer_access && if (state->pdevice->has_a64_buffer_access &&
(desc_type == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER || (desc_type == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER ||
desc_type == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC)) { desc_type == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC)) {
desc = build_ssbo_descriptor_load(desc_type, index, state); desc = build_ssbo_descriptor_load(b, desc_type, index, state);
/* We want nir_address_format_64bit_global */ /* We want nir_address_format_64bit_global */
if (!state->add_bounds_checks) if (!state->add_bounds_checks)
@ -661,16 +647,16 @@ lower_load_vulkan_descriptor(nir_intrinsic_instr *intrin,
assert(intrin->dest.is_ssa); assert(intrin->dest.is_ssa);
nir_ssa_def_rewrite_uses(&intrin->dest.ssa, desc); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, desc);
nir_instr_remove(&intrin->instr); nir_instr_remove(&intrin->instr);
return true;
} }
static void static bool
lower_get_ssbo_size(nir_intrinsic_instr *intrin, lower_get_ssbo_size(nir_builder *b, nir_intrinsic_instr *intrin,
struct apply_pipeline_layout_state *state) struct apply_pipeline_layout_state *state)
{ {
if (_mesa_set_search(state->lowered_instrs, intrin)) if (_mesa_set_search(state->lowered_instrs, intrin))
return; return false;
nir_builder *b = &state->builder;
b->cursor = nir_before_instr(&intrin->instr); b->cursor = nir_before_instr(&intrin->instr);
@ -680,7 +666,7 @@ lower_get_ssbo_size(nir_intrinsic_instr *intrin,
nir_ssa_def *index = intrin->src[0].ssa; nir_ssa_def *index = intrin->src[0].ssa;
if (state->pdevice->has_a64_buffer_access) { if (state->pdevice->has_a64_buffer_access) {
nir_ssa_def *desc = build_ssbo_descriptor_load(desc_type, index, state); nir_ssa_def *desc = build_ssbo_descriptor_load(b, desc_type, index, state);
nir_ssa_def *size = nir_channel(b, desc, 2); nir_ssa_def *size = nir_channel(b, desc, 2);
nir_ssa_def_rewrite_uses(&intrin->dest.ssa, size); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, size);
nir_instr_remove(&intrin->instr); nir_instr_remove(&intrin->instr);
@ -692,10 +678,12 @@ lower_get_ssbo_size(nir_intrinsic_instr *intrin,
nir_instr_rewrite_src(&intrin->instr, &intrin->src[0], nir_instr_rewrite_src(&intrin->instr, &intrin->src[0],
nir_src_for_ssa(nir_channel(b, index, 0))); nir_src_for_ssa(nir_channel(b, index, 0)));
} }
return true;
} }
static nir_ssa_def * static nir_ssa_def *
build_descriptor_load(nir_deref_instr *deref, unsigned offset, build_descriptor_load(nir_builder *b, nir_deref_instr *deref, unsigned offset,
unsigned num_components, unsigned bit_size, unsigned num_components, unsigned bit_size,
struct apply_pipeline_layout_state *state) struct apply_pipeline_layout_state *state)
{ {
@ -709,8 +697,6 @@ build_descriptor_load(nir_deref_instr *deref, unsigned offset,
const struct anv_descriptor_set_binding_layout *bind_layout = const struct anv_descriptor_set_binding_layout *bind_layout =
&state->layout->set[set].layout->binding[binding]; &state->layout->set[set].layout->binding[binding];
nir_builder *b = &state->builder;
nir_ssa_def *desc_buffer_index = nir_ssa_def *desc_buffer_index =
nir_imm_int(b, state->set[set].desc_offset); nir_imm_int(b, state->set[set].desc_offset);
@ -738,8 +724,8 @@ build_descriptor_load(nir_deref_instr *deref, unsigned offset,
return desc_load; return desc_load;
} }
static void static bool
lower_image_intrinsic(nir_intrinsic_instr *intrin, lower_image_intrinsic(nir_builder *b, nir_intrinsic_instr *intrin,
struct apply_pipeline_layout_state *state) struct apply_pipeline_layout_state *state)
{ {
nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]); nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]);
@ -749,7 +735,6 @@ lower_image_intrinsic(nir_intrinsic_instr *intrin,
unsigned binding = var->data.binding; unsigned binding = var->data.binding;
unsigned binding_offset = state->set[set].surface_offsets[binding]; unsigned binding_offset = state->set[set].surface_offsets[binding];
nir_builder *b = &state->builder;
b->cursor = nir_before_instr(&intrin->instr); b->cursor = nir_before_instr(&intrin->instr);
ASSERTED const bool use_bindless = state->pdevice->has_bindless_images; ASSERTED const bool use_bindless = state->pdevice->has_bindless_images;
@ -761,7 +746,7 @@ lower_image_intrinsic(nir_intrinsic_instr *intrin,
const unsigned param = nir_intrinsic_base(intrin); const unsigned param = nir_intrinsic_base(intrin);
nir_ssa_def *desc = nir_ssa_def *desc =
build_descriptor_load(deref, param * 16, build_descriptor_load(b, deref, param * 16,
intrin->dest.ssa.num_components, intrin->dest.ssa.num_components,
intrin->dest.ssa.bit_size, state); intrin->dest.ssa.bit_size, state);
@ -770,7 +755,7 @@ lower_image_intrinsic(nir_intrinsic_instr *intrin,
const bool write_only = const bool write_only =
(var->data.access & ACCESS_NON_READABLE) != 0; (var->data.access & ACCESS_NON_READABLE) != 0;
nir_ssa_def *desc = nir_ssa_def *desc =
build_descriptor_load(deref, 0, 2, 32, state); build_descriptor_load(b, deref, 0, 2, 32, state);
nir_ssa_def *handle = nir_channel(b, desc, write_only ? 1 : 0); nir_ssa_def *handle = nir_channel(b, desc, write_only ? 1 : 0);
nir_rewrite_image_intrinsic(intrin, handle, true); nir_rewrite_image_intrinsic(intrin, handle, true);
} else { } else {
@ -790,14 +775,14 @@ lower_image_intrinsic(nir_intrinsic_instr *intrin,
index = nir_iadd_imm(b, index, binding_offset); index = nir_iadd_imm(b, index, binding_offset);
nir_rewrite_image_intrinsic(intrin, index, false); nir_rewrite_image_intrinsic(intrin, index, false);
} }
return true;
} }
static void static bool
lower_load_constant(nir_intrinsic_instr *intrin, lower_load_constant(nir_builder *b, nir_intrinsic_instr *intrin,
struct apply_pipeline_layout_state *state) struct apply_pipeline_layout_state *state)
{ {
nir_builder *b = &state->builder;
b->cursor = nir_instr_remove(&intrin->instr); b->cursor = nir_instr_remove(&intrin->instr);
/* Any constant-offset load_constant instructions should have been removed /* Any constant-offset load_constant instructions should have been removed
@ -838,10 +823,13 @@ lower_load_constant(nir_intrinsic_instr *intrin,
} }
nir_ssa_def_rewrite_uses(&intrin->dest.ssa, data); nir_ssa_def_rewrite_uses(&intrin->dest.ssa, data);
return true;
} }
static void static void
lower_tex_deref(nir_tex_instr *tex, nir_tex_src_type deref_src_type, lower_tex_deref(nir_builder *b, nir_tex_instr *tex,
nir_tex_src_type deref_src_type,
unsigned *base_index, unsigned plane, unsigned *base_index, unsigned plane,
struct apply_pipeline_layout_state *state) struct apply_pipeline_layout_state *state)
{ {
@ -865,8 +853,6 @@ lower_tex_deref(nir_tex_instr *tex, nir_tex_src_type deref_src_type,
binding_offset = state->set[set].sampler_offsets[binding]; binding_offset = state->set[set].sampler_offsets[binding];
} }
nir_builder *b = &state->builder;
nir_tex_src_type offset_src_type; nir_tex_src_type offset_src_type;
nir_ssa_def *index = NULL; nir_ssa_def *index = NULL;
if (binding_offset > MAX_BINDING_TABLE_SIZE) { if (binding_offset > MAX_BINDING_TABLE_SIZE) {
@ -874,7 +860,7 @@ lower_tex_deref(nir_tex_instr *tex, nir_tex_src_type deref_src_type,
plane * sizeof(struct anv_sampled_image_descriptor); plane * sizeof(struct anv_sampled_image_descriptor);
nir_ssa_def *desc = nir_ssa_def *desc =
build_descriptor_load(deref, plane_offset, 2, 32, state); build_descriptor_load(b, deref, plane_offset, 2, 32, state);
if (deref_src_type == nir_tex_src_texture_deref) { if (deref_src_type == nir_tex_src_texture_deref) {
offset_src_type = nir_tex_src_texture_handle; offset_src_type = nir_tex_src_texture_handle;
@ -969,7 +955,7 @@ build_def_array_select(nir_builder *b, nir_ssa_def **srcs, nir_ssa_def *idx,
} }
static void static void
lower_gen7_tex_swizzle(nir_tex_instr *tex, unsigned plane, lower_gen7_tex_swizzle(nir_builder *b, nir_tex_instr *tex, unsigned plane,
struct apply_pipeline_layout_state *state) struct apply_pipeline_layout_state *state)
{ {
assert(state->pdevice->info.gen == 7 && !state->pdevice->info.is_haswell); assert(state->pdevice->info.gen == 7 && !state->pdevice->info.is_haswell);
@ -993,13 +979,12 @@ lower_gen7_tex_swizzle(nir_tex_instr *tex, unsigned plane,
if ((bind_layout->data & ANV_DESCRIPTOR_TEXTURE_SWIZZLE) == 0) if ((bind_layout->data & ANV_DESCRIPTOR_TEXTURE_SWIZZLE) == 0)
return; return;
nir_builder *b = &state->builder;
b->cursor = nir_before_instr(&tex->instr); b->cursor = nir_before_instr(&tex->instr);
const unsigned plane_offset = const unsigned plane_offset =
plane * sizeof(struct anv_texture_swizzle_descriptor); plane * sizeof(struct anv_texture_swizzle_descriptor);
nir_ssa_def *swiz = nir_ssa_def *swiz =
build_descriptor_load(deref, plane_offset, 1, 32, state); build_descriptor_load(b, deref, plane_offset, 1, 32, state);
b->cursor = nir_after_instr(&tex->instr); b->cursor = nir_after_instr(&tex->instr);
@ -1035,8 +1020,9 @@ lower_gen7_tex_swizzle(nir_tex_instr *tex, unsigned plane,
swiz_tex_res->parent_instr); swiz_tex_res->parent_instr);
} }
static void static bool
lower_tex(nir_tex_instr *tex, struct apply_pipeline_layout_state *state) lower_tex(nir_builder *b, nir_tex_instr *tex,
struct apply_pipeline_layout_state *state)
{ {
unsigned plane = tex_instr_get_and_remove_plane_src(tex); unsigned plane = tex_instr_get_and_remove_plane_src(tex);
@ -1044,38 +1030,36 @@ lower_tex(nir_tex_instr *tex, struct apply_pipeline_layout_state *state)
* before we lower the derefs away so we can still find the descriptor. * before we lower the derefs away so we can still find the descriptor.
*/ */
if (state->pdevice->info.gen == 7 && !state->pdevice->info.is_haswell) if (state->pdevice->info.gen == 7 && !state->pdevice->info.is_haswell)
lower_gen7_tex_swizzle(tex, plane, state); lower_gen7_tex_swizzle(b, tex, plane, state);
state->builder.cursor = nir_before_instr(&tex->instr); b->cursor = nir_before_instr(&tex->instr);
lower_tex_deref(tex, nir_tex_src_texture_deref, lower_tex_deref(b, tex, nir_tex_src_texture_deref,
&tex->texture_index, plane, state); &tex->texture_index, plane, state);
lower_tex_deref(tex, nir_tex_src_sampler_deref, lower_tex_deref(b, tex, nir_tex_src_sampler_deref,
&tex->sampler_index, plane, state); &tex->sampler_index, plane, state);
return true;
} }
static void static bool
apply_pipeline_layout_block(nir_block *block, apply_pipeline_layout(nir_builder *b, nir_instr *instr, void *_state)
struct apply_pipeline_layout_state *state)
{ {
nir_foreach_instr_safe(instr, block) { struct apply_pipeline_layout_state *state = _state;
switch (instr->type) { switch (instr->type) {
case nir_instr_type_intrinsic: { case nir_instr_type_intrinsic: {
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr); nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
switch (intrin->intrinsic) { switch (intrin->intrinsic) {
case nir_intrinsic_vulkan_resource_index: case nir_intrinsic_vulkan_resource_index:
lower_res_index_intrinsic(intrin, state); return lower_res_index_intrinsic(b, intrin, state);
break;
case nir_intrinsic_vulkan_resource_reindex: case nir_intrinsic_vulkan_resource_reindex:
lower_res_reindex_intrinsic(intrin, state); return lower_res_reindex_intrinsic(b, intrin, state);
break;
case nir_intrinsic_load_vulkan_descriptor: case nir_intrinsic_load_vulkan_descriptor:
lower_load_vulkan_descriptor(intrin, state); return lower_load_vulkan_descriptor(b, intrin, state);
break;
case nir_intrinsic_get_ssbo_size: case nir_intrinsic_get_ssbo_size:
lower_get_ssbo_size(intrin, state); return lower_get_ssbo_size(b, intrin, state);
break;
case nir_intrinsic_image_deref_load: case nir_intrinsic_image_deref_load:
case nir_intrinsic_image_deref_store: case nir_intrinsic_image_deref_store:
case nir_intrinsic_image_deref_atomic_add: case nir_intrinsic_image_deref_atomic_add:
@ -1093,22 +1077,18 @@ apply_pipeline_layout_block(nir_block *block,
case nir_intrinsic_image_deref_load_param_intel: case nir_intrinsic_image_deref_load_param_intel:
case nir_intrinsic_image_deref_load_raw_intel: case nir_intrinsic_image_deref_load_raw_intel:
case nir_intrinsic_image_deref_store_raw_intel: case nir_intrinsic_image_deref_store_raw_intel:
lower_image_intrinsic(intrin, state); return lower_image_intrinsic(b, intrin, state);
break;
case nir_intrinsic_load_constant: case nir_intrinsic_load_constant:
lower_load_constant(intrin, state); return lower_load_constant(b, intrin, state);
break;
default: default:
break; return false;
} }
break; break;
} }
case nir_instr_type_tex: case nir_instr_type_tex:
lower_tex(nir_instr_as_tex(instr), state); return lower_tex(b, nir_instr_as_tex(instr), state);
break;
default: default:
continue; return false;
}
} }
} }
@ -1142,7 +1122,6 @@ anv_nir_apply_pipeline_layout(const struct anv_physical_device *pdevice,
struct apply_pipeline_layout_state state = { struct apply_pipeline_layout_state state = {
.pdevice = pdevice, .pdevice = pdevice,
.shader = shader,
.layout = layout, .layout = layout,
.add_bounds_checks = robust_buffer_access, .add_bounds_checks = robust_buffer_access,
.ssbo_addr_format = anv_nir_ssbo_addr_format(pdevice, robust_buffer_access), .ssbo_addr_format = anv_nir_ssbo_addr_format(pdevice, robust_buffer_access),
@ -1156,13 +1135,8 @@ anv_nir_apply_pipeline_layout(const struct anv_physical_device *pdevice,
state.set[s].sampler_offsets = rzalloc_array(mem_ctx, uint8_t, count); state.set[s].sampler_offsets = rzalloc_array(mem_ctx, uint8_t, count);
} }
nir_foreach_function(function, shader) { nir_shader_instructions_pass(shader, get_used_bindings,
if (!function->impl) nir_metadata_all, &state);
continue;
nir_foreach_block(block, function->impl)
get_used_bindings_block(block, &state);
}
for (unsigned s = 0; s < layout->num_sets; s++) { for (unsigned s = 0; s < layout->num_sets; s++) {
if (state.set[s].desc_buffer_used) { if (state.set[s].desc_buffer_used) {
@ -1351,12 +1325,6 @@ anv_nir_apply_pipeline_layout(const struct anv_physical_device *pdevice,
} }
} }
nir_foreach_function(function, shader) {
if (!function->impl)
continue;
nir_builder_init(&state.builder, function->impl);
/* Before we do the normal lowering, we look for any SSBO operations /* Before we do the normal lowering, we look for any SSBO operations
* that we can lower to the BTI model and lower them up-front. The BTI * that we can lower to the BTI model and lower them up-front. The BTI
* model can perform better than the A64 model for a couple reasons: * model can perform better than the A64 model for a couple reasons:
@ -1387,13 +1355,15 @@ anv_nir_apply_pipeline_layout(const struct anv_physical_device *pdevice,
* information by the time we get to the load/store/atomic * information by the time we get to the load/store/atomic
* intrinsics in that pass. * intrinsics in that pass.
*/ */
lower_direct_buffer_access(function->impl, &state); nir_shader_instructions_pass(shader, lower_direct_buffer_instr,
nir_metadata_block_index |
nir_metadata_dominance,
&state);
nir_foreach_block(block, function->impl) nir_shader_instructions_pass(shader, apply_pipeline_layout,
apply_pipeline_layout_block(block, &state); nir_metadata_block_index |
nir_metadata_preserve(function->impl, nir_metadata_block_index | nir_metadata_dominance,
nir_metadata_dominance); &state);
}
ralloc_free(mem_ctx); ralloc_free(mem_ctx);