fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-29 18:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radeonsi: use nir_lower_alu_to_scalar correctly

Browse source 
We should use the filter callback that's also used by st/mesa.

Reviewed-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22833>
This commit is contained in:
Marek Olšák 2023-04-05 05:40:44 -04:00 • committed by Marge Bot
parent 5066623b79
commit d692d433f2
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/radeonsi/si_get.c
View file

@ -1286,6 +1286,8 @@ void si_init_screen_get_functions(struct si_screen *sscreen)
.lower_fisnormal = true,
.lower_rotate = true,
.lower_to_scalar = true,
.lower_to_scalar_filter = sscreen->info.has_packed_math_16bit ?
si_alu_to_scalar_packed_math_filter : NULL,
.lower_int64_options = nir_lower_imul_2x32_64 | nir_lower_imul_high64,
.has_sdot_4x8 = sscreen->info.has_accelerated_dot_product,
.has_sudot_4x8 = sscreen->info.has_accelerated_dot_product && sscreen->info.gfx_level >= GFX11,

1
src/gallium/drivers/radeonsi/si_shader.h
View file

@ -1062,6 +1062,7 @@ void si_nir_scan_shader(struct si_screen *sscreen, const struct nir_shader *nir
/* si_shader_nir.c */
extern const nir_lower_subgroups_options si_nir_subgroups_options;
bool si_alu_to_scalar_packed_math_filter(const nir_instr *instr, const void *data);
void si_nir_opts(struct si_screen *sscreen, struct nir_shader *nir, bool first);
void si_nir_late_opts(nir_shader *nir);
char *si_finalize_nir(struct pipe_screen *screen, void *nirptr);

15
src/gallium/drivers/radeonsi/si_shader_nir.c
View file

@ -10,11 +10,9 @@
#include "ac_nir.h"
static bool si_alu_to_scalar_filter(const nir_instr *instr, const void *data)
bool si_alu_to_scalar_packed_math_filter(const nir_instr *instr, const void *data)
{
struct si_screen *sscreen = (struct si_screen *)data;
if (sscreen->info.has_packed_math_16bit && instr->type == nir_instr_type_alu) {
if (instr->type == nir_instr_type_alu) {
nir_alu_instr *alu = nir_instr_as_alu(instr);
if (alu->dest.dest.is_ssa &&
@ -75,7 +73,8 @@ void si_nir_opts(struct si_screen *sscreen, struct nir_shader *nir, bool first)
bool lower_phis_to_scalar = false;
NIR_PASS(progress, nir, nir_lower_vars_to_ssa);
NIR_PASS(progress, nir, nir_lower_alu_to_scalar, si_alu_to_scalar_filter, sscreen);
NIR_PASS(progress, nir, nir_lower_alu_to_scalar,
nir->options->lower_to_scalar_filter, NULL);
NIR_PASS(progress, nir, nir_lower_phis_to_scalar, false);
if (first) {
@ -97,8 +96,10 @@ void si_nir_opts(struct si_screen *sscreen, struct nir_shader *nir, bool first)
(LLVM_VERSION_MAJOR == 14 ? 0 : nir_opt_if_optimize_phi_true_false));
NIR_PASS(progress, nir, nir_opt_dead_cf);
if (lower_alu_to_scalar)
NIR_PASS_V(nir, nir_lower_alu_to_scalar, si_alu_to_scalar_filter, sscreen);
if (lower_alu_to_scalar) {
NIR_PASS_V(nir, nir_lower_alu_to_scalar,
nir->options->lower_to_scalar_filter, NULL);
}
if (lower_phis_to_scalar)
NIR_PASS_V(nir, nir_lower_phis_to_scalar, false);
progress |= lower_alu_to_scalar | lower_phis_to_scalar;