radv: compact varyings after removing unused ones
It makes no sense to compact before, and the description of nir_compact_varyings() confirms that. Polaris10: Totals from affected shaders: SGPRS: 108528 -> 108128 (-0.37 %) VGPRS: 74548 -> 74500 (-0.06 %) Spilled SGPRs: 844 -> 814 (-3.55 %) Code Size: 3007328 -> 2992932 (-0.48 %) bytes Max Waves: 16019 -> 16009 (-0.06 %) Vega10: Totals from affected shaders: SGPRS: 106088 -> 106232 (0.14 %) VGPRS: 74652 -> 74700 (0.06 %) Spilled SGPRs: 692 -> 658 (-4.91 %) Code Size: 2967708 -> 2953028 (-0.49 %) bytes Max Waves: 18178 -> 18162 (-0.09 %) Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
@@ -1524,6 +1524,9 @@ radv_link_shaders(struct radv_pipeline *pipeline, nir_shader **shaders)
|
||||
bool progress = nir_remove_unused_varyings(ordered_shaders[i],
|
||||
ordered_shaders[i - 1]);
|
||||
|
||||
nir_compact_varyings(ordered_shaders[i],
|
||||
ordered_shaders[i - 1], true);
|
||||
|
||||
if (progress) {
|
||||
if (nir_lower_global_vars_to_local(ordered_shaders[i])) {
|
||||
radv_lower_indirect_derefs(ordered_shaders[i],
|
||||
@@ -1722,7 +1725,6 @@ void radv_create_shaders(struct radv_pipeline *pipeline,
|
||||
last = i;
|
||||
}
|
||||
|
||||
int prev = -1;
|
||||
for (unsigned i = 0; i < MESA_SHADER_STAGES; ++i) {
|
||||
const VkPipelineShaderStageCreateInfo *stage = pStages[i];
|
||||
|
||||
@@ -1753,11 +1755,6 @@ void radv_create_shaders(struct radv_pipeline *pipeline,
|
||||
nir_lower_io_to_scalar_early(nir[i], mask);
|
||||
radv_optimize_nir(nir[i]);
|
||||
}
|
||||
|
||||
if (prev != -1) {
|
||||
nir_compact_varyings(nir[prev], nir[i], true);
|
||||
}
|
||||
prev = i;
|
||||
}
|
||||
|
||||
if (nir[MESA_SHADER_TESS_CTRL]) {
|
||||
|
Reference in New Issue
Block a user