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

nir: Check all sizes in nir_alu_instr_is_comparison

Browse source 
nir_alu_instr_is_comparison needs to consider all comparison opcodes regardless
of size. Otherwise, they will be missed by nir_opt_move/sink.

Without this change, lowering booleans to integers regresses register
pressure (and spills/fills) significantly in certain shaders on Panfrost,
like android/com.miHoYo.GenshinImpact/1420.shader_test.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15073>
This commit is contained in:
Alyssa Rosenzweig 2022-02-17 20:18:58 -05:00 • committed by Marge Bot
parent 8f4b3c749e
commit 2d6233d04f
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/compiler/nir/nir.c
View file

@ -3057,22 +3057,34 @@ nir_ssa_alu_instr_src_components(const nir_alu_instr *instr, unsigned src)
return nir_dest_num_components(instr->dest.dest); return nir_dest_num_components(instr->dest.dest);
} }
#define CASE_ALL_SIZES(op) \
case op: \
case op ## 8: \
case op ## 16: \
case op ## 32: \
bool bool
nir_alu_instr_is_comparison(const nir_alu_instr *instr) nir_alu_instr_is_comparison(const nir_alu_instr *instr)
{ {
switch (instr->op) { switch (instr->op) {
case nir_op_flt: CASE_ALL_SIZES(nir_op_flt)
case nir_op_fge: CASE_ALL_SIZES(nir_op_fge)
case nir_op_feq: CASE_ALL_SIZES(nir_op_feq)
case nir_op_fneu: CASE_ALL_SIZES(nir_op_fneu)
case nir_op_ilt: CASE_ALL_SIZES(nir_op_ilt)
case nir_op_ult: CASE_ALL_SIZES(nir_op_ult)
case nir_op_ige: CASE_ALL_SIZES(nir_op_ige)
case nir_op_uge: CASE_ALL_SIZES(nir_op_uge)
case nir_op_ieq: CASE_ALL_SIZES(nir_op_ieq)
case nir_op_ine: CASE_ALL_SIZES(nir_op_ine)
case nir_op_i2b1: case nir_op_i2b1:
case nir_op_i2b8:
case nir_op_i2b16:
case nir_op_i2b32:
case nir_op_f2b1: case nir_op_f2b1:
case nir_op_f2b8:
case nir_op_f2b16:
case nir_op_f2b32:
case nir_op_inot: case nir_op_inot:
return true; return true;
default: default:
@ -3080,6 +3092,7 @@ nir_alu_instr_is_comparison(const nir_alu_instr *instr)
} }
} }
#undef CASE_ALL_SIZES
unsigned unsigned
nir_intrinsic_src_components(const nir_intrinsic_instr *intr, unsigned srcn) nir_intrinsic_src_components(const nir_intrinsic_instr *intr, unsigned srcn)