*/
#include "nir.h"
-#include <main/imports.h>
+#include <util/imports.h>
/**
* SSA-based copy propagation
static bool is_move(nir_alu_instr *instr)
{
- if (instr->op != nir_op_fmov &&
- instr->op != nir_op_imov)
+ assert(instr->src[0].src.is_ssa);
+
+ if (instr->op != nir_op_mov)
return false;
if (instr->dest.saturate)
if (instr->src[0].abs || instr->src[0].negate)
return false;
- if (!instr->src[0].src.is_ssa)
- return false;
-
return true;
}
static bool is_vec(nir_alu_instr *instr)
{
for (unsigned i = 0; i < nir_op_infos[instr->op].num_inputs; i++) {
- if (!instr->src[i].src.is_ssa)
- return false;
+ assert(instr->src[i].src.is_ssa);
/* we handle modifiers in a separate pass */
if (instr->src[i].abs || instr->src[i].negate)
}
static bool
-copy_prop_src(nir_src *src, nir_instr *parent_instr, nir_if *parent_if)
+copy_prop_src(nir_src *src, nir_instr *parent_instr, nir_if *parent_if,
+ unsigned num_components)
{
- if (!src->is_ssa) {
- if (src->reg.indirect)
- return copy_prop_src(src, parent_instr, parent_if);
- return false;
- }
+ assert(src->is_ssa);
nir_instr *src_instr = src->ssa->parent_instr;
- if (src_instr->type != nir_instr_type_alu)
- return false;
-
- nir_alu_instr *alu_instr = nir_instr_as_alu(src_instr);
- if (!is_swizzleless_move(alu_instr))
- return false;
+ nir_ssa_def *copy_def;
+ if (src_instr->type == nir_instr_type_alu) {
+ nir_alu_instr *alu_instr = nir_instr_as_alu(src_instr);
+ if (!is_swizzleless_move(alu_instr))
+ return false;
- /* Don't let copy propagation land us with a phi that has more
- * components in its source than it has in its destination. That badly
- * messes up out-of-ssa.
- */
- if (parent_instr && parent_instr->type == nir_instr_type_phi) {
- nir_phi_instr *phi = nir_instr_as_phi(parent_instr);
- assert(phi->dest.is_ssa);
- if (phi->dest.ssa.num_components !=
- alu_instr->src[0].src.ssa->num_components)
+ if (alu_instr->src[0].src.ssa->num_components != num_components)
return false;
+
+ copy_def= alu_instr->src[0].src.ssa;
+ } else {
+ return false;
}
if (parent_instr) {
- nir_instr_rewrite_src(parent_instr, src,
- nir_src_for_ssa(alu_instr->src[0].src.ssa));
+ nir_instr_rewrite_src(parent_instr, src, nir_src_for_ssa(copy_def));
} else {
assert(src == &parent_if->condition);
- nir_if_rewrite_condition(parent_if,
- nir_src_for_ssa(alu_instr->src[0].src.ssa));
+ nir_if_rewrite_condition(parent_if, nir_src_for_ssa(copy_def));
}
return true;
copy_prop_alu_src(nir_alu_instr *parent_alu_instr, unsigned index)
{
nir_alu_src *src = &parent_alu_instr->src[index];
- if (!src->src.is_ssa) {
- if (src->src.reg.indirect)
- return copy_prop_src(src->src.reg.indirect, &parent_alu_instr->instr,
- NULL);
- return false;
- }
+ assert(src->src.is_ssa);
nir_instr *src_instr = src->src.ssa->parent_instr;
if (src_instr->type != nir_instr_type_alu)
return false;
nir_ssa_def *def;
- unsigned new_swizzle[4] = {0, 0, 0, 0};
+ unsigned new_swizzle[NIR_MAX_VEC_COMPONENTS] = {0, 0, 0, 0};
- if (alu_instr->op == nir_op_fmov ||
- alu_instr->op == nir_op_imov) {
- for (unsigned i = 0; i < 4; i++)
+ if (alu_instr->op == nir_op_mov) {
+ for (unsigned i = 0; i < NIR_MAX_VEC_COMPONENTS; i++)
new_swizzle[i] = alu_instr->src[0].swizzle[src->swizzle[i]];
def = alu_instr->src[0].src.ssa;
} else {
def = NULL;
- for (unsigned i = 0; i < 4; i++) {
+ for (unsigned i = 0; i < NIR_MAX_VEC_COMPONENTS; i++) {
if (!nir_alu_instr_channel_used(parent_alu_instr, index, i))
continue;
}
}
- for (unsigned i = 0; i < 4; i++)
+ for (unsigned i = 0; i < NIR_MAX_VEC_COMPONENTS; i++)
src->swizzle[i] = new_swizzle[i];
nir_instr_rewrite_src(&parent_alu_instr->instr, &src->src,
return true;
}
-typedef struct {
- nir_instr *parent_instr;
- bool progress;
-} copy_prop_state;
-
-static bool
-copy_prop_src_cb(nir_src *src, void *_state)
-{
- copy_prop_state *state = (copy_prop_state *) _state;
- while (copy_prop_src(src, state->parent_instr, NULL))
- state->progress = true;
-
- return true;
-}
-
static bool
copy_prop_instr(nir_instr *instr)
{
- if (instr->type == nir_instr_type_alu) {
+ bool progress = false;
+ switch (instr->type) {
+ case nir_instr_type_alu: {
nir_alu_instr *alu_instr = nir_instr_as_alu(instr);
- bool progress = false;
for (unsigned i = 0; i < nir_op_infos[alu_instr->op].num_inputs; i++)
while (copy_prop_alu_src(alu_instr, i))
progress = true;
- if (!alu_instr->dest.dest.is_ssa && alu_instr->dest.dest.reg.indirect)
- while (copy_prop_src(alu_instr->dest.dest.reg.indirect, instr, NULL))
+ return progress;
+ }
+
+ case nir_instr_type_deref: {
+ nir_deref_instr *deref = nir_instr_as_deref(instr);
+
+ if (deref->deref_type != nir_deref_type_var) {
+ assert(deref->dest.is_ssa);
+ const unsigned comps = deref->dest.ssa.num_components;
+ while (copy_prop_src(&deref->parent, instr, NULL, comps))
progress = true;
+ }
+
+ if (deref->deref_type == nir_deref_type_array ||
+ deref->deref_type == nir_deref_type_ptr_as_array) {
+ while (copy_prop_src(&deref->arr.index, instr, NULL, 1))
+ progress = true;
+ }
return progress;
}
- copy_prop_state state;
- state.parent_instr = instr;
- state.progress = false;
- nir_foreach_src(instr, copy_prop_src_cb, &state);
+ case nir_instr_type_tex: {
+ nir_tex_instr *tex = nir_instr_as_tex(instr);
+ for (unsigned i = 0; i < tex->num_srcs; i++) {
+ unsigned num_components = nir_tex_instr_src_size(tex, i);
+ while (copy_prop_src(&tex->src[i].src, instr, NULL, num_components))
+ progress = true;
+ }
- return state.progress;
-}
+ return progress;
+ }
-static bool
-copy_prop_if(nir_if *if_stmt)
-{
- return copy_prop_src(&if_stmt->condition, NULL, if_stmt);
-}
+ case nir_instr_type_intrinsic: {
+ nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
+ for (unsigned i = 0;
+ i < nir_intrinsic_infos[intrin->intrinsic].num_srcs; i++) {
+ unsigned num_components = nir_intrinsic_src_components(intrin, i);
-static bool
-copy_prop_block(nir_block *block, void *_state)
-{
- bool *progress = (bool *) _state;
+ while (copy_prop_src(&intrin->src[i], instr, NULL, num_components))
+ progress = true;
+ }
+
+ return progress;
+ }
+
+ case nir_instr_type_phi: {
+ nir_phi_instr *phi = nir_instr_as_phi(instr);
+ assert(phi->dest.is_ssa);
+ unsigned num_components = phi->dest.ssa.num_components;
+ nir_foreach_phi_src(src, phi) {
+ while (copy_prop_src(&src->src, instr, NULL, num_components))
+ progress = true;
+ }
- nir_foreach_instr(block, instr) {
- if (copy_prop_instr(instr))
- *progress = true;
+ return progress;
}
- nir_if *if_stmt = nir_block_get_following_if(block);
- if (if_stmt && copy_prop_if(if_stmt))
- *progress = true;
+ default:
+ return false;
+ }
+}
- return true;
+static bool
+copy_prop_if(nir_if *if_stmt)
+{
+ return copy_prop_src(&if_stmt->condition, NULL, if_stmt, 1);
}
static bool
{
bool progress = false;
- nir_foreach_block_call(impl, copy_prop_block, &progress);
+ nir_foreach_block(block, impl) {
+ nir_foreach_instr(instr, block) {
+ if (copy_prop_instr(instr))
+ progress = true;
+ }
+
+ nir_if *if_stmt = nir_block_get_following_if(block);
+ if (if_stmt && copy_prop_if(if_stmt))
+ progress = true;
+ }
if (progress) {
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
+ } else {
+#ifndef NDEBUG
+ impl->valid_metadata &= ~nir_metadata_not_properly_reset;
+#endif
}
return progress;
{
bool progress = false;
- nir_foreach_function(shader, function) {
+ nir_foreach_function(function, shader) {
if (function->impl && nir_copy_prop_impl(function->impl))
progress = true;
}
projects / mesa.git / blobdiff