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

nir/serialize: try to put deref->var index into the unused bits of the header

Browse source 
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
This commit is contained in:
Marek Olšák 2019-11-05 17:53:32 -05:00
parent ca201bfe70
commit a0cd67d292
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -99,12 +99,6 @@ write_lookup_object(write_ctx *ctx, const void *obj)
return (uint32_t)(uintptr_t) entry->data;
}
static void
write_object(write_ctx *ctx, const void *obj)
{
blob_write_uint32(ctx->blob, write_lookup_object(ctx, obj));
}
static void
read_add_object(read_ctx *ctx, void *obj)
{
@ -625,10 +619,17 @@ union packed_instr {
unsigned instr_type:4;
unsigned deref_type:3;
unsigned cast_type_same_as_last:1;
unsigned mode:10;
unsigned _pad:6;
unsigned mode:10; /* deref_var redefines this */
unsigned _pad:6; /* deref_var redefines this */
unsigned dest:8;
} deref;
struct {
unsigned instr_type:4;
unsigned deref_type:3;
unsigned _pad:1;
unsigned object_idx:16; /* if 0, the object ID is a separate uint32 */
unsigned dest:8;
} deref_var;
struct {
unsigned instr_type:4;
unsigned intrinsic:9;
@ -857,10 +858,18 @@ write_deref(write_ctx *ctx, const nir_deref_instr *deref)
header.deref.cast_type_same_as_last = deref->type == ctx->last_type;
}
unsigned var_idx = 0;
if (deref->deref_type == nir_deref_type_var) {
var_idx = write_lookup_object(ctx, deref->var);
if (var_idx && var_idx < (1 << 16))
header.deref_var.object_idx = var_idx;
}
write_dest(ctx, &deref->dest, header);
if (deref->deref_type == nir_deref_type_var) {
write_object(ctx, deref->var);
if (!header.deref_var.object_idx)
blob_write_uint32(ctx->blob, var_idx);
return;
}
@ -902,7 +911,11 @@ read_deref(read_ctx *ctx, union packed_instr header)
read_dest(ctx, &deref->dest, &deref->instr, header);
if (deref_type == nir_deref_type_var) {
deref->var = read_object(ctx);
if (header.deref_var.object_idx)
deref->var = read_lookup_object(ctx, header.deref_var.object_idx);
else
deref->var = read_object(ctx);
deref->type = deref->var->type;
deref->mode = deref->var->data.mode;
return deref;