fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-14 23:50:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

aco/insert_fp_mode: remove incorrect assertion

Browse source 
This can happen if a loop has no continues, and the later code should work
fine in this situation.

This fixes war_thunder/0013a69e097b2471 on navi21.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
Fixes: 6b9d28ab9b ("aco/insert_fp_mode: insert fp mode in reverse")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39481>
(cherry picked from commit e59a0df302)
This commit is contained in:
Rhys Perry 2026-01-23 09:49:51 +00:00 • committed by Eric Engestrom
parent cfdaa05349
commit ca22a66dd9
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -2254,7 +2254,7 @@
"description": "aco/insert_fp_mode: remove incorrect assertion",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "6b9d28ab9bbd1578c06366dc792c10dbb3c366ef",
"notes": null

18
src/amd/compiler/aco_insert_fp_mode.cpp
View file

@ -454,16 +454,16 @@ emit_set_mode_block(fp_mode_ctx* ctx, Block* block)
for (uint32_t pred : block->linear_preds)
max_pred = MAX2(max_pred, pred);
assert(max_pred != 0);
mode_mask to_set = 0;
/* Check if the any mode was changed during the loop. */
u_foreach_bit (i, fp_state.required) {
if (ctx->last_set[i] <= max_pred)
to_set |= BITFIELD_BIT(i);
if (max_pred >= block->index) {
mode_mask to_set = 0;
/* Check if the any mode was changed during the loop. */
u_foreach_bit (i, fp_state.required) {
if (ctx->last_set[i] <= max_pred)
to_set |= BITFIELD_BIT(i);
}
if (to_set)
set_mode(ctx, block, fp_state, 0, to_set);
}
if (to_set)
set_mode(ctx, block, fp_state, 0, to_set);
}
ctx->block_states[block->index] = fp_state;