Skip to content

Improve constant propagate #7722

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.

Sign up for GitHub

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

Draft
xunilrj wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

Improve constant propagate #7722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bb65ca2
stop clearing know values map for memory instructions
xunilrj Aug 26, 2026
8f69252
MCL and MCLI also included
xunilrj Aug 26, 2026
d1e9f5a
also including MEQ
xunilrj Aug 26, 2026
95bbcaf
include wide operators
xunilrj Aug 26, 2026
56d120c
explicit adding all other instructions
xunilrj Aug 26, 2026
27b74d0
update tests
xunilrj Aug 26, 2026
9d47e7c
update tests
xunilrj Aug 26, 2026
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
427 changes: 423 additions & 4 deletions sway-core/src/asm_generation/fuel/optimizations/constant_propagate.rs
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions sway-core/src/asm_lang/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,17 @@ impl Op {
}
}

pub(crate) fn call(label: Label) -> Self {
Op {
opcode: Either::Right(OrganizationalOp::Jump {
to: label,
type_: JumpType::Call,
}),
comment: String::new(),
owning_span: None,
}
}

pub(crate) fn jump_to_label_comment(label: Label, comment: impl Into<String>) -> Self {
Op {
opcode: Either::Right(OrganizationalOp::Jump {
Expand Down
103 changes: 50 additions & 53 deletions test/src/e2e_vm_tests/test_programs/should_pass/language/array/array_repeat/stdout.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,9 +424,9 @@ eq $r2 $r2 $zero
jnzf $r2 $zero i1
jmpf $zero i6
move $$arg0 $r0 ; [call: log_45]: pass argument 0
jal $$reta $pc i119 ; [call: log_45]: call function
jal $$reta $pc i118 ; [call: log_45]: call function
movi $$arg0 i255 ; [call: log_45]: pass argument 0
jal $$reta $pc i117 ; [call: log_45]: call function
jal $$reta $pc i116 ; [call: log_45]: call function
load $r0 data_NonConfigurable_0; load constant from data section
rvrt $r0
cfsi i264920 ; [fn end: main_0] free: locals 264920 byte(s), call args 0 slot(s)
Expand Down Expand Up @@ -514,7 +514,7 @@ sb $r0 $r3 i0 ; store byte
addi $r3 $$locbase i24 ; get offset to local __ptr slice
move $$arg0 $r0 ; [call: to_slice_20]: pass argument 0
move $$arg1 $r3 ; [call: to_slice_20]: pass argument 1
jal $$reta $pc i18 ; [call: to_slice_20]: call function
jal $$reta $pc i17 ; [call: to_slice_20]: call function
addi $r0 $$locbase i72 ; get offset to local __ptr slice
mcpi $r0 $r3 i16 ; copy memory
addi $r3 $$locbase i56 ; get offset to local __ptr slice
Expand All @@ -523,9 +523,8 @@ addi $r3 $$locbase i40 ; get offset to local __ptr slice
mcpi $r3 $r0 i16 ; copy memory
mcpi $$locbase $r0 i16 ; copy memory
lw $r0 $$locbase i0 ; load word
movi $r3 i1 ; copy ASM block argument's constant initial value to register
aloc $one ; aloc size
mcp $hp $r0 $r3 ; mcp hp src size
mcp $hp $r0 $one ; mcp hp src size
lb $r0 $hp i0 ; load byte
sb $r1 $r0 i0 ; store byte
cfsi i88 ; [fn end: decode_array_19] free: locals 88 byte(s), call args 0 slot(s)
Expand Down Expand Up @@ -569,7 +568,7 @@ data_NonConfigurable_2 .word 14454674236531057292

0x00000000 MOVE R60 $pc ;; [26, 240, 48, 0]
0x00000004 JMPF $zero 0x4 ;; [116, 0, 0, 4]
0x00000008 ;; [0, 0, 0, 0, 0, 0, 3, 152]
0x00000008 ;; [0, 0, 0, 0, 0, 0, 3, 144]
0x00000010 ;; [0, 0, 0, 0, 0, 0, 0, 0]
0x00000018 LW R63 R60 0x1 ;; [93, 255, 192, 1]
0x0000001c ADD R63 R63 R60 ;; [16, 255, 255, 0]
Expand Down Expand Up @@ -659,9 +658,9 @@ data_NonConfigurable_2 .word 14454674236531057292
0x0000016c JNZF R50 $zero 0x1 ;; [118, 200, 0, 1]
0x00000170 JMPF $zero 0x6 ;; [116, 0, 0, 6]
0x00000174 MOVE R58 R52 ;; [26, 235, 64, 0]
0x00000178 JAL R62 $pc 0x77 ;; [153, 248, 48, 119]
0x00000178 JAL R62 $pc 0x76 ;; [153, 248, 48, 118]
0x0000017c MOVI R58 0xff ;; [114, 232, 0, 255]
0x00000180 JAL R62 $pc 0x75 ;; [153, 248, 48, 117]
0x00000180 JAL R62 $pc 0x74 ;; [153, 248, 48, 116]
0x00000184 LW R52 R63 0x0 ;; [93, 211, 240, 0]
0x00000188 RVRT R52 ;; [54, 208, 0, 0]
0x0000018c CFSI 0x40ad8 ;; [146, 4, 10, 216]
Expand Down Expand Up @@ -749,7 +748,7 @@ data_NonConfigurable_2 .word 14454674236531057292
0x000002d4 ADDI R49 R59 0x18 ;; [80, 199, 176, 24]
0x000002d8 MOVE R58 R52 ;; [26, 235, 64, 0]
0x000002dc MOVE R57 R49 ;; [26, 231, 16, 0]
0x000002e0 JAL R62 $pc 0x12 ;; [153, 248, 48, 18]
0x000002e0 JAL R62 $pc 0x11 ;; [153, 248, 48, 17]
0x000002e4 ADDI R52 R59 0x48 ;; [80, 211, 176, 72]
0x000002e8 MCPI R52 R49 0x10 ;; [96, 211, 16, 16]
0x000002ec ADDI R49 R59 0x38 ;; [80, 199, 176, 56]
Expand All @@ -758,47 +757,45 @@ data_NonConfigurable_2 .word 14454674236531057292
0x000002f8 MCPI R49 R52 0x10 ;; [96, 199, 64, 16]
0x000002fc MCPI R59 R52 0x10 ;; [96, 239, 64, 16]
0x00000300 LW R52 R59 0x0 ;; [93, 211, 176, 0]
0x00000304 MOVI R49 0x1 ;; [114, 196, 0, 1]
0x00000308 ALOC $one ;; [38, 4, 0, 0]
0x0000030c MCP $hp R52 R49 ;; [40, 31, 76, 64]
0x00000310 LB R52 $hp 0x0 ;; [92, 208, 112, 0]
0x00000314 SB R51 R52 0x0 ;; [94, 207, 64, 0]
0x00000318 CFSI 0x58 ;; [146, 0, 0, 88]
0x0000031c MOVE R62 R50 ;; [26, 251, 32, 0]
0x00000320 POPH 0x81e00 ;; [152, 8, 30, 0]
0x00000324 JAL $zero R62 0x0 ;; [153, 3, 224, 0]
0x00000328 PSHH 0x81000 ;; [150, 8, 16, 0]
0x0000032c MOVE R59 $sp ;; [26, 236, 80, 0]
0x00000330 CFEI 0x18 ;; [145, 0, 0, 24]
0x00000334 ADDI R52 R59 0x10 ;; [80, 211, 176, 16]
0x00000338 MCPI R52 R58 0x1 ;; [96, 211, 160, 1]
0x0000033c SW R59 R52 0x0 ;; [95, 239, 64, 0]
0x00000340 SW R59 $one 0x1 ;; [95, 236, 16, 1]
0x00000344 MCPI R57 R59 0x10 ;; [96, 231, 176, 16]
0x00000348 CFSI 0x18 ;; [146, 0, 0, 24]
0x0000034c POPH 0x81000 ;; [152, 8, 16, 0]
0x00000350 JAL $zero R62 0x0 ;; [153, 3, 224, 0]
0x00000354 PSHH 0x81c00 ;; [150, 8, 28, 0]
0x00000358 MOVE R59 $sp ;; [26, 236, 80, 0]
0x0000035c CFEI 0x28 ;; [145, 0, 0, 40]
0x00000360 ADDI R52 R59 0x20 ;; [80, 211, 176, 32]
0x00000364 SB R52 R58 0x0 ;; [94, 211, 160, 0]
0x00000368 SW R59 R52 0x0 ;; [95, 239, 64, 0]
0x0000036c SW R59 $one 0x1 ;; [95, 236, 16, 1]
0x00000370 ADDI R52 R59 0x10 ;; [80, 211, 176, 16]
0x00000374 MCPI R52 R59 0x10 ;; [96, 211, 176, 16]
0x00000378 LW R52 R63 0x2 ;; [93, 211, 240, 2]
0x0000037c LW R51 R59 0x2 ;; [93, 207, 176, 2]
0x00000380 LW R50 R59 0x3 ;; [93, 203, 176, 3]
0x00000384 LOGD $zero R52 R51 R50 ;; [52, 3, 76, 242]
0x00000388 CFSI 0x28 ;; [146, 0, 0, 40]
0x0000038c POPH 0x81c00 ;; [152, 8, 28, 0]
0x00000390 JAL $zero R62 0x0 ;; [153, 3, 224, 0]
0x00000394 NOOP ;; [71, 0, 0, 0]
0x00000304 ALOC $one ;; [38, 4, 0, 0]
0x00000308 MCP $hp R52 $one ;; [40, 31, 64, 64]
0x0000030c LB R52 $hp 0x0 ;; [92, 208, 112, 0]
0x00000310 SB R51 R52 0x0 ;; [94, 207, 64, 0]
0x00000314 CFSI 0x58 ;; [146, 0, 0, 88]
0x00000318 MOVE R62 R50 ;; [26, 251, 32, 0]
0x0000031c POPH 0x81e00 ;; [152, 8, 30, 0]
0x00000320 JAL $zero R62 0x0 ;; [153, 3, 224, 0]
0x00000324 PSHH 0x81000 ;; [150, 8, 16, 0]
0x00000328 MOVE R59 $sp ;; [26, 236, 80, 0]
0x0000032c CFEI 0x18 ;; [145, 0, 0, 24]
0x00000330 ADDI R52 R59 0x10 ;; [80, 211, 176, 16]
0x00000334 MCPI R52 R58 0x1 ;; [96, 211, 160, 1]
0x00000338 SW R59 R52 0x0 ;; [95, 239, 64, 0]
0x0000033c SW R59 $one 0x1 ;; [95, 236, 16, 1]
0x00000340 MCPI R57 R59 0x10 ;; [96, 231, 176, 16]
0x00000344 CFSI 0x18 ;; [146, 0, 0, 24]
0x00000348 POPH 0x81000 ;; [152, 8, 16, 0]
0x0000034c JAL $zero R62 0x0 ;; [153, 3, 224, 0]
0x00000350 PSHH 0x81c00 ;; [150, 8, 28, 0]
0x00000354 MOVE R59 $sp ;; [26, 236, 80, 0]
0x00000358 CFEI 0x28 ;; [145, 0, 0, 40]
0x0000035c ADDI R52 R59 0x20 ;; [80, 211, 176, 32]
0x00000360 SB R52 R58 0x0 ;; [94, 211, 160, 0]
0x00000364 SW R59 R52 0x0 ;; [95, 239, 64, 0]
0x00000368 SW R59 $one 0x1 ;; [95, 236, 16, 1]
0x0000036c ADDI R52 R59 0x10 ;; [80, 211, 176, 16]
0x00000370 MCPI R52 R59 0x10 ;; [96, 211, 176, 16]
0x00000374 LW R52 R63 0x2 ;; [93, 211, 240, 2]
0x00000378 LW R51 R59 0x2 ;; [93, 207, 176, 2]
0x0000037c LW R50 R59 0x3 ;; [93, 203, 176, 3]
0x00000380 LOGD $zero R52 R51 R50 ;; [52, 3, 76, 242]
0x00000384 CFSI 0x28 ;; [146, 0, 0, 40]
0x00000388 POPH 0x81c00 ;; [152, 8, 28, 0]
0x0000038c JAL $zero R62 0x0 ;; [153, 3, 224, 0]
.data_section:
0x00000398 .word i18446744073709486083, as hex be bytes ([FF, FF, FF, FF, FF, FF, 00, 03])
0x000003a0 .word i262145, as hex be bytes ([00, 00, 00, 00, 00, 04, 00, 01])
0x000003a8 .word i14454674236531057292, as hex be bytes ([C8, 99, 51, A2, 4C, 6C, A2, 8C])
0x00000390 .word i18446744073709486083, as hex be bytes ([FF, FF, FF, FF, FF, FF, 00, 03])
0x00000398 .word i262145, as hex be bytes ([00, 00, 00, 00, 00, 04, 00, 01])
0x000003a0 .word i14454674236531057292, as hex be bytes ([C8, 99, 51, A2, 4C, 6C, A2, 8C])
;; --- END OF TARGET BYTECODE ---

warning
Expand Down Expand Up @@ -898,18 +895,18 @@ warning
____

Compiled script "array_repeat" with 8 warnings.
Finished release [optimized + fuel] target(s) [944 B] in ???
Finished release [optimized + fuel] target(s) [936 B] in ???

> forc test --path test/src/e2e_vm_tests/test_programs/should_pass/language/array/array_repeat --verbose --release
exit status: 0
output:
Building test/src/e2e_vm_tests/test_programs/should_pass/language/array/array_repeat
Compiling library std (test/src/e2e_vm_tests/reduced_std_libs/sway-lib-std-assert)
Compiling script array_repeat (test/src/e2e_vm_tests/test_programs/should_pass/language/array/array_repeat)
Finished release [optimized + fuel] target(s) [1.944 KB] in ???
Finished release [optimized + fuel] target(s) [1.936 KB] in ???
script array_repeat
Bytecode size: 1944 bytes (1.944 KB)
Bytecode hash: 0xd84e1f0af96e64ef4c4c098c44c52e6494d47aa0b5eee14850b62bbde99640fb
Bytecode size: 1936 bytes (1.936 KB)
Bytecode hash: 0xf5e611ded2c5ac382dcd424b92612d5231b1a803d095eaa8fcd782c44567ab86
Running 1 test, filtered 0 tests

tested -- array_repeat
Expand Down
32 changes: 16 additions & 16 deletions ...ograms/should_pass/language/configurable_consts/json_abi_oracle_new_encoding.release.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,97 +63,97 @@
"concreteTypeId": "b760f44fa5965c2474a3b471467a22c43185152129295af588b022ae50b50903",
"indirect": false,
"name": "BOOL",
"offset": 3232
"offset": 3224
},
{
"concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
"indirect": false,
"name": "U8",
"offset": 3424
"offset": 3416
},
{
"concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
"indirect": false,
"name": "ANOTHER_U8",
"offset": 3160
"offset": 3152
},
{
"concreteTypeId": "29881aad8730c5ab11d275376323d8e4ff4179aae8ccb6c13fe4902137e162ef",
"indirect": false,
"name": "U16",
"offset": 3368
"offset": 3360
},
{
"concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc",
"indirect": false,
"name": "U32",
"offset": 3408
"offset": 3400
},
{
"concreteTypeId": "d7649d428b9ff33d188ecbf38a7e4d8fd167fa01b2e10fe9a8f9308e52f1d7cc",
"indirect": false,
"name": "U64",
"offset": 3416
"offset": 3408
},
{
"concreteTypeId": "1b5759d94094368cfd443019e7ca5ec4074300e544e5ea993a979f5da627261e",
"indirect": false,
"name": "U256",
"offset": 3376
"offset": 3368
},
{
"concreteTypeId": "7c5ee1cecf5f8eacd1284feb5f0bf2bdea533a51e2f0c9aabe9236d335989f3b",
"indirect": false,
"name": "B256",
"offset": 3200
"offset": 3192
},
{
"concreteTypeId": "81fc10c4681a3271cf2d66b2ec6fbc8ed007a442652930844fcf11818c295bff",
"indirect": false,
"name": "CONFIGURABLE_STRUCT",
"offset": 3320
"offset": 3312
},
{
"concreteTypeId": "a2922861f03be8a650595dd76455b95383a61b46dd418f02607fa2e00dc39d5c",
"indirect": false,
"name": "CONFIGURABLE_ENUM_A",
"offset": 3240
"offset": 3232
},
{
"concreteTypeId": "a2922861f03be8a650595dd76455b95383a61b46dd418f02607fa2e00dc39d5c",
"indirect": false,
"name": "CONFIGURABLE_ENUM_B",
"offset": 3280
"offset": 3272
},
{
"concreteTypeId": "4926d35d1a5157936b0a29bc126b8aace6d911209a5c130e9b716b0c73643ea6",
"indirect": false,
"name": "ARRAY_BOOL",
"offset": 3168
"offset": 3160
},
{
"concreteTypeId": "776fb5a3824169d6736138565fdc20aad684d9111266a5ff6d5c675280b7e199",
"indirect": false,
"name": "ARRAY_U64",
"offset": 3176
"offset": 3168
},
{
"concreteTypeId": "c998ca9a5f221fe7b5c66ae70c8a9562b86d964408b00d17f883c906bc1fe4be",
"indirect": false,
"name": "TUPLE_BOOL_U64",
"offset": 3352
"offset": 3344
},
{
"concreteTypeId": "94f0fa95c830be5e4f711963e83259fe7e8bc723278ab6ec34449e791a99b53a",
"indirect": false,
"name": "STR_4",
"offset": 3344
"offset": 3336
},
{
"concreteTypeId": "c89951a24c6ca28c13fd1cfdc646b2b656d69e61a92b91023be7eb58eb914b6b",
"indirect": false,
"name": "NOT_USED",
"offset": 3336
"offset": 3328
}
],
"encodingVersion": "1",
Expand Down
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/should_pass/language/const_generics/stdout.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ warning
____

Compiled script "const_generics" with 2 warnings.
Finished debug [unoptimized + fuel] target(s) [8.112 KB] in ???
Finished debug [unoptimized + fuel] target(s) [8.048 KB] in ???
Running 1 test, filtered 0 tests

tested -- const_generics

test run_main ... ok (???, 18049 gas)
test run_main ... ok (???, 17967 gas)
debug output:
[src/main.sw:154:13] a = [1, 2]
[src/main.sw:158:13] [C {}].len() = 1
Expand Down
4 changes: 2 additions & 2 deletions test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg/stdout.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ output:
Building test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg
Compiling library std (sway-lib-std)
Compiling script dbg (test/src/e2e_vm_tests/test_programs/should_pass/language/intrinsics/dbg)
Finished debug [unoptimized + fuel] target(s) [32.712 KB] in ???
Finished debug [unoptimized + fuel] target(s) [32.496 KB] in ???
Running 1 test, filtered 0 tests

tested -- dbg

test call_main ... ok (???, 111533 gas)
test call_main ... ok (???, 111135 gas)
debug output:
[src/main.sw:13:13] () = ()
[src/main.sw:15:13] true = true
Expand Down
Loading
Loading