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

nir/opt_algebraic_tests: Allow testing mul/mad_relaxed opcodes.

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39369>
This commit is contained in:
Emma Anholt 2026-01-13 17:25:45 -08:00 • committed by Marge Bot
parent f82621bfdc
commit 94237c3ea3
2 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/compiler/nir/nir_algebraic.py
View file

@ -1345,7 +1345,6 @@ def expression_is_unsupported(expr):
"fdot2_replicated", "fdot3_replicated", "fdot4_replicated", "fdph_replicated", "fdot2_replicated", "fdot3_replicated", "fdot4_replicated", "fdph_replicated",
# The tests do not validate patterns with those opcodes correctly. # The tests do not validate patterns with those opcodes correctly.
"imul24_relaxed", "umad24_relaxed", "umul24_relaxed",
"udiv_aligned_4", "udiv_aligned_4",
] ]

22
src/compiler/nir/nir_opt_algebraic.py
View file

@ -2796,18 +2796,12 @@ optimizations.extend([
'!options->has_umad24'), '!options->has_umad24'),
# Relaxed 24bit ops # Relaxed 24bit ops
(('imul24_relaxed', a, b), ('imul24', a, b), (('imul24_relaxed', a, b), ('imul24', a, b), '!options->has_mul24_relaxed && options->has_imul24'),
'!options->has_mul24_relaxed && options->has_imul24', TestStatus.UNSUPPORTED), (('imul24_relaxed', a, b), ('imul', a, b), '!options->has_mul24_relaxed && !options->has_imul24'),
(('imul24_relaxed', a, b), ('imul', a, b), (('umad24_relaxed', a, b, c), ('umad24', a, b, c), 'options->has_umad24'),
'!options->has_mul24_relaxed && !options->has_imul24', TestStatus.UNSUPPORTED), (('umad24_relaxed', a, b, c), ('iadd', ('umul24_relaxed', a, b), c), '!options->has_umad24'),
(('umad24_relaxed', a, b, c), ('umad24', a, b, c), (('umul24_relaxed', a, b), ('umul24', a, b), '!options->has_mul24_relaxed && options->has_umul24'),
'options->has_umad24', TestStatus.UNSUPPORTED), (('umul24_relaxed', a, b), ('imul', a, b), '!options->has_mul24_relaxed && !options->has_umul24'),
(('umad24_relaxed', a, b, c), ('iadd', ('umul24_relaxed', a, b), c),
'!options->has_umad24', TestStatus.UNSUPPORTED),
(('umul24_relaxed', a, b), ('umul24', a, b),
'!options->has_mul24_relaxed && options->has_umul24', TestStatus.UNSUPPORTED),
(('umul24_relaxed', a, b), ('imul', a, b),
'!options->has_mul24_relaxed && !options->has_umul24', TestStatus.UNSUPPORTED),
(('imad24_ir3', a, b, 0), ('imul24', a, b)), (('imad24_ir3', a, b, 0), ('imul24', a, b)),
(('imad24_ir3', a, 0, c), (c)), (('imad24_ir3', a, 0, c), (c)),
@ -2825,8 +2819,8 @@ optimizations.extend([
(('imul24', a, '#b@32(is_neg_power_of_two)'), ('ineg', ('ishl', a, ('find_lsb', ('iabs', b)))), '!options->lower_bitops'), (('imul24', a, '#b@32(is_neg_power_of_two)'), ('ineg', ('ishl', a, ('find_lsb', ('iabs', b)))), '!options->lower_bitops'),
(('imul24', a, 0), (0)), (('imul24', a, 0), (0)),
(('imul_high@16', a, b), ('i2i16', ('ishr', ('imul24_relaxed', ('i2i32', a), ('i2i32', b)), 16)), 'options->lower_mul_high16', TestStatus.UNSUPPORTED), (('imul_high@16', a, b), ('i2i16', ('ishr', ('imul24_relaxed', ('i2i32', a), ('i2i32', b)), 16)), 'options->lower_mul_high16'),
(('umul_high@16', a, b), ('u2u16', ('ushr', ('umul24_relaxed', ('u2u32', a), ('u2u32', b)), 16)), 'options->lower_mul_high16', TestStatus.UNSUPPORTED), (('umul_high@16', a, b), ('u2u16', ('ushr', ('umul24_relaxed', ('u2u32', a), ('u2u32', b)), 16)), 'options->lower_mul_high16'),
# Optimize vec2 unsigned comparison predicates to usub_sat with clamp. # Optimize vec2 unsigned comparison predicates to usub_sat with clamp.
(('b2i16', ('vec2', ('ult', 'a@16', b), ('ult', 'c@16', d))), (('b2i16', ('vec2', ('ult', 'a@16', b), ('ult', 'c@16', d))),