authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-05-29 17:18:23-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-06-10 20:47:56-07:00
logf7177fb8215714f9f22e3f9da0d3c7d3ad58d390
tree21b113788cf614164b11a3f3968543e352080be0
parentf2778f7ca07cdfd599c65185dbcc6a648740fd5d

InternPool: avoid indexToKey recursion for opt_payload

This is a hot function, and recursion makes it more difficult to profile, as well as likely making it more difficult to optimize. Previously, indexToKey for opt_payload would call getAssumeExists() on the optional type. This made it possible to omit the optional type in the encoding of opt_payload. However, getAssumeExists() *must* call indexToKey because of hashing/equality. So, this commit adds the optional type to the opt_payload encoding, which increases its "extra" size from 0 to 8 bytes. As a result, the opt_payload encoding went from not showing up on the top 25 largest tags to...still not showing up in the top 25 largest tags. This also helps make InternPool.typeOf() no longer need to call indexToKey which is another hot function and another source of recursion.

1 files changed, 11 insertions(+), 14 deletions(-)

src/InternPool.zig+11-14
...@@ -1383,7 +1383,7 @@ pub const Index = enum(u32) {...@@ -1383,7 +1383,7 @@ pub const Index = enum(u32) {
1383 ptr_elem: struct { data: *PtrBaseIndex },1383 ptr_elem: struct { data: *PtrBaseIndex },
1384 ptr_field: struct { data: *PtrBaseIndex },1384 ptr_field: struct { data: *PtrBaseIndex },
1385 ptr_slice: struct { data: *PtrSlice },1385 ptr_slice: struct { data: *PtrSlice },
1386 opt_payload: DataIsIndex,1386 opt_payload: struct { data: *TypeValue },
1387 opt_null: DataIsIndex,1387 opt_null: DataIsIndex,
1388 int_u8: struct { data: u8 },1388 int_u8: struct { data: u8 },
1389 int_u16: struct { data: u16 },1389 int_u16: struct { data: u16 },
...@@ -1807,9 +1807,8 @@ pub const Tag = enum(u8) {...@@ -1807,9 +1807,8 @@ pub const Tag = enum(u8) {
1807 /// already contains the slice type corresponding to this payload.1807 /// already contains the slice type corresponding to this payload.
1808 ptr_slice,1808 ptr_slice,
1809 /// An optional value that is non-null.1809 /// An optional value that is non-null.
1810 /// data is Index of the payload value.1810 /// data is extra index of `TypeValue`.
1811 /// In order to use this encoding, one must ensure that the `InternPool`1811 /// The type is the optional type (not the payload type).
1812 /// already contains the optional type corresponding to this payload.
1813 opt_payload,1812 opt_payload,
1814 /// An optional value that is null.1813 /// An optional value that is null.
1815 /// data is Index of the optional type.1814 /// data is Index of the optional type.
...@@ -2577,15 +2576,10 @@ pub fn indexToKey(ip: *const InternPool, index: Index) Key {...@@ -2577,15 +2576,10 @@ pub fn indexToKey(ip: *const InternPool, index: Index) Key {
2577 .val = .none,2576 .val = .none,
2578 } },2577 } },
2579 .opt_payload => {2578 .opt_payload => {
2580 const payload_val = @intToEnum(Index, data);2579 const extra = ip.extraData(TypeValue, data);
2581 // The existence of `opt_payload` guarantees that the optional type will be
2582 // stored in the `InternPool`.
2583 const opt_ty = ip.getAssumeExists(.{
2584 .opt_type = ip.typeOf(payload_val),
2585 });
2586 return .{ .opt = .{2580 return .{ .opt = .{
2587 .ty = opt_ty,2581 .ty = extra.ty,
2588 .val = payload_val,2582 .val = extra.val,
2589 } };2583 } };
2590 },2584 },
2591 .ptr_decl => {2585 .ptr_decl => {
...@@ -3375,7 +3369,10 @@ pub fn get(ip: *InternPool, gpa: Allocator, key: Key) Allocator.Error!Index {...@@ -3375,7 +3369,10 @@ pub fn get(ip: *InternPool, gpa: Allocator, key: Key) Allocator.Error!Index {
3375 .data = @enumToInt(opt.ty),3369 .data = @enumToInt(opt.ty),
3376 } else .{3370 } else .{
3377 .tag = .opt_payload,3371 .tag = .opt_payload,
3378 .data = @enumToInt(opt.val),3372 .data = try ip.addExtra(gpa, TypeValue{
3373 .ty = opt.ty,
3374 .val = opt.val,
3375 }),
3379 });3376 });
3380 },3377 },
33813378
...@@ -4800,7 +4797,7 @@ fn dumpFallible(ip: InternPool, arena: Allocator) anyerror!void {...@@ -4800,7 +4797,7 @@ fn dumpFallible(ip: InternPool, arena: Allocator) anyerror!void {
4800 .ptr_field => @sizeOf(PtrBaseIndex),4797 .ptr_field => @sizeOf(PtrBaseIndex),
4801 .ptr_slice => @sizeOf(PtrSlice),4798 .ptr_slice => @sizeOf(PtrSlice),
4802 .opt_null => 0,4799 .opt_null => 0,
4803 .opt_payload => 0,4800 .opt_payload => @sizeOf(TypeValue),
4804 .int_u8 => 0,4801 .int_u8 => 0,
4805 .int_u16 => 0,4802 .int_u16 => 0,
4806 .int_u32 => 0,4803 .int_u32 => 0,