some IR compression improvements #28104
Conversation
src/dump.c
Outdated
| jl_serialize_value(s, jl_globalref_mod(v)); | ||
| jl_serialize_value(s, jl_globalref_name(v)); | ||
| } | ||
| } | ||
| else if (jl_is_ssavalue(v) && ((jl_ssavalue_t*)v)->id < 256) { |
src/dump.c
Outdated
| else if (jl_is_ssavalue(v) && ((jl_ssavalue_t*)v)->id < 65536) { | ||
| writetag(s->s, (jl_value_t*)jl_ssavalue_type); | ||
| write_uint8(s->s, TAG_LONG_SSAVALUE); | ||
| write_uint16(s->s, ((jl_ssavalue_t*)v)->id); | ||
| } | ||
| else if (jl_typeis(v, jl_slotnumber_type) && jl_slot_number(v) < 65536) { |
There was a problem hiding this comment.
jl_slot_number is a signed type
| jl_serialize_value(s, jl_exprarg(e, 1)); | ||
| jl_serialize_value(s, jl_exprarg(e, 2)); | ||
| return; | ||
| } |
There was a problem hiding this comment.
Do we need TAG_CALL0 and TAG_INVOKE{0...2} also?
There was a problem hiding this comment.
We could, but I found call1 and call2 covered about 85% of cases.
| write_uint8(s->s, TAG_GOTONODE); | ||
| jl_serialize_value(s, jl_get_nth_field(v, 0)); | ||
| } | ||
| else if (jl_is_quotenode(v)) { |
There was a problem hiding this comment.
Perhaps should have && (jl_isbits(v.value) || !is_ast_node(v.value)) here?
There was a problem hiding this comment.
I don't think that's necessary, since all this really does is shorten the object header for a QuoteNode.
There was a problem hiding this comment.
It makes sure that the field doesn't have a special representation (which could end up creating (non-egal) copies of the supposed-to-be-constant object in the AST)
There was a problem hiding this comment.
Ah --- that check would have to be added in is_ast_node. At this point we're definitely serializing it either way.
There was a problem hiding this comment.
Wait, that still doesn't matter since the value will be recursively checked for is_ast_node anyway.
src/dump.c
Outdated
| @@ -800,23 +887,39 @@ static void jl_serialize_value_(jl_serializer_state *s, jl_value_t *v, int as_li | |||
| } | |||
| else if (jl_typeis(v, jl_int64_type)) { | |||
| void *data = jl_data_ptr(v); | |||
| if (*(int64_t*)data >= S32_MIN && *(int64_t*)data <= S32_MAX) { | |||
| writetag(s->s, (jl_value_t*)SmallInt64_tag); | |||
| if (*(int64_t*)data >= -32768 && *(int64_t*)data <= 32767) { | |||
There was a problem hiding this comment.
Use INT16_MIN (C99 standard)?
src/dump.c
Outdated
| writetag(s->s, (jl_value_t*)jl_int32_type); | ||
| write_int32(s->s, *(int32_t*)jl_data_ptr(v)); | ||
| void *data = jl_data_ptr(v); | ||
| if (*(int64_t*)data >= -32768 && *(int64_t*)data <= 32767) { |
There was a problem hiding this comment.
Ouch, good catch.
src/dump.c
Outdated
| } | ||
| else if (vtag == (jl_value_t*)CommonSym_tag) { | ||
| assert(!ios_eof(s->s)); | ||
| jl_value_t *v; size_t i, n; |
There was a problem hiding this comment.
why are these on the same line?
src/dump.c
Outdated
| case 0: | ||
| tag = read_uint8(s->s); | ||
| return deser_tag[tag]; | ||
| case TAG_BACKREF: case TAG_SHORT_BACKREF: |
There was a problem hiding this comment.
put JL_FALLTHROUGH; between these
src/dump.c
Outdated
| assert(vtag == (jl_value_t*)jl_datatype_type || vtag == (jl_value_t*)SmallDataType_tag); | ||
| return jl_deserialize_value_any(s, vtag, loc); | ||
| case TAG_LINEINFO: | ||
| v = jl_gc_alloc(s->ptls, jl_lineinfonode_type->size, jl_lineinfonode_type); |
There was a problem hiding this comment.
v = jl_new_struct_uninit(jl_lineinfonode_type) (or at least jl_datatype_size(jl_lineinfonode_type), I think)
| void **bp = ptrhash_bp(&ser_tag, v); | ||
| if (*bp != HT_NOTFOUND) { | ||
| write_as_tag(s->s, (uint8_t)(intptr_t)*bp); | ||
| void *tag = ptrhash_get(&ser_tag, v); |
There was a problem hiding this comment.
If this is performance-sensitive at all, I think we could guard it these ptrhash_get with ((jl_datatype_t*)jl_typeof(ser_tag))->name->module == jl_core_module I'm not sure that would make any difference however, but just an idea.
also clean up and re-structure dump.c code a bit
06812c8
to
7768b2c
Compare
This takes another ~15MB off the system image, and simplifies the structure of the deserialization code.