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);
direct.indirect = NIR_SRC_INIT;
arr_parent->child = &direct.deref;
- emit_load_store(b, orig_instr, deref, &arr->deref, dest, src);
+ emit_load_store(b, orig_instr, deref, &direct.deref, dest, src);
arr_parent->child = &arr->deref;
} 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);
+ nir_push_if(b, nir_ilt(b, arr->indirect.ssa, nir_imm_int(b, mid)));
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);
+ nir_push_else(b, NULL);
emit_indirect_load_store(b, orig_instr, deref, arr_parent,
mid, end, &else_dest, src);
+ nir_pop_if(b, NULL);
- 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);
- unsigned bit_size = then_dest->bit_size;
- nir_ssa_dest_init(&phi->instr, &phi->dest,
- then_dest->num_components, bit_size, 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_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_builder_instr_insert(b, &phi->instr);
- *dest = &phi->dest.ssa;
- }
+ if (src == NULL)
+ *dest = nir_if_phi(b, then_dest, else_dest);
}
}
nir_intrinsic_instr *load =
nir_intrinsic_instr_create(b->shader, nir_intrinsic_load_var);
load->num_components = orig_instr->num_components;
- load->variables[0] =
- nir_deref_as_var(nir_copy_deref(load, &deref->deref));
+ load->variables[0] = nir_deref_var_clone(deref, load);
unsigned bit_size = orig_instr->dest.ssa.bit_size;
nir_ssa_dest_init(&load->instr, &load->dest,
load->num_components, bit_size, NULL);
nir_intrinsic_instr_create(b->shader, nir_intrinsic_store_var);
store->num_components = orig_instr->num_components;
nir_intrinsic_set_write_mask(store, nir_intrinsic_write_mask(orig_instr));
- store->variables[0] =
- nir_deref_as_var(nir_copy_deref(store, &deref->deref));
+ store->variables[0] = nir_deref_var_clone(deref, store);
store->src[0] = nir_src_for_ssa(src);
nir_builder_instr_insert(b, &store->instr);
}
return false;
}
-struct lower_indirect_state {
- nir_builder builder;
- nir_variable_mode modes;
- bool progress;
-};
-
static bool
-lower_indirect_block(nir_block *block, void *void_state)
+lower_indirect_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;
if (!deref_has_indirect(intrin->variables[0]))
continue;
- /* Only lower variables whose mode is in the mask */
- if (!(state->modes & 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 & intrin->variables[0]->var->data.mode) &&
+ !intrin->variables[0]->var->data.compact)
continue;
- state->builder.cursor = nir_before_instr(&intrin->instr);
+ b->cursor = nir_before_instr(&intrin->instr);
if (intrin->intrinsic == nir_intrinsic_load_var) {
nir_ssa_def *result;
- emit_load_store(&state->builder, intrin, intrin->variables[0],
+ emit_load_store(b, intrin, intrin->variables[0],
&intrin->variables[0]->deref, &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],
+ emit_load_store(b, intrin, intrin->variables[0],
&intrin->variables[0]->deref, NULL, intrin->src[0].ssa);
}
nir_instr_remove(&intrin->instr);
- state->progress = true;
+ progress = true;
}
- return true;
+ return progress;
}
static bool
lower_indirects_impl(nir_function_impl *impl, nir_variable_mode modes)
{
- struct lower_indirect_state state;
-
- state.progress = false;
- state.modes = modes;
- 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_block(block, &builder, modes);
+ }
- if (state.progress)
+ if (progress)
nir_metadata_preserve(impl, nir_metadata_none);
- return state.progress;
+ return progress;
}
/** Lowers indirect variable loads/stores to direct loads/stores.
{
bool progress = false;
- nir_foreach_function(shader, function) {
+ nir_foreach_function(function, shader) {
if (function->impl)
progress = lower_indirects_impl(function->impl, modes) || progress;
}
projects / mesa.git / blobdiff