OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir/lower_packing: use shader_instructions_pass

Browse Source 
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11615>
This commit is contained in:
Thomas H.P. Andersen
2021-06-28 01:00:31 +02:00
committed by Marge Bot
parent ed530ac6c2
commit b4369de27f
1 changed files with 40 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
src/compiler/nir/nir_lower_packing.c
View File

@@ -87,80 +87,58 @@ lower_unpack_64_to_16(nir_builder *b, nir_ssa_def *src)
} }
static bool static bool
lower_pack_impl(nir_function_impl *impl) lower_pack_instr(nir_builder *b, nir_instr *instr, void *data)
{ {
nir_builder b; if (instr->type != nir_instr_type_alu)
nir_builder_init(&b, impl); return false;
bool progress = false;
nir_foreach_block(block, impl) { nir_alu_instr *alu_instr = (nir_alu_instr *) instr;
nir_foreach_instr_safe(instr, block) {
if (instr->type != nir_instr_type_alu)
continue;
nir_alu_instr *alu_instr = (nir_alu_instr *) instr; if (alu_instr->op != nir_op_pack_64_2x32 &&
alu_instr->op != nir_op_unpack_64_2x32 &&
alu_instr->op != nir_op_pack_64_4x16 &&
alu_instr->op != nir_op_unpack_64_4x16 &&
alu_instr->op != nir_op_pack_32_2x16 &&
alu_instr->op != nir_op_unpack_32_2x16)
if (alu_instr->op != nir_op_pack_64_2x32 && return false;
alu_instr->op != nir_op_unpack_64_2x32 &&
alu_instr->op != nir_op_pack_64_4x16 &&
alu_instr->op != nir_op_unpack_64_4x16 &&
alu_instr->op != nir_op_pack_32_2x16 &&
alu_instr->op != nir_op_unpack_32_2x16)
continue;
b.cursor = nir_before_instr(&alu_instr->instr); b->cursor = nir_before_instr(&alu_instr->instr);
nir_ssa_def *src = nir_ssa_for_alu_src(&b, alu_instr, 0); nir_ssa_def *src = nir_ssa_for_alu_src(b, alu_instr, 0);
nir_ssa_def *dest; nir_ssa_def *dest;
switch (alu_instr->op) { switch (alu_instr->op) {
case nir_op_pack_64_2x32: case nir_op_pack_64_2x32:
dest = lower_pack_64_from_32(&b, src); dest = lower_pack_64_from_32(b, src);
break; break;
case nir_op_unpack_64_2x32: case nir_op_unpack_64_2x32:
dest = lower_unpack_64_to_32(&b, src); dest = lower_unpack_64_to_32(b, src);
break; break;
case nir_op_pack_64_4x16: case nir_op_pack_64_4x16:
dest = lower_pack_64_from_16(&b, src); dest = lower_pack_64_from_16(b, src);
break; break;
case nir_op_unpack_64_4x16: case nir_op_unpack_64_4x16:
dest = lower_unpack_64_to_16(&b, src); dest = lower_unpack_64_to_16(b, src);
break; break;
case nir_op_pack_32_2x16: case nir_op_pack_32_2x16:
dest = lower_pack_32_from_16(&b, src); dest = lower_pack_32_from_16(b, src);
break; break;
case nir_op_unpack_32_2x16: case nir_op_unpack_32_2x16:
dest = lower_unpack_32_to_16(&b, src); dest = lower_unpack_32_to_16(b, src);
break; break;
default: default:
unreachable("Impossible opcode"); unreachable("Impossible opcode");
}
nir_ssa_def_rewrite_uses(&alu_instr->dest.dest.ssa, dest);
nir_instr_remove(&alu_instr->instr);
progress = true;
}
} }
nir_ssa_def_rewrite_uses(&alu_instr->dest.dest.ssa, dest);
nir_instr_remove(&alu_instr->instr);
if (progress) { return true;
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
} else {
nir_metadata_preserve(impl, nir_metadata_all);
}
return progress;
} }
bool bool
nir_lower_pack(nir_shader *shader) nir_lower_pack(nir_shader *shader)
{ {
bool progress = false; return nir_shader_instructions_pass(shader, lower_pack_instr,
nir_metadata_block_index | nir_metadata_dominance, NULL);
nir_foreach_function(function, shader) {
if (function->impl)
progress |= lower_pack_impl(function->impl);
}
return progress;
} }