AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir/peephole_select: ignore masked/quad swizzle without fetch_inactive

Browse Source 
Without fetch_inactive, these instructions need to return 0 for inactive lanes
and peephole_select changes which instructions are inactive.

Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30540>
This commit is contained in:
Georg Lehmann
2024-08-06 22:06:27 +02:00
parent 9568976c52
commit b6d3f666ab
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/compiler/nir/nir_opt_peephole_select.c
View File

@@ -144,6 +144,11 @@ block_check_for_allowed_instrs(nir_block *block, unsigned *count,
return false;
break;
case nir_intrinsic_masked_swizzle_amd:
case nir_intrinsic_quad_swizzle_amd:
if (!nir_intrinsic_fetch_inactive(intrin))
return false;
FALLTHROUGH;
case nir_intrinsic_load_uniform:
case nir_intrinsic_load_preamble:
case nir_intrinsic_load_helper_invocation:
@@ -176,8 +181,6 @@ block_check_for_allowed_instrs(nir_block *block, unsigned *count,
case nir_intrinsic_quad_swap_horizontal:
case nir_intrinsic_quad_swap_vertical:
case nir_intrinsic_quad_swap_diagonal:
case nir_intrinsic_quad_swizzle_amd:
case nir_intrinsic_masked_swizzle_amd:
case nir_intrinsic_lane_permute_16_amd:
if (!alu_ok)
return false;