nir: remove unused param from nir_alu_src_copy()

Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24986>
This commit is contained in:
Timothy Arceri
2023-09-06 14:04:39 +10:00
committed by Marge Bot
parent 9b6eae2e67
commit 84e0f5ce75
8 changed files with 12 additions and 14 deletions
+1 -2
View File
@@ -490,8 +490,7 @@ nir_function_create(nir_shader *shader, const char *name)
}
void
nir_alu_src_copy(nir_alu_src *dest, const nir_alu_src *src,
nir_alu_instr *instr)
nir_alu_src_copy(nir_alu_src *dest, const nir_alu_src *src)
{
dest->src = nir_src_for_ssa(src->src.ssa);
for (unsigned i = 0; i < NIR_MAX_VEC_COMPONENTS; i++)
+1 -2
View File
@@ -1465,8 +1465,7 @@ typedef struct nir_alu_instr {
nir_alu_src src[];
} nir_alu_instr;
void nir_alu_src_copy(nir_alu_src *dest, const nir_alu_src *src,
nir_alu_instr *instr);
void nir_alu_src_copy(nir_alu_src *dest, const nir_alu_src *src);
/* is this source channel used? */
bool
+4 -4
View File
@@ -103,11 +103,11 @@ lower_reduction(nir_alu_instr *alu, nir_op chan_op, nir_op merge_op,
int channel = reverse_order ? num_components - 1 - i : i;
nir_alu_instr *chan = nir_alu_instr_create(builder->shader, chan_op);
nir_alu_ssa_dest_init(chan, 1, alu->def.bit_size);
nir_alu_src_copy(&chan->src[0], &alu->src[0], chan);
nir_alu_src_copy(&chan->src[0], &alu->src[0]);
chan->src[0].swizzle[0] = chan->src[0].swizzle[channel];
if (nir_op_infos[chan_op].num_inputs > 1) {
assert(nir_op_infos[chan_op].num_inputs == 2);
nir_alu_src_copy(&chan->src[1], &alu->src[1], chan);
nir_alu_src_copy(&chan->src[1], &alu->src[1]);
chan->src[1].swizzle[0] = chan->src[1].swizzle[channel];
}
chan->exact = alu->exact;
@@ -163,7 +163,7 @@ lower_fdot(nir_alu_instr *alu, nir_builder *builder)
builder->shader, prev ? nir_op_ffma : nir_op_fmul);
nir_alu_ssa_dest_init(instr, 1, alu->def.bit_size);
for (unsigned j = 0; j < 2; j++) {
nir_alu_src_copy(&instr->src[j], &alu->src[j], instr);
nir_alu_src_copy(&instr->src[j], &alu->src[j]);
instr->src[j].swizzle[0] = alu->src[j].swizzle[channel];
}
if (i != 0)
@@ -391,7 +391,7 @@ lower_alu_instr_width(nir_builder *b, nir_instr *instr, void *_data)
nir_alu_instr *lower = nir_alu_instr_create(b->shader, alu->op);
for (i = 0; i < num_src; i++) {
nir_alu_src_copy(&lower->src[i], &alu->src[i], lower);
nir_alu_src_copy(&lower->src[i], &alu->src[i]);
/* We only handle same-size-as-dest (input_sizes[] == 0) or scalar
* args (input_sizes[] == 1).
+1 -1
View File
@@ -41,7 +41,7 @@ convert_to_bit_size(nir_builder *bld, nir_def *src,
if ((type & (nir_type_uint | nir_type_int)) && bit_size == 32 &&
alu && (alu->op == nir_op_b2i8 || alu->op == nir_op_b2i16)) {
nir_alu_instr *instr = nir_alu_instr_create(bld->shader, nir_op_b2i32);
nir_alu_src_copy(&instr->src[0], &alu->src[0], instr);
nir_alu_src_copy(&instr->src[0], &alu->src[0]);
return nir_builder_alu_instr_finish_and_insert(bld, instr);
}
+1 -1
View File
@@ -492,7 +492,7 @@ construct_value(nir_builder *build,
assert(state->variables_seen & (1 << var->variable));
nir_alu_src val = { NIR_SRC_INIT };
nir_alu_src_copy(&val, &state->variables[var->variable], NULL);
nir_alu_src_copy(&val, &state->variables[var->variable]);
assert(!var->is_constant);
for (unsigned i = 0; i < NIR_MAX_VEC_COMPONENTS; i++)
@@ -706,7 +706,7 @@ insert_vec_mov(nir_alu_instr *vec, unsigned start_idx, nir_shader *shader)
unsigned write_mask = (1u << start_idx);
nir_alu_instr *mov = nir_alu_instr_create(shader, nir_op_mov);
nir_alu_src_copy(&mov->src[0], &vec->src[start_idx], mov);
nir_alu_src_copy(&mov->src[0], &vec->src[start_idx]);
mov->src[0].swizzle[0] = vec->src[start_idx].swizzle[0];
@@ -230,7 +230,7 @@ brw_nir_opt_peephole_ffma_instr(nir_builder *b,
for (unsigned j = 0; j < add->def.num_components; j++)
ffma->src[i].swizzle[j] = mul->src[i].swizzle[swizzle[j]];
}
nir_alu_src_copy(&ffma->src[2], &add->src[1 - add_mul_src], ffma);
nir_alu_src_copy(&ffma->src[2], &add->src[1 - add_mul_src]);
nir_def_init(&ffma->instr, &ffma->def,
add->def.num_components, bit_size);
@@ -42,8 +42,8 @@ replace_imul_instr(nir_builder *b, nir_alu_instr *imul, unsigned small_val,
nir_alu_instr *imul_32x16 = nir_alu_instr_create(b->shader, new_opcode);
nir_alu_src_copy(&imul_32x16->src[0], &imul->src[1 - small_val], imul_32x16);
nir_alu_src_copy(&imul_32x16->src[1], &imul->src[small_val], imul_32x16);
nir_alu_src_copy(&imul_32x16->src[0], &imul->src[1 - small_val]);
nir_alu_src_copy(&imul_32x16->src[1], &imul->src[small_val]);
nir_def_init(&imul_32x16->instr, &imul_32x16->def,
imul->def.num_components, 32);