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

nir/recompute_io_bases: move color input bases after all other inputs

Browse source 
This is related to the FS prolog.
It should have no effect on other drivers.

v2: make it optional via io_options

Reviewed-by: Timur Kristóf <timur.kristof@gmail.com> (v1)
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38599>
This commit is contained in:
Marek Olšák 2025-11-22 13:56:08 -05:00 • committed by Marge Bot
parent 18a338066b
commit e6499fa73e
3 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/amd/common/nir/ac_nir.c
View file

@ -112,7 +112,8 @@ void ac_nir_set_options(struct radeon_info *info, bool use_llvm,
nir_io_prefer_scalar_fs_inputs | nir_io_prefer_scalar_fs_inputs |
nir_io_mix_convergent_flat_with_interpolated | nir_io_mix_convergent_flat_with_interpolated |
nir_io_vectorizer_ignores_types | nir_io_vectorizer_ignores_types |
nir_io_compaction_rotates_color_channels; nir_io_compaction_rotates_color_channels |
nir_io_assign_color_input_bases_after_all_other_inputs;
options->lower_layer_fs_input_to_sysval = true; options->lower_layer_fs_input_to_sysval = true;
options->scalarize_ddx = true; options->scalarize_ddx = true;
options->coarse_ddx = true; options->coarse_ddx = true;

28
src/compiler/nir/nir_recompute_io_bases.c
View file

@ -68,13 +68,19 @@ bool
nir_recompute_io_bases(nir_shader *nir, nir_variable_mode modes) nir_recompute_io_bases(nir_shader *nir, nir_variable_mode modes)
{ {
nir_function_impl *impl = nir_shader_get_entrypoint(nir); nir_function_impl *impl = nir_shader_get_entrypoint(nir);
bool make_colors_last = nir->options->io_options &
nir_io_assign_color_input_bases_after_all_other_inputs;
BITSET_DECLARE(inputs, NUM_TOTAL_VARYING_SLOTS); BITSET_DECLARE(inputs, NUM_TOTAL_VARYING_SLOTS);
BITSET_DECLARE(per_prim_inputs, NUM_TOTAL_VARYING_SLOTS); /* FS only */ BITSET_DECLARE(per_prim_inputs, NUM_TOTAL_VARYING_SLOTS); /* FS only */
/* radeonsi prefers color inputs to be last. */
BITSET_DECLARE(color_inputs, 2); /* VARYING_SLOT_COL{0,1}, FS only */
BITSET_DECLARE(dual_slot_inputs, NUM_TOTAL_VARYING_SLOTS); /* VS only */ BITSET_DECLARE(dual_slot_inputs, NUM_TOTAL_VARYING_SLOTS); /* VS only */
BITSET_DECLARE(outputs, NUM_TOTAL_VARYING_SLOTS); BITSET_DECLARE(outputs, NUM_TOTAL_VARYING_SLOTS);
BITSET_ZERO(inputs); BITSET_ZERO(inputs);
BITSET_ZERO(per_prim_inputs); BITSET_ZERO(per_prim_inputs);
BITSET_ZERO(color_inputs);
BITSET_ZERO(dual_slot_inputs); BITSET_ZERO(dual_slot_inputs);
BITSET_ZERO(outputs); BITSET_ZERO(outputs);
@ -109,6 +115,11 @@ nir_recompute_io_bases(nir_shader *nir, nir_variable_mode modes)
location == VARYING_SLOT_VIEWPORT || location == VARYING_SLOT_VIEWPORT ||
location == VARYING_SLOT_LAYER))) location == VARYING_SLOT_LAYER)))
BITSET_SET(per_prim_inputs, location); BITSET_SET(per_prim_inputs, location);
else if (make_colors_last &&
nir->info.stage == MESA_SHADER_FRAGMENT &&
(location == VARYING_SLOT_COL0 ||
location == VARYING_SLOT_COL1))
BITSET_SET(color_inputs, location - VARYING_SLOT_COL0);
else else
BITSET_SET(inputs, location); BITSET_SET(inputs, location);
@ -122,7 +133,11 @@ nir_recompute_io_bases(nir_shader *nir, nir_variable_mode modes)
} }
} }
const unsigned num_normal_inputs = BITSET_COUNT(inputs) + BITSET_COUNT(dual_slot_inputs); const unsigned num_normal_inputs = BITSET_COUNT(inputs) +
BITSET_COUNT(dual_slot_inputs) +
BITSET_COUNT(color_inputs);
assert(nir->info.stage == MESA_SHADER_FRAGMENT ||
BITSET_COUNT(color_inputs) == 0);
/* Renumber bases. */ /* Renumber bases. */
bool changed = false; bool changed = false;
@ -144,6 +159,14 @@ nir_recompute_io_bases(nir_shader *nir, nir_variable_mode modes)
nir_intrinsic_set_base(intr, nir_intrinsic_set_base(intr,
num_normal_inputs + num_normal_inputs +
BITSET_PREFIX_SUM(per_prim_inputs, sem.location)); BITSET_PREFIX_SUM(per_prim_inputs, sem.location));
} else if (make_colors_last &&
nir->info.stage == MESA_SHADER_FRAGMENT &&
(sem.location == VARYING_SLOT_COL0 ||
sem.location == VARYING_SLOT_COL1)) {
nir_intrinsic_set_base(intr,
BITSET_COUNT(inputs) +
BITSET_PREFIX_SUM(color_inputs,
sem.location - VARYING_SLOT_COL0));
} else { } else {
nir_intrinsic_set_base(intr, nir_intrinsic_set_base(intr,
BITSET_PREFIX_SUM(inputs, sem.location) + BITSET_PREFIX_SUM(inputs, sem.location) +
@ -164,7 +187,8 @@ nir_recompute_io_bases(nir_shader *nir, nir_variable_mode modes)
nir_progress(changed, impl, nir_metadata_control_flow); nir_progress(changed, impl, nir_metadata_control_flow);
if (modes & nir_var_shader_in) if (modes & nir_var_shader_in)
nir->num_inputs = BITSET_COUNT(inputs) + BITSET_COUNT(per_prim_inputs); nir->num_inputs = BITSET_COUNT(inputs) + BITSET_COUNT(color_inputs) +
BITSET_COUNT(per_prim_inputs);
if (modes & nir_var_shader_out) if (modes & nir_var_shader_out)
nir->num_outputs = BITSET_COUNT(outputs); nir->num_outputs = BITSET_COUNT(outputs);

6
src/compiler/nir/nir_shader_compiler_options.h
View file

@ -200,6 +200,12 @@ typedef enum {
*/ */
nir_io_radv_intrinsic_component_workaround = BITFIELD_BIT(10), nir_io_radv_intrinsic_component_workaround = BITFIELD_BIT(10),
/**
* nir_recompute_io_bases will assign VARYING_SLOT_COL0-1 such that
* their bases are after all other inputs.
*/
nir_io_assign_color_input_bases_after_all_other_inputs = BITFIELD_BIT(11),
/* Options affecting the GLSL compiler or Gallium are below. */ /* Options affecting the GLSL compiler or Gallium are below. */
/** /**