Skip to content

feat: optimize Cell serialization functions #2836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions dev-docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Language features

- Compiler now generates more efficient code for structure fields serialization: PR [#2836](https://github.com/tact-lang/tact/pull/2836)

### Release contributors

- [Petr Makhnev](https://github.com/i582)

## [1.6.6] - 2025-04-16

### Language features
Expand Down
8 changes: 8 additions & 0 deletions src/benchmarks/escrow/results_code_size.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,14 @@
"cells": "21",
"bits": "11727"
}
},
{
"label": "1.6.6 with optimized builder storage",
"pr": "https://github.com/tact-lang/tact/pull/2836",
"size": {
"cells": "20",
"bits": "11647"
}
}
]
}
10 changes: 10 additions & 0 deletions src/benchmarks/escrow/results_gas.json
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,16 @@
"approveTon": "6738",
"cancelTon": "4639"
}
},
{
"label": "1.6.6 with optimized builder storage",
"pr": "https://github.com/tact-lang/tact/pull/2836",
"gas": {
"fundingTon": "4363",
"changeCode": "4454",
"approveTon": "6738",
"cancelTon": "4639"
}
}
]
}
10 changes: 10 additions & 0 deletions src/benchmarks/nft/results_code_size.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,16 @@
"item cells": "12",
"item bits": "6530"
}
},
{
"label": "1.6.6 with optimized builder storage",
"pr": "https://github.com/tact-lang/tact/pull/2836",
"size": {
"collection cells": "43",
"collection bits": "22386",
"item cells": "12",
"item bits": "6530"
}
}
]
}
10 changes: 10 additions & 0 deletions src/benchmarks/nft/results_gas.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,16 @@
"deploy nft": "11328",
"batch deploy nft": "661073"
}
},
{
"label": "1.6.6 with optimized builder storage",
"pr": "https://github.com/tact-lang/tact/pull/2836",
"gas": {
"transfer": "7634",
"get static data": "5763",
"deploy nft": "10651",
"batch deploy nft": "660506"
}
}
]
}
8 changes: 8 additions & 0 deletions src/benchmarks/sbt/results_code_size.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@
"item cells": "22",
"item bits": "12899"
}
},
{
"label": "1.6.6 with optimized builder storage",
"pr": "https://github.com/tact-lang/tact/pull/2836",
"size": {
"item cells": "22",
"item bits": "12803"
}
}
]
}
13 changes: 13 additions & 0 deletions src/benchmarks/sbt/results_gas.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,19 @@
"revoke": "5253",
"take excess": "8132"
}
},
{
"label": "1.6.6 with optimized builder storage",
"pr": "https://github.com/tact-lang/tact/pull/2836",
"gas": {
"deploy": "4841",
"request owner": "7302",
"prove ownership": "7600",
"get static data": "7267",
"destroy": "7760",
"revoke": "5217",
"take excess": "8096"
}
}
]
}
2 changes: 1 addition & 1 deletion src/generator/writers/writeContract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ export function writeInit(
t.dependsOn.length > 0
) {
ctx.append(
`b = b.store_ref(begin_cell().store_dict(contracts).end_cell());`,
`b = b.store_builder_ref(begin_cell().store_dict(contracts));`,
);
}
}
Expand Down
14 changes: 7 additions & 7 deletions src/generator/writers/writeSerialization.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ function writeSerializerCell(
ctx.append(`var build_${gen + 1} = begin_cell();`);
writeSerializerCell(cell.next, gen + 1, ctx);
ctx.append(
`build_${gen} = store_ref(build_${gen}, build_${gen + 1}.end_cell());`,
`build_${gen} = store_builder_ref(build_${gen}, build_${gen + 1});`,
);
}
}
Expand Down Expand Up @@ -219,11 +219,11 @@ function writeSerializerField(
{
if (op.optional) {
ctx.append(
`build_${gen} = ~ null?(${fieldName}) ? build_${gen}.store_int(true, 1).store_ref(begin_cell().store_slice(${fieldName}).end_cell()) : build_${gen}.store_int(false, 1);`,
`build_${gen} = build_${gen}.store_maybe_ref(begin_cell().store_slice(${fieldName}).end_cell());`,
);
} else {
ctx.append(
`build_${gen} = build_${gen}.store_ref(begin_cell().store_slice(${fieldName}).end_cell());`,
`build_${gen} = build_${gen}.store_builder_ref(begin_cell().store_slice(${fieldName}));`,
);
}
}
Expand All @@ -245,11 +245,11 @@ function writeSerializerField(
{
if (op.optional) {
ctx.append(
`build_${gen} = ~ null?(${fieldName}) ? build_${gen}.store_int(true, 1).store_ref(begin_cell().store_slice(${fieldName}.end_cell().begin_parse()).end_cell()) : build_${gen}.store_int(false, 1);`,
`build_${gen} = build_${gen}.store_maybe_ref(begin_cell().store_slice(${fieldName}).end_cell());`,
);
} else {
ctx.append(
`build_${gen} = build_${gen}.store_ref(begin_cell().store_slice(${fieldName}.end_cell().begin_parse()).end_cell());`,
`build_${gen} = build_${gen}.store_builder_ref(${fieldName});`,
);
}
}
Expand All @@ -268,11 +268,11 @@ function writeSerializerField(
case "string": {
if (op.optional) {
ctx.append(
`build_${gen} = ~ null?(${fieldName}) ? build_${gen}.store_int(true, 1).store_ref(begin_cell().store_slice(${fieldName}).end_cell()) : build_${gen}.store_int(false, 1);`,
`build_${gen} = build_${gen}.store_maybe_ref(begin_cell().store_slice(${fieldName}).end_cell());`,
);
} else {
ctx.append(
`build_${gen} = build_${gen}.store_ref(begin_cell().store_slice(${fieldName}).end_cell());`,
`build_${gen} = build_${gen}.store_builder_ref(begin_cell().store_slice(${fieldName}));`,
);
}
return;
Expand Down
34 changes: 17 additions & 17 deletions src/stdlib/stdlib.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2459,23 +2459,23 @@ files["std/stdlib.fc"] =
"OwoKOzs7IENoZWNrcyB3aGV0aGVyIHRoZSBkYXRhIHBhcnRzIG9mIHR3byBzbGljZXMgY29pbnNpZGUKaW50IGVxdWFsX3NsaWNlc19iaXRzKHNsaWNlIGEsIHNsaWNl" +
"IGIpIGFzbSAiU0RFUSI7Cjs7OyBDaGVja3Mgd2hldGhlciBiIGlzIGEgbnVsbC4gTm90ZSwgdGhhdCBGdW5DIGFsc28gaGFzIHBvbHltb3JwaGljIG51bGw/IGJ1aWx0" +
"LWluLgppbnQgYnVpbGRlcl9udWxsPyhidWlsZGVyIGIpIGFzbSAiSVNOVUxMIjsKOzs7IENvbmNhdGVuYXRlcyB0d28gYnVpbGRlcnMKYnVpbGRlciBzdG9yZV9idWls" +
"ZGVyKGJ1aWxkZXIgdG8sIGJ1aWxkZXIgZnJvbSkgYXNtICJTVEJSIjsKCjs7IENVU1RPTToKCjs7IFRWTSBVUEdSQURFIDIwMjMtMDcgaHR0cHM6Ly9kb2NzLnRvbi5v" +
"cmcvbGVhcm4vdHZtLWluc3RydWN0aW9ucy90dm0tdXBncmFkZS0yMDIzLTA3Cjs7IEluIG1haW5uZXQgc2luY2UgMjAgRGVjIDIwMjMgaHR0cHM6Ly90Lm1lL3RvbmJs" +
"b2NrY2hhaW4vMjI2Cgo7OzsgUmV0cmlldmVzIGNvZGUgb2Ygc21hcnQtY29udHJhY3QgZnJvbSBjNwpjZWxsIG15X2NvZGUoKSBhc20gIk1ZQ09ERSI7Cgo7OzsgQ3Jl" +
"YXRlcyBhbiBvdXRwdXQgYWN0aW9uIGFuZCByZXR1cm5zIGEgZmVlIGZvciBjcmVhdGluZyBhIG1lc3NhZ2UuIE1vZGUgaGFzIHRoZSBzYW1lIGVmZmVjdCBhcyBpbiB0" +
"aGUgY2FzZSBvZiBTRU5EUkFXTVNHCmludCBzZW5kX21lc3NhZ2UoY2VsbCBtc2csIGludCBtb2RlKSBpbXB1cmUgYXNtICJTRU5ETVNHIjsKCmludCBnYXNfY29uc3Vt" +
"ZWQoKSBhc20gIkdBU0NPTlNVTUVEIjsKCjs7IFRWTSBWNiBodHRwczovL2dpdGh1Yi5jb20vdG9uLWJsb2NrY2hhaW4vdG9uL2Jsb2IvdGVzdG5ldC9kb2MvR2xvYmFs" +
"VmVyc2lvbnMubWQjdmVyc2lvbi02CgppbnQgZ2V0X2NvbXB1dGVfZmVlKGludCB3b3JrY2hhaW4sIGludCBnYXNfdXNlZCkgYXNtKGdhc191c2VkIHdvcmtjaGFpbikg" +
"IkdFVEdBU0ZFRSI7CmludCBnZXRfc3RvcmFnZV9mZWUoaW50IHdvcmtjaGFpbiwgaW50IHNlY29uZHMsIGludCBiaXRzLCBpbnQgY2VsbHMpIGFzbShjZWxscyBiaXRz" +
"IHNlY29uZHMgd29ya2NoYWluKSAiR0VUU1RPUkFHRUZFRSI7CmludCBnZXRfZm9yd2FyZF9mZWUoaW50IHdvcmtjaGFpbiwgaW50IGJpdHMsIGludCBjZWxscykgYXNt" +
"KGNlbGxzIGJpdHMgd29ya2NoYWluKSAiR0VURk9SV0FSREZFRSI7CmludCBnZXRfcHJlY29tcGlsZWRfZ2FzX2NvbnN1bXB0aW9uKCkgYXNtICJHRVRQUkVDT01QSUxF" +
"REdBUyI7CgppbnQgZ2V0X3NpbXBsZV9jb21wdXRlX2ZlZShpbnQgd29ya2NoYWluLCBpbnQgZ2FzX3VzZWQpIGFzbShnYXNfdXNlZCB3b3JrY2hhaW4pICJHRVRHQVNG" +
"RUVTSU1QTEUiOwppbnQgZ2V0X3NpbXBsZV9mb3J3YXJkX2ZlZShpbnQgd29ya2NoYWluLCBpbnQgYml0cywgaW50IGNlbGxzKSBhc20oY2VsbHMgYml0cyB3b3JrY2hh" +
"aW4pICJHRVRGT1JXQVJERkVFU0lNUExFIjsKaW50IGdldF9vcmlnaW5hbF9md2RfZmVlKGludCB3b3JrY2hhaW4sIGludCBmd2RfZmVlKSBhc20oZndkX2ZlZSB3b3Jr" +
"Y2hhaW4pICJHRVRPUklHSU5BTEZXREZFRSI7CmludCBteV9zdG9yYWdlX2R1ZSgpIGFzbSAiRFVFUEFZTUVOVCI7Cgp0dXBsZSBnZXRfZmVlX2NvbmZpZ3MoKSBhc20g" +
"IlVOUEFDS0VEQ09ORklHVFVQTEUiOwoKOzs7IFF1aWV0IHZlcnNpb25zIG9mIH5sb2FkX3VpbnQuIFJldHVybnMgKG51bGwsIDApIGlmIGxvYWQgaGFzIGZhaWxlZCBh" +
"bmQgKHgsIC0xKSBvbiBzdWNjZXNzCihzbGljZSwgKGludCwgaW50KSkgfmxvYWRfdWludF9xdWlldChzbGljZSBzLCBpbnQgbGVuKSBhc20oIC0+IDEgMCAyKSAiTERV" +
"WFEgTlVMTFJPVFJJRk5PVCI7";
"ZGVyKGJ1aWxkZXIgdG8sIGJ1aWxkZXIgZnJvbSkgYXNtICJTVEJSIjsKYnVpbGRlciBzdG9yZV9idWlsZGVyX3JlZihidWlsZGVyIHRvLCBidWlsZGVyIGZyb20pIGFz" +
"bSAiU1RCUkVGUiI7Cgo7OyBDVVNUT006Cgo7OyBUVk0gVVBHUkFERSAyMDIzLTA3IGh0dHBzOi8vZG9jcy50b24ub3JnL2xlYXJuL3R2bS1pbnN0cnVjdGlvbnMvdHZt" +
"LXVwZ3JhZGUtMjAyMy0wNwo7OyBJbiBtYWlubmV0IHNpbmNlIDIwIERlYyAyMDIzIGh0dHBzOi8vdC5tZS90b25ibG9ja2NoYWluLzIyNgoKOzs7IFJldHJpZXZlcyBj" +
"b2RlIG9mIHNtYXJ0LWNvbnRyYWN0IGZyb20gYzcKY2VsbCBteV9jb2RlKCkgYXNtICJNWUNPREUiOwoKOzs7IENyZWF0ZXMgYW4gb3V0cHV0IGFjdGlvbiBhbmQgcmV0" +
"dXJucyBhIGZlZSBmb3IgY3JlYXRpbmcgYSBtZXNzYWdlLiBNb2RlIGhhcyB0aGUgc2FtZSBlZmZlY3QgYXMgaW4gdGhlIGNhc2Ugb2YgU0VORFJBV01TRwppbnQgc2Vu" +
"ZF9tZXNzYWdlKGNlbGwgbXNnLCBpbnQgbW9kZSkgaW1wdXJlIGFzbSAiU0VORE1TRyI7CgppbnQgZ2FzX2NvbnN1bWVkKCkgYXNtICJHQVNDT05TVU1FRCI7Cgo7OyBU" +
"Vk0gVjYgaHR0cHM6Ly9naXRodWIuY29tL3Rvbi1ibG9ja2NoYWluL3Rvbi9ibG9iL3Rlc3RuZXQvZG9jL0dsb2JhbFZlcnNpb25zLm1kI3ZlcnNpb24tNgoKaW50IGdl" +
"dF9jb21wdXRlX2ZlZShpbnQgd29ya2NoYWluLCBpbnQgZ2FzX3VzZWQpIGFzbShnYXNfdXNlZCB3b3JrY2hhaW4pICJHRVRHQVNGRUUiOwppbnQgZ2V0X3N0b3JhZ2Vf" +
"ZmVlKGludCB3b3JrY2hhaW4sIGludCBzZWNvbmRzLCBpbnQgYml0cywgaW50IGNlbGxzKSBhc20oY2VsbHMgYml0cyBzZWNvbmRzIHdvcmtjaGFpbikgIkdFVFNUT1JB" +
"R0VGRUUiOwppbnQgZ2V0X2ZvcndhcmRfZmVlKGludCB3b3JrY2hhaW4sIGludCBiaXRzLCBpbnQgY2VsbHMpIGFzbShjZWxscyBiaXRzIHdvcmtjaGFpbikgIkdFVEZP" +
"UldBUkRGRUUiOwppbnQgZ2V0X3ByZWNvbXBpbGVkX2dhc19jb25zdW1wdGlvbigpIGFzbSAiR0VUUFJFQ09NUElMRURHQVMiOwoKaW50IGdldF9zaW1wbGVfY29tcHV0" +
"ZV9mZWUoaW50IHdvcmtjaGFpbiwgaW50IGdhc191c2VkKSBhc20oZ2FzX3VzZWQgd29ya2NoYWluKSAiR0VUR0FTRkVFU0lNUExFIjsKaW50IGdldF9zaW1wbGVfZm9y" +
"d2FyZF9mZWUoaW50IHdvcmtjaGFpbiwgaW50IGJpdHMsIGludCBjZWxscykgYXNtKGNlbGxzIGJpdHMgd29ya2NoYWluKSAiR0VURk9SV0FSREZFRVNJTVBMRSI7Cmlu" +
"dCBnZXRfb3JpZ2luYWxfZndkX2ZlZShpbnQgd29ya2NoYWluLCBpbnQgZndkX2ZlZSkgYXNtKGZ3ZF9mZWUgd29ya2NoYWluKSAiR0VUT1JJR0lOQUxGV0RGRUUiOwpp" +
"bnQgbXlfc3RvcmFnZV9kdWUoKSBhc20gIkRVRVBBWU1FTlQiOwoKdHVwbGUgZ2V0X2ZlZV9jb25maWdzKCkgYXNtICJVTlBBQ0tFRENPTkZJR1RVUExFIjsKCjs7OyBR" +
"dWlldCB2ZXJzaW9ucyBvZiB+bG9hZF91aW50LiBSZXR1cm5zIChudWxsLCAwKSBpZiBsb2FkIGhhcyBmYWlsZWQgYW5kICh4LCAtMSkgb24gc3VjY2Vzcwooc2xpY2Us" +
"IChpbnQsIGludCkpIH5sb2FkX3VpbnRfcXVpZXQoc2xpY2UgcywgaW50IGxlbikgYXNtKCAtPiAxIDAgMikgIkxEVVhRIE5VTExST1RSSUZOT1QiOwo=";
files["std/stdlib.tact"] =
"aW1wb3J0ICIuL2ludGVybmFsL2V4aXQtY29kZXMiOwppbXBvcnQgIi4vaW50ZXJuYWwvcHJpbWl0aXZlcyI7CmltcG9ydCAiLi9pbnRlcm5hbC9jZWxscyI7CmltcG9y" +
"dCAiLi9pbnRlcm5hbC9jcnlwdG8iOwppbXBvcnQgIi4vaW50ZXJuYWwvdGV4dCI7CmltcG9ydCAiLi9pbnRlcm5hbC9tYXRoIjsKaW1wb3J0ICIuL2ludGVybmFsL2Nv" +
Expand Down
3 changes: 2 additions & 1 deletion src/stdlib/stdlib/std/stdlib.fc
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,7 @@ int equal_slices_bits(slice a, slice b) asm "SDEQ";
int builder_null?(builder b) asm "ISNULL";
;;; Concatenates two builders
builder store_builder(builder to, builder from) asm "STBR";
builder store_builder_ref(builder to, builder from) asm "STBREFR";

;; CUSTOM:

Expand Down Expand Up @@ -699,4 +700,4 @@ int my_storage_due() asm "DUEPAYMENT";
tuple get_fee_configs() asm "UNPACKEDCONFIGTUPLE";

;;; Quiet versions of ~load_uint. Returns (null, 0) if load has failed and (x, -1) on success
(slice, (int, int)) ~load_uint_quiet(slice s, int len) asm( -> 1 0 2) "LDUXQ NULLROTRIFNOT";
(slice, (int, int)) ~load_uint_quiet(slice s, int len) asm( -> 1 0 2) "LDUXQ NULLROTRIFNOT";