From 7eb459b8ce9ef0775ec770cfc3e3c6af88e84a28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Mon, 8 Dec 2025 13:16:51 -0600 Subject: [PATCH] radv: Don't call nir_link_opt_varyings anymore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The old nir_link_opt_varyings pass is superseded by the new nir_opt_varyings pass. Fossil DB stats on Strix Halo (GFX11.5): Totals from 1293 (1.62% of 79825) affected shaders: MaxWaves: 37136 -> 37148 (+0.03%) Instrs: 989753 -> 989954 (+0.02%); split: -0.07%, +0.09% CodeSize: 5162192 -> 5162744 (+0.01%); split: -0.05%, +0.06% VGPRs: 68304 -> 68400 (+0.14%); split: -0.16%, +0.30% Latency: 7935046 -> 7934604 (-0.01%); split: -0.02%, +0.02% InvThroughput: 1292238 -> 1292393 (+0.01%); split: -0.04%, +0.05% VClause: 16647 -> 16639 (-0.05%); split: -0.06%, +0.01% SClause: 27474 -> 27491 (+0.06%); split: -0.08%, +0.14% Copies: 68827 -> 69131 (+0.44%); split: -0.50%, +0.94% Branches: 19487 -> 19505 (+0.09%) PreSGPRs: 55883 -> 55908 (+0.04%); split: -0.01%, +0.05% PreVGPRs: 47987 -> 48126 (+0.29%); split: -0.00%, +0.29% VALU: 574149 -> 574426 (+0.05%); split: -0.10%, +0.14% SALU: 141793 -> 141738 (-0.04%); split: -0.10%, +0.06% Signed-off-by: Timur Kristóf Reviewed-by: Samuel Pitoiset Reviewed-by: Georg Lehmann --- src/amd/vulkan/radv_pipeline_graphics.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/amd/vulkan/radv_pipeline_graphics.c b/src/amd/vulkan/radv_pipeline_graphics.c index 57ffa5e6b50..6c37d5fde89 100644 --- a/src/amd/vulkan/radv_pipeline_graphics.c +++ b/src/amd/vulkan/radv_pipeline_graphics.c @@ -1342,15 +1342,6 @@ radv_link_shaders(const struct radv_device *device, struct radv_shader_stage *pr if (gfx_state->enable_remove_point_size) radv_remove_point_size(gfx_state, producer, consumer); - if (nir_link_opt_varyings(producer, consumer)) { - nir_validate_shader(producer, "after nir_link_opt_varyings"); - nir_validate_shader(consumer, "after nir_link_opt_varyings"); - - NIR_PASS(_, consumer, nir_opt_constant_folding); - NIR_PASS(_, consumer, nir_opt_algebraic); - NIR_PASS(_, consumer, nir_opt_dce); - } - const bool has_geom_or_tess = consumer->info.stage == MESA_SHADER_GEOMETRY || consumer->info.stage == MESA_SHADER_TESS_CTRL; const bool merged_gs = consumer->info.stage == MESA_SHADER_GEOMETRY && gfx_level >= GFX9;