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

radv: split radv_compiler_info's family into debug::family and key::family
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
We used this for two different purposes with different caching
requirements:
- it's always needed for LLVM, and needs to be part of the cache key
- it's needed for disassembly with ACO, and shouldn't be part of the cache
  key

Eventually, we'll want the family to only be part of the cache key if LLVM
is used, but still accessable for when ACO needs the disassembler.

If we put it in radv_compiler_info::debug, we'll need to treat that
specially to hash it into the key when LLVM is used.

If we put it in radv_compiler_info::key, that will hash it into the key
unnecessarily if ACO is used and disassembly might be needed.

So just put the family in both, and use debug::family for disassembly and
key::family for LLVM.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41261>
This commit is contained in:
Rhys Perry 2026-04-29 13:23:47 +01:00 • committed by Marge Bot
parent 7244ecd602
commit fe067b17d9
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/amd/vulkan/radv_device.c
View file

@ -864,8 +864,8 @@ capture_trace(VkQueue _queue)
static void
radv_device_init_cache_key(struct radv_device *device)
{
STATIC_ASSERT(sizeof(device->compiler_info.hw) == 12);
STATIC_ASSERT(sizeof(device->compiler_info.key) == 16);
STATIC_ASSERT(sizeof(device->compiler_info.hw) == 8);
STATIC_ASSERT(sizeof(device->compiler_info.key) == 20);
uint32_t ptr_size = sizeof(void *);
@ -1147,7 +1147,6 @@ radv_device_init_compiler_info(struct radv_device *device)
.ac = &pdev->info.compiler_info,
.hw =
{
.family = pdev->info.family,
.address32_hi = pdev->info.address32_hi,
.address_prt_wa_control_bit = pdev->info.address_prt_wa_control_bit,
.rbplus_allowed = pdev->info.rbplus_allowed,
@ -1190,6 +1189,7 @@ radv_device_init_compiler_info(struct radv_device *device)
.lower_terminate_to_discard = instance->drirc.debug.lower_terminate_to_discard,
.no_implicit_varying_subgroup_size = instance->drirc.debug.no_implicit_varying_subgroup_size,
.force_aniso = device->force_aniso,
.family = pdev->info.family,
/* Wave/subgroup sizes */
.ge_wave_size = pdev->ge_wave_size,
@ -1221,6 +1221,7 @@ radv_device_init_compiler_info(struct radv_device *device)
/* Capture shader statistics when RGP is enabled to correlate shader hashes with Fossilize. */
.capture_shader_stats = (instance->debug_flags & (RADV_DEBUG_DUMP_SHADER_STATS | RADV_DEBUG_PSO_HISTORY)) ||
device->keep_shader_info || (instance->vk.trace_mode & RADV_TRACE_MODE_RGP),
.family = pdev->info.family,
},
.rra_trace = &device->rra_trace,
/* Cache */

4
src/amd/vulkan/radv_shader.c
View file

@ -3278,7 +3278,7 @@ radv_fill_llvm_compiler_options(struct radv_llvm_compiler_options *options,
bool can_dump_shader, bool keep_shader_info)
{
options->compiler_info = compiler_info->ac;
options->family = compiler_info->hw.family;
options->family = compiler_info->key.family;
options->address32_hi = compiler_info->hw.address32_hi;
/* robust_buffer_access_llvm here used by LLVM only, pipeline robustness is not exposed there. */
options->robust_buffer_access = compiler_info->key.robust_buffer_access;
@ -3306,7 +3306,7 @@ radv_aco_fill_compiler_options(struct aco_compiler_options *aco_info, const stru
aco_info->is_opengl = false;
aco_info->optimisations_disabled = stage_key->optimisations_disabled;
aco_info->gfx_level = compiler_info->ac->gfx_level;
aco_info->family = compiler_info->hw.family;
aco_info->family = compiler_info->debug.family;
aco_info->address32_hi = compiler_info->hw.address32_hi;
}

4
src/amd/vulkan/radv_shader.h
View file

@ -505,7 +505,6 @@ struct radv_compiler_info {
const struct ac_compiler_info *ac;
struct {
uint32_t family;
uint32_t address32_hi;
uint32_t rbplus_allowed : 1;
uint32_t address_prt_wa_control_bit : 8;
@ -549,6 +548,8 @@ struct radv_compiler_info {
int32_t force_aniso;
uint32_t family;
/* Wave/subgroup sizes */
uint8_t ge_wave_size;
uint8_t ps_wave_size;
@ -577,6 +578,7 @@ struct radv_compiler_info {
bool keep_shader_info;
bool capture_shaders;
bool capture_shader_stats;
uint32_t family; /* For ACO disassembly only */
} debug;
struct radv_rra_trace_data *rra_trace;