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

aco/isel: remove check for empty exec mask on uniform continues

Browse source 
This could only happen after terminate_if inside loops.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33479>
This commit is contained in:
Daniel Schürmann 2025-02-12 09:00:53 +01:00 • committed by Marge Bot
parent 2b0536e921
commit 46f6c73d36
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9965,12 +9965,10 @@ emit_loop_jump(isel_context* ctx, bool is_break)
add_logical_edge(idx, logical_target);
ctx->block->kind |= block_kind_continue;
/* If exec is empty inside uniform control flow in a loop, we can assume that all invocations
* of the loop are inactive. Breaking from the loop is the right thing to do in that case.
* We shouldn't perform a uniform continue, or else we might never reach a break.
*/
if (!ctx->cf_info.parent_if.is_divergent && !ctx->cf_info.exec.empty()) {
if (!ctx->cf_info.parent_if.is_divergent) {
/* uniform continue - directly jump to the loop header */
assert(!ctx->cf_info.exec.potentially_empty_continue &&
!ctx->cf_info.exec.potentially_empty_discard);
ctx->block->kind |= block_kind_uniform;
ctx->cf_info.has_branch = true;
bld.branch(aco_opcode::p_branch);
@ -9980,14 +9978,12 @@ emit_loop_jump(isel_context* ctx, bool is_break)
ctx->cf_info.has_divergent_branch = true;
if (ctx->cf_info.parent_if.is_divergent) {
/* for potential uniform breaks after this continue,
we must ensure that they are handled correctly */
ctx->cf_info.parent_loop.has_divergent_continue = true;
/* for potential uniform breaks after this continue,
we must ensure that they are handled correctly */
ctx->cf_info.parent_loop.has_divergent_continue = true;
if (!ctx->cf_info.exec.potentially_empty_continue)
ctx->cf_info.exec.potentially_empty_continue = true;
}
if (!ctx->cf_info.exec.potentially_empty_continue)
ctx->cf_info.exec.potentially_empty_continue = true;
}
/* remove critical edges from linear CFG */