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

radeonsi: generate unique shader name in si_get_nir_shader

Browse source 
This function modifies the NIR shader, so when using NIR_DEBUG=print and
nir_viewer all the variants are displayed using the original name.

With this change, we get the original shader (eg: GLSL3), and then each
variant gets its own name (GLSL3-xxxxxxxx) - and is displayed in its
own tab in nir_viewer.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16247>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2022-04-29 16:40:09 +02:00 • committed by Marge Bot
parent f1f2d407e7
commit 6ee9e6ce87
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gallium/drivers/radeonsi/si_shader.c
View file

@ -28,6 +28,7 @@
#include "nir_builder.h"
#include "nir_serialize.h"
#include "nir/nir_helpers.h"
#include "ralloc.h"
#include "si_pipe.h"
#include "si_shader_internal.h"
#include "sid.h"
@ -1480,6 +1481,17 @@ struct nir_shader *si_get_nir_shader(struct si_shader_selector *sel,
bool progress = false;
const char *original_name = NULL;
if (unlikely(should_print_nir(nir))) {
/* Modify the shader's name so that each variant gets its own name. */
original_name = ralloc_strdup(nir, nir->info.name);
ralloc_asprintf_append((char **)&nir->info.name, "-%08x", _mesa_hash_data(key, sizeof(*key)));
/* Dummy pass to get the starting point. */
printf("nir_dummy_pass\n");
nir_print_shader(nir, stdout);
}
/* Kill outputs according to the shader key. */
if (sel->stage <= MESA_SHADER_GEOMETRY)
NIR_PASS(progress, nir, si_nir_kill_outputs, key);
@ -1568,6 +1580,11 @@ struct nir_shader *si_get_nir_shader(struct si_shader_selector *sel,
*/
NIR_PASS_V(nir, nir_group_loads, nir_group_same_resource_only, 200);
if (unlikely(original_name)) {
ralloc_free((void*)nir->info.name);
nir->info.name = original_name;
}
return nir;
}