#include "nir.h"
#include "nir_builder.h"
+#include "nir_deref.h"
static void
-emit_load_store(nir_builder *b, nir_intrinsic_instr *orig_instr,
- nir_deref_var *deref, nir_deref *tail,
- nir_ssa_def **dest, nir_ssa_def *src);
+emit_load_store_deref(nir_builder *b, nir_intrinsic_instr *orig_instr,
+ nir_deref_instr *parent,
+ nir_deref_instr **deref_arr,
+ nir_ssa_def **dest, nir_ssa_def *src);
static void
-emit_indirect_load_store(nir_builder *b, nir_intrinsic_instr *orig_instr,
- nir_deref_var *deref, nir_deref *arr_parent,
- int start, int end,
- nir_ssa_def **dest, nir_ssa_def *src)
+emit_indirect_load_store_deref(nir_builder *b, nir_intrinsic_instr *orig_instr,
+ nir_deref_instr *parent,
+ nir_deref_instr **deref_arr,
+ int start, int end,
+ nir_ssa_def **dest, nir_ssa_def *src)
{
- assert(arr_parent->child &&
- arr_parent->child->deref_type == nir_deref_type_array);
- nir_deref_array *arr = nir_deref_as_array(arr_parent->child);
- assert(arr->deref_array_type == nir_deref_array_type_indirect);
- assert(arr->indirect.is_ssa);
-
assert(start < end);
if (start == end - 1) {
- /* Base case. Just emit the load/store op */
- nir_deref_array direct = *arr;
- direct.deref_array_type = nir_deref_array_type_direct;
- direct.base_offset += start;
- direct.indirect = NIR_SRC_INIT;
-
- arr_parent->child = &direct.deref;
- emit_load_store(b, orig_instr, deref, &arr->deref, dest, src);
- arr_parent->child = &arr->deref;
+ emit_load_store_deref(b, orig_instr,
+ nir_build_deref_array_imm(b, parent, start),
+ deref_arr + 1, dest, src);
} else {
int mid = start + (end - start) / 2;
nir_ssa_def *then_dest, *else_dest;
- nir_if *if_stmt = nir_if_create(b->shader);
- if_stmt->condition = nir_src_for_ssa(nir_ilt(b, arr->indirect.ssa,
- nir_imm_int(b, mid)));
- nir_cf_node_insert(b->cursor, &if_stmt->cf_node);
-
- b->cursor = nir_after_cf_list(&if_stmt->then_list);
- emit_indirect_load_store(b, orig_instr, deref, arr_parent,
- start, mid, &then_dest, src);
-
- b->cursor = nir_after_cf_list(&if_stmt->else_list);
- emit_indirect_load_store(b, orig_instr, deref, arr_parent,
- mid, end, &else_dest, src);
-
- b->cursor = nir_after_cf_node(&if_stmt->cf_node);
-
- if (src == NULL) {
- /* We're a load. We need to insert a phi node */
- nir_phi_instr *phi = nir_phi_instr_create(b->shader);
- nir_ssa_dest_init(&phi->instr, &phi->dest,
- then_dest->num_components, NULL);
-
- nir_phi_src *src0 = ralloc(phi, nir_phi_src);
- src0->pred = nir_cf_node_as_block(nir_if_last_then_node(if_stmt));
- src0->src = nir_src_for_ssa(then_dest);
- exec_list_push_tail(&phi->srcs, &src0->node);
+ nir_deref_instr *deref = *deref_arr;
+ assert(deref->deref_type == nir_deref_type_array);
- nir_phi_src *src1 = ralloc(phi, nir_phi_src);
- src1->pred = nir_cf_node_as_block(nir_if_last_else_node(if_stmt));
- src1->src = nir_src_for_ssa(else_dest);
- exec_list_push_tail(&phi->srcs, &src1->node);
+ nir_push_if(b, nir_ilt(b, deref->arr.index.ssa, nir_imm_intN_t(b, mid, parent->dest.ssa.bit_size)));
+ emit_indirect_load_store_deref(b, orig_instr, parent, deref_arr,
+ start, mid, &then_dest, src);
+ nir_push_else(b, NULL);
+ emit_indirect_load_store_deref(b, orig_instr, parent, deref_arr,
+ mid, end, &else_dest, src);
+ nir_pop_if(b, NULL);
- nir_builder_instr_insert(b, &phi->instr);
- *dest = &phi->dest.ssa;
- }
+ if (src == NULL)
+ *dest = nir_if_phi(b, then_dest, else_dest);
}
}
static void
-emit_load_store(nir_builder *b, nir_intrinsic_instr *orig_instr,
- nir_deref_var *deref, nir_deref *tail,
- nir_ssa_def **dest, nir_ssa_def *src)
+emit_load_store_deref(nir_builder *b, nir_intrinsic_instr *orig_instr,
+ nir_deref_instr *parent,
+ nir_deref_instr **deref_arr,
+ nir_ssa_def **dest, nir_ssa_def *src)
{
- for (; tail->child; tail = tail->child) {
- if (tail->child->deref_type != nir_deref_type_array)
- continue;
-
- nir_deref_array *arr = nir_deref_as_array(tail->child);
- if (arr->deref_array_type != nir_deref_array_type_indirect)
- continue;
-
- int length = glsl_get_length(tail->type);
+ for (; *deref_arr; deref_arr++) {
+ nir_deref_instr *deref = *deref_arr;
+ if (deref->deref_type == nir_deref_type_array &&
+ !nir_src_is_const(deref->arr.index)) {
+ int length = glsl_get_length(parent->type);
+
+ emit_indirect_load_store_deref(b, orig_instr, parent, deref_arr,
+ 0, length, dest, src);
+ return;
+ }
- emit_indirect_load_store(b, orig_instr, deref, tail, -arr->base_offset,
- length - arr->base_offset, dest, src);
- return;
+ parent = nir_build_deref_follower(b, parent, deref);
}
- assert(tail && tail->child == NULL);
-
/* We reached the end of the deref chain. Emit the instruction */
+ assert(*deref_arr == NULL);
if (src == NULL) {
/* This is a load instruction */
nir_intrinsic_instr *load =
- nir_intrinsic_instr_create(b->shader, nir_intrinsic_load_var);
+ nir_intrinsic_instr_create(b->shader, orig_instr->intrinsic);
load->num_components = orig_instr->num_components;
- load->variables[0] =
- nir_deref_as_var(nir_copy_deref(load, &deref->deref));
+
+ load->src[0] = nir_src_for_ssa(&parent->dest.ssa);
+
+ /* Copy over any other sources. This is needed for interp_deref_at */
+ for (unsigned i = 1;
+ i < nir_intrinsic_infos[orig_instr->intrinsic].num_srcs; i++)
+ nir_src_copy(&load->src[i], &orig_instr->src[i], load);
+
nir_ssa_dest_init(&load->instr, &load->dest,
- load->num_components, NULL);
+ orig_instr->dest.ssa.num_components,
+ orig_instr->dest.ssa.bit_size, NULL);
nir_builder_instr_insert(b, &load->instr);
*dest = &load->dest.ssa;
} else {
- /* This is a store instruction */
- nir_intrinsic_instr *store =
- nir_intrinsic_instr_create(b->shader, nir_intrinsic_store_var);
- store->num_components = orig_instr->num_components;
- store->const_index[0] = orig_instr->const_index[0]; /* writemask */
- store->variables[0] =
- nir_deref_as_var(nir_copy_deref(store, &deref->deref));
- store->src[0] = nir_src_for_ssa(src);
- nir_builder_instr_insert(b, &store->instr);
- }
-}
-
-static bool
-deref_has_indirect(nir_deref_var *deref)
-{
- for (nir_deref *tail = deref->deref.child; tail; tail = tail->child) {
- if (tail->deref_type != nir_deref_type_array)
- continue;
-
- nir_deref_array *arr = nir_deref_as_array(tail);
- if (arr->deref_array_type == nir_deref_array_type_indirect)
- return true;
+ assert(orig_instr->intrinsic == nir_intrinsic_store_deref);
+ nir_store_deref(b, parent, src, nir_intrinsic_write_mask(orig_instr));
}
-
- return false;
}
-struct lower_indirect_state {
- nir_builder builder;
- uint32_t mode_mask;
- bool progress;
-};
-
static bool
-lower_indirect_block(nir_block *block, void *void_state)
+lower_indirect_derefs_block(nir_block *block, nir_builder *b,
+ nir_variable_mode modes)
{
- struct lower_indirect_state *state = void_state;
+ bool progress = false;
- nir_foreach_instr_safe(block, instr) {
+ nir_foreach_instr_safe(instr, block) {
if (instr->type != nir_instr_type_intrinsic)
continue;
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
- if (intrin->intrinsic != nir_intrinsic_load_var &&
- intrin->intrinsic != nir_intrinsic_store_var)
+ if (intrin->intrinsic != nir_intrinsic_load_deref &&
+ intrin->intrinsic != nir_intrinsic_interp_deref_at_centroid &&
+ intrin->intrinsic != nir_intrinsic_interp_deref_at_sample &&
+ intrin->intrinsic != nir_intrinsic_interp_deref_at_offset &&
+ intrin->intrinsic != nir_intrinsic_interp_deref_at_vertex &&
+ intrin->intrinsic != nir_intrinsic_store_deref)
continue;
- if (!deref_has_indirect(intrin->variables[0]))
+ nir_deref_instr *deref = nir_src_as_deref(intrin->src[0]);
+
+ /* Walk the deref chain back to the base and look for indirects */
+ bool has_indirect = false;
+ nir_deref_instr *base = deref;
+ while (base && base->deref_type != nir_deref_type_var) {
+ if (base->deref_type == nir_deref_type_array &&
+ !nir_src_is_const(base->arr.index))
+ has_indirect = true;
+
+ base = nir_deref_instr_parent(base);
+ }
+
+ if (!has_indirect || !base)
continue;
- /* Only lower variables whose mode is in the mask */
- if (!(state->mode_mask & (1 << intrin->variables[0]->var->data.mode)))
+ /* Only lower variables whose mode is in the mask, or compact
+ * array variables. (We can't handle indirects on tightly packed
+ * scalar arrays, so we need to lower them regardless.)
+ */
+ if (!(modes & base->var->data.mode) && !base->var->data.compact)
continue;
- state->builder.cursor = nir_before_instr(&intrin->instr);
+ b->cursor = nir_instr_remove(&intrin->instr);
+
+ nir_deref_path path;
+ nir_deref_path_init(&path, deref, NULL);
+ assert(path.path[0] == base);
- if (intrin->intrinsic == nir_intrinsic_load_var) {
+ if (intrin->intrinsic == nir_intrinsic_store_deref) {
+ assert(intrin->src[1].is_ssa);
+ emit_load_store_deref(b, intrin, base, &path.path[1],
+ NULL, intrin->src[1].ssa);
+ } else {
nir_ssa_def *result;
- emit_load_store(&state->builder, intrin, intrin->variables[0],
- &intrin->variables[0]->deref, &result, NULL);
+ emit_load_store_deref(b, intrin, base, &path.path[1],
+ &result, NULL);
nir_ssa_def_rewrite_uses(&intrin->dest.ssa, nir_src_for_ssa(result));
- } else {
- assert(intrin->src[0].is_ssa);
- emit_load_store(&state->builder, intrin, intrin->variables[0],
- &intrin->variables[0]->deref, NULL, intrin->src[0].ssa);
}
- nir_instr_remove(&intrin->instr);
- state->progress = true;
+
+ nir_deref_path_finish(&path);
+
+ progress = true;
}
- return true;
+ return progress;
}
static bool
-lower_indirects_impl(nir_function_impl *impl, uint32_t mode_mask)
+lower_indirects_impl(nir_function_impl *impl, nir_variable_mode modes)
{
- struct lower_indirect_state state;
-
- state.progress = false;
- state.mode_mask = mode_mask;
- nir_builder_init(&state.builder, impl);
+ nir_builder builder;
+ nir_builder_init(&builder, impl);
+ bool progress = false;
- nir_foreach_block(impl, lower_indirect_block, &state);
+ nir_foreach_block_safe(block, impl) {
+ progress |= lower_indirect_derefs_block(block, &builder, modes);
+ }
- if (state.progress)
+ if (progress)
nir_metadata_preserve(impl, nir_metadata_none);
+ else
+ nir_metadata_preserve(impl, nir_metadata_all);
- return state.progress;
+ return progress;
}
/** Lowers indirect variable loads/stores to direct loads/stores.
* that does a binary search on the array index.
*/
bool
-nir_lower_indirect_derefs(nir_shader *shader, uint32_t mode_mask)
+nir_lower_indirect_derefs(nir_shader *shader, nir_variable_mode modes)
{
bool progress = false;
- nir_foreach_function(shader, function) {
+ nir_foreach_function(function, shader) {
if (function->impl)
- progress = lower_indirects_impl(function->impl, mode_mask) || progress;
+ progress = lower_indirects_impl(function->impl, modes) || progress;
}
return progress;
projects / mesa.git / blobdiff