fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 06:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

spirv2dxil: Lower some wave op properties

Browse source 
DXIL has no concept of subgroup mask ops, relative
shuffle ops, and everything is scalar.

Most wave broadcast ops support i1 overloads, except
for quad swap operations. Go figure. Use lower_bit_size
to promote those to i32 instead.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20801>
This commit is contained in:
Jesse Natalie 2023-01-19 13:28:18 -08:00
parent f58d763363
commit a8329595fa
1 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/microsoft/spirv_to_dxil/dxil_spirv_nir.c
View file

@ -873,6 +873,22 @@ dxil_spirv_nir_link(nir_shader *nir, nir_shader *prev_stage_nir,
glsl_type_singleton_decref();
}
static unsigned
lower_bit_size_callback(const nir_instr *instr, void *data)
{
if (instr->type != nir_instr_type_intrinsic)
return 0;
nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
switch (intr->intrinsic) {
case nir_intrinsic_quad_swap_horizontal:
case nir_intrinsic_quad_swap_vertical:
case nir_intrinsic_quad_swap_diagonal:
return intr->dest.ssa.bit_size == 1 ? 32 : 0;
default:
return 0;
}
}
void
dxil_spirv_nir_passes(nir_shader *nir,
const struct dxil_spirv_runtime_conf *conf,
@ -902,6 +918,16 @@ dxil_spirv_nir_passes(nir_shader *nir,
NIR_PASS_V(nir, dxil_nir_lower_subgroup_id);
NIR_PASS_V(nir, dxil_nir_lower_num_subgroups);
nir_lower_subgroups_options subgroup_options = {
.ballot_bit_size = 32,
.ballot_components = 4,
.lower_subgroup_masks = true,
.lower_to_scalar = true,
.lower_relative_shuffle = true,
};
NIR_PASS_V(nir, nir_lower_subgroups, &subgroup_options);
NIR_PASS_V(nir, nir_lower_bit_size, lower_bit_size_callback, NULL);
// Force sample-rate shading if we're asked to.
if (conf->force_sample_rate_shading) {
assert(nir->info.stage == MESA_SHADER_FRAGMENT);