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

nir/lower_printf: use unsigned math

Browse source 
negative offsets/sizes don't make sense, and zero-extension is often easier
to optimize/lower than sign-extension.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32564>
This commit is contained in:
Alyssa Rosenzweig 2024-12-06 10:57:36 -05:00 • committed by Marge Bot
parent 8db0751eb8
commit da967416db
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/compiler/nir/nir_lower_printf.c
View file

@ -112,13 +112,15 @@ lower_printf_intrin(nir_builder *b, nir_intrinsic_instr *prntf, void *_options)
unsigned buffer_size = (options && options->max_buffer_size) ? options->max_buffer_size : default_buffer_size;
int max_valid_offset =
buffer_size - args_size - fmt_str_id_size - counter_size;
nir_push_if(b, nir_ilt_imm(b, offset, max_valid_offset));
assert(max_valid_offset >= 0 && "printf buffer must be sufficiently large");
nir_push_if(b, nir_ult_imm(b, offset, max_valid_offset));
nir_def *printf_succ_val = nir_imm_int(b, 0);
/* Write the format string ID */
nir_def *fmt_str_id_offset =
nir_i2iN(b, offset, ptr_bit_size);
nir_u2uN(b, offset, ptr_bit_size);
nir_deref_instr *fmt_str_id_deref =
nir_build_deref_array(b, buffer, fmt_str_id_offset);
fmt_str_id_deref = nir_build_deref_cast(b, &fmt_str_id_deref->def,
@ -135,7 +137,7 @@ lower_printf_intrin(nir_builder *b, nir_intrinsic_instr *prntf, void *_options)
unsigned field_offset = glsl_get_struct_field_offset(args->type, i);
nir_def *arg_offset =
nir_i2iN(b, nir_iadd_imm(b, offset, fmt_str_id_size + field_offset),
nir_u2uN(b, nir_iadd_imm(b, offset, fmt_str_id_size + field_offset),
ptr_bit_size);
nir_deref_instr *dst_arg_deref =
nir_build_deref_array(b, buffer, arg_offset);
@ -239,8 +241,7 @@ nir_printf_fmt(nir_builder *b,
nir_imm_int(b, b->shader->printf_info_count);
nir_def *store_addr =
nir_iadd(b, buffer_addr, nir_i2iN(b, buffer_offset,
buffer_addr->bit_size));
nir_iadd(b, buffer_addr, nir_u2uN(b, buffer_offset, buffer_addr->bit_size));
nir_store_global(b, store_addr, 4, identifier, 0x1);
/* Arguments */