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

aco: Don't generate an if when the first part of a merged HS or GS is empty.

Browse source 
In some cases (eg. in a few tessellation CTS tests) the VS part of
a merged HS is completely empty. Let's not generate a divergent if
in these cases. (LLVM also doesn't do it.)

No pipeline DB changes, only affects the CTS.

Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3964>
This commit is contained in:
Timur Kristóf 2020-02-24 15:27:43 +01:00 • committed by Marge Bot
parent b969501398
commit 8c3ab49c6b
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/amd/compiler/aco_instruction_selection.cpp
View file

@ -9598,8 +9598,16 @@ void select_program(Program *program,
split_arguments(&ctx, startpgm);
}
/* In a merged VS+TCS HS, the VS implementation can be completely empty. */
nir_function_impl *func = nir_shader_get_entrypoint(nir);
bool empty_shader = nir_cf_list_is_empty_block(&func->body) &&
((nir->info.stage == MESA_SHADER_VERTEX &&
(ctx.stage == vertex_tess_control_hs || ctx.stage == vertex_geometry_gs)) ||
(nir->info.stage == MESA_SHADER_TESS_EVAL &&
ctx.stage == tess_eval_geometry_gs));
if_context ic;
if (shader_count >= 2) {
if (shader_count >= 2 && !empty_shader) {
Builder bld(ctx.program, ctx.block);
Temp count = bld.sop2(aco_opcode::s_bfe_u32, bld.def(s1), bld.def(s1, scc), get_arg(&ctx, args->merged_wave_info), Operand((8u << 16) | (i * 8u)));
Temp thread_id = emit_mbcnt(&ctx, bld.def(v1));
@ -9623,7 +9631,6 @@ void select_program(Program *program,
if (ctx.stage == fragment_fs)
handle_bc_optimize(&ctx);
nir_function_impl *func = nir_shader_get_entrypoint(nir);
visit_cf_list(&ctx, &func->body);
if (ctx.program->info->so.num_outputs && (ctx.stage == vertex_vs || ctx.stage == tess_eval_vs))
@ -9642,7 +9649,7 @@ void select_program(Program *program,
if (ctx.stage == fragment_fs)
create_fs_exports(&ctx);
if (shader_count >= 2) {
if (shader_count >= 2 && !empty_shader) {
begin_divergent_if_else(&ctx, &ic);
end_divergent_if(&ctx, &ic);
}