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

nir/divergence_analysis: Handle Task/Mesh shaders

Browse Source 
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10600>
This commit is contained in:
Caio Marcelo de Oliveira Filho
2021-08-26 11:26:04 -07:00
committed by Marge Bot
parent bf5f6add01
commit 27697d5eb8
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/compiler/nir/nir_divergence_analysis.c
View File

@@ -167,7 +167,7 @@ visit_intrinsic(nir_shader *shader, nir_intrinsic_instr *instr)
is_divergent |= !(options & nir_divergence_single_prim_per_subgroup); is_divergent |= !(options & nir_divergence_single_prim_per_subgroup);
else if (stage == MESA_SHADER_TESS_EVAL) else if (stage == MESA_SHADER_TESS_EVAL)
is_divergent |= !(options & nir_divergence_single_patch_per_tes_subgroup); is_divergent |= !(options & nir_divergence_single_patch_per_tes_subgroup);
else else if (stage != MESA_SHADER_MESH)
is_divergent = true; is_divergent = true;
break; break;
case nir_intrinsic_load_per_vertex_input: case nir_intrinsic_load_per_vertex_input:
@@ -186,18 +186,33 @@ visit_intrinsic(nir_shader *shader, nir_intrinsic_instr *instr)
is_divergent |= !(options & nir_divergence_single_prim_per_subgroup); is_divergent |= !(options & nir_divergence_single_prim_per_subgroup);
break; break;
case nir_intrinsic_load_output: case nir_intrinsic_load_output:
assert(stage == MESA_SHADER_TESS_CTRL || stage == MESA_SHADER_FRAGMENT);
is_divergent = instr->src[0].ssa->divergent; is_divergent = instr->src[0].ssa->divergent;
if (stage == MESA_SHADER_TESS_CTRL) switch (stage) {
case MESA_SHADER_TESS_CTRL:
is_divergent |= !(options & nir_divergence_single_patch_per_tcs_subgroup); is_divergent |= !(options & nir_divergence_single_patch_per_tcs_subgroup);
else break;
case MESA_SHADER_FRAGMENT:
is_divergent = true; is_divergent = true;
break;
case MESA_SHADER_TASK:
case MESA_SHADER_MESH:
/* Divergent if src[0] is, so nothing else to do. */
break;
default:
unreachable("Invalid stage for load_output");
}
break; break;
case nir_intrinsic_load_per_vertex_output: case nir_intrinsic_load_per_vertex_output:
assert(stage == MESA_SHADER_TESS_CTRL); assert(stage == MESA_SHADER_TESS_CTRL || stage == MESA_SHADER_MESH);
is_divergent = instr->src[0].ssa->divergent || is_divergent = instr->src[0].ssa->divergent ||
instr->src[1].ssa->divergent || instr->src[1].ssa->divergent ||
!(options & nir_divergence_single_patch_per_tcs_subgroup); (stage == MESA_SHADER_TESS_CTRL &&
!(options & nir_divergence_single_patch_per_tcs_subgroup));
break;
case nir_intrinsic_load_per_primitive_output:
assert(stage == MESA_SHADER_MESH);
is_divergent = instr->src[0].ssa->divergent ||
instr->src[1].ssa->divergent;
break; break;
case nir_intrinsic_load_layer_id: case nir_intrinsic_load_layer_id:
case nir_intrinsic_load_front_face: case nir_intrinsic_load_front_face:
@@ -245,8 +260,9 @@ visit_intrinsic(nir_shader *shader, nir_intrinsic_instr *instr)
break; break;
case nir_intrinsic_load_workgroup_id: case nir_intrinsic_load_workgroup_id:
assert(stage == MESA_SHADER_COMPUTE); assert(gl_shader_stage_uses_workgroup(stage));
is_divergent |= (options & nir_divergence_multiple_workgroup_per_compute_subgroup); if (stage == MESA_SHADER_COMPUTE)
is_divergent |= (options & nir_divergence_multiple_workgroup_per_compute_subgroup);
break; break;
/* Clustered reductions are uniform if cluster_size == subgroup_size or /* Clustered reductions are uniform if cluster_size == subgroup_size or