AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: make lower-level printf helper respect buffer size

Browse Source 
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33067>
This commit is contained in:
Lionel Landwerlin
2025-01-17 16:05:33 +02:00
committed by Marge Bot
parent 58a3ef4160
commit 2603dbd796
1 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/nir/nir_lower_printf.c
+28 -19
View File
@@ -271,28 +271,37 @@ nir_printf_fmt(nir_builder *b,
nir_imm_int(b, args_size + sizeof(uint32_t)),
.atomic_op = nir_atomic_op_iadd);
/* Identifier */
nir_def *identifier =
use_printf_base_identifier ?
nir_iadd_imm(b,
nir_load_printf_base_identifier(b),
b->shader->printf_info_count) :
nir_imm_int(b, b->shader->printf_info_count);
uint32_t total_size = sizeof(uint32_t); /* identifier */
for (unsigned a = 0; a < info->num_args; a++)
total_size += info->arg_sizes[a];
nir_def *store_addr =
nir_iadd(b, buffer_addr, nir_u2uN(b, buffer_offset, buffer_addr->bit_size));
nir_store_global(b, store_addr, 4, identifier, 0x1);
nir_push_if(b, nir_ilt(b, nir_iadd_imm(b, buffer_offset, total_size),
nir_load_printf_buffer_size(b)));
{
/* Identifier */
nir_def *identifier =
use_printf_base_identifier ?
nir_iadd_imm(b,
nir_load_printf_base_identifier(b),
b->shader->printf_info_count) :
nir_imm_int(b, b->shader->printf_info_count);
/* Arguments */
va_start(ap, fmt);
unsigned store_offset = sizeof(uint32_t);
for (unsigned a = 0; a < info->num_args; a++) {
nir_def *def = va_arg(ap, nir_def*);
nir_def *store_addr =
nir_iadd(b, buffer_addr, nir_u2uN(b, buffer_offset, buffer_addr->bit_size));
nir_store_global(b, store_addr, 4, identifier, 0x1);
nir_store_global(b, nir_iadd_imm(b, store_addr, store_offset),
4, def, 0x1);
/* Arguments */
va_start(ap, fmt);
unsigned store_offset = sizeof(uint32_t);
for (unsigned a = 0; a < info->num_args; a++) {
nir_def *def = va_arg(ap, nir_def*);
store_offset += info->arg_sizes[a];
nir_store_global(b, nir_iadd_imm(b, store_addr, store_offset),
4, def, 0x1);
store_offset += info->arg_sizes[a];
}
va_end(ap);
}
va_end(ap);
nir_pop_if(b, NULL);
}