fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 02:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir: make printf_info (de)serializer available

Browse source 
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26505>
This commit is contained in:
Lionel Landwerlin 2023-10-19 16:04:50 +03:00 • committed by Marge Bot
parent 751e919c33
commit 603f039708
2 changed files with 54 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/compiler/nir/nir_serialize.c
View file

@ -2024,20 +2024,8 @@ nir_serialize(struct blob *blob, const nir_shader *nir, bool strip)
write_xfb_info(&ctx, nir->xfb_info);
if (nir->info.stage == MESA_SHADER_KERNEL) {
blob_write_uint32(blob, nir->printf_info_count);
for (int i = 0; i < nir->printf_info_count; i++) {
u_printf_info *info = &nir->printf_info[i];
blob_write_uint32(blob, info->num_args);
blob_write_uint32(blob, info->string_size);
blob_write_bytes(blob, info->arg_sizes,
info->num_args * sizeof(*info->arg_sizes));
/* we can't use blob_write_string, because it contains multiple NULL
* terminated strings */
blob_write_bytes(blob, info->strings,
info->string_size * sizeof(*info->strings));
}
}
if (nir->info.stage == MESA_SHADER_KERNEL)
nir_serialize_printf_info(blob, nir->printf_info, nir->printf_info_count);
blob_overwrite_uint32(blob, idx_size_offset, ctx.next_idx);
@ -2097,21 +2085,9 @@ nir_deserialize(void *mem_ctx,
ctx.nir->xfb_info = read_xfb_info(&ctx);
if (ctx.nir->info.stage == MESA_SHADER_KERNEL) {
ctx.nir->printf_info_count = blob_read_uint32(blob);
ctx.nir->printf_info =
ralloc_array(ctx.nir, u_printf_info, ctx.nir->printf_info_count);
for (int i = 0; i < ctx.nir->printf_info_count; i++) {
u_printf_info *info = &ctx.nir->printf_info[i];
info->num_args = blob_read_uint32(blob);
info->string_size = blob_read_uint32(blob);
info->arg_sizes = ralloc_array(ctx.nir, unsigned, info->num_args);
blob_copy_bytes(blob, info->arg_sizes,
info->num_args * sizeof(*info->arg_sizes));
info->strings = ralloc_array(ctx.nir, char, info->string_size);
blob_copy_bytes(blob, info->strings,
info->string_size * sizeof(*info->strings));
}
nir_deserialize_printf_info(ctx.nir, blob,
&ctx.nir->printf_info_count);
}
free(ctx.idx_table);
@ -2146,3 +2122,45 @@ nir_shader_serialize_deserialize(nir_shader *shader)
nir_shader_replace(shader, copy);
ralloc_free(dead_ctx);
}
void
nir_serialize_printf_info(struct blob *blob,
const u_printf_info *printf_info,
unsigned printf_info_count)
{
blob_write_uint32(blob, printf_info_count);
for (int i = 0; i < printf_info_count; i++) {
const u_printf_info *info = &printf_info[i];
blob_write_uint32(blob, info->num_args);
blob_write_uint32(blob, info->string_size);
blob_write_bytes(blob, info->arg_sizes,
info->num_args * sizeof(info->arg_sizes[0]));
/* we can't use blob_write_string, because it contains multiple NULL
* terminated strings */
blob_write_bytes(blob, info->strings, info->string_size);
}
}
u_printf_info *
nir_deserialize_printf_info(void *mem_ctx,
struct blob_reader *blob,
unsigned *printf_info_count)
{
*printf_info_count = blob_read_uint32(blob);
u_printf_info *printf_info =
ralloc_array(mem_ctx, u_printf_info, *printf_info_count);
for (int i = 0; i < *printf_info_count; i++) {
u_printf_info *info = &printf_info[i];
info->num_args = blob_read_uint32(blob);
info->string_size = blob_read_uint32(blob);
info->arg_sizes = ralloc_array(mem_ctx, unsigned, info->num_args);
blob_copy_bytes(blob, info->arg_sizes,
info->num_args * sizeof(info->arg_sizes[0]));
info->strings = ralloc_array(mem_ctx, char, info->string_size);
blob_copy_bytes(blob, info->strings, info->string_size);
}
return printf_info;
}

8
src/compiler/nir/nir_serialize.h
View file

@ -31,6 +31,14 @@
extern "C" {
#endif
void nir_serialize_printf_info(struct blob *blob,
const u_printf_info *info,
unsigned printf_info_count);
u_printf_info *nir_deserialize_printf_info(void *mem_ctx,
struct blob_reader *blob,
unsigned *printf_info_count);
void nir_serialize(struct blob *blob, const nir_shader *nir, bool strip);
nir_shader *nir_deserialize(void *mem_ctx,
const struct nir_shader_compiler_options *options,