Skip to content
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

Jump to bottom

CSE with merging node #889

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

CSE with merging node #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f8c8862
merging node during CSE
Stevengre Nov 20, 2024
47c4578
make it easy to check the correctness of CSE by changing the proving …
Stevengre Nov 20, 2024
72d48e8
update expected with merging node
Stevengre Nov 20, 2024
bf8eeb2
add heuristics for merging node
Stevengre Nov 21, 2024
013dee4
update the expected files with merging node
Stevengre Nov 21, 2024
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
2 changes: 1 addition & 1 deletion src/kontrol/prove.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ def create_kcfg_explore() -> KCFGExplore:
progress.update(task, advance=1, status='Finished')

if options.minimize_proofs or options.config_type == ConfigType.SUMMARY_CONFIG:
proof.minimize_kcfg()
proof.minimize_kcfg(heuristics=KEVMSemantics(), merge=True)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CSE with merging node


if start_time is not None:
end_time = time.time()
Expand Down
1 change: 1 addition & 0 deletions src/tests/integration/test-data/foundry-dependency-all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ InterfaceTagTest.testInterface()
ConstructorTest.init
ImportedContract.init
StaticCallContract.set(uint256)
MergeKCFGTest.test_branch_merge(uint256,uint256,bool)
16 changes: 8 additions & 8 deletions src/tests/integration/test-data/show/AddConst.applyOp(uint256).cse.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
┃ ┃ constraint:
┃ ┃ KV0_x:Int <=Int ( maxUInt256 -Int #lookup ( C_ADDCONST_STORAGE:Map , 0 ) )
┃ │
┃ ├─ 8
┃ ├─ 12
┃ │ k: #execute ~> CONTINUATION:K
┃ │ pc: 0
┃ │ callDepth: CALLDEPTH_CELL:Int
Expand All @@ -21,7 +21,7 @@
┃ │ method: src%cse%AddConst.applyOp(uint256)
┃ │
┃ │ (446 steps)
┃ ├─ 6 (terminal)
┃ ├─ 10 (terminal)
┃ │ k: #halt ~> CONTINUATION:K
┃ │ pc: 87
┃ │ callDepth: CALLDEPTH_CELL:Int
Expand All @@ -44,7 +44,7 @@
┃ constraint:
┃ ( maxUInt256 -Int #lookup ( C_ADDCONST_STORAGE:Map , 0 ) ) <Int KV0_x:Int
│
├─ 9
├─ 13
│ k: #execute ~> CONTINUATION:K
│ pc: 0
│ callDepth: CALLDEPTH_CELL:Int
Expand All @@ -53,7 +53,7 @@
│ method: src%cse%AddConst.applyOp(uint256)
│
│ (371 steps)
├─ 7 (terminal)
├─ 11 (terminal)
│ k: #halt ~> CONTINUATION:K
│ pc: 179
│ callDepth: CALLDEPTH_CELL:Int
Expand All @@ -78,7 +78,7 @@
module SUMMARY-SRC%CSE%ADDCONST.APPLYOP(UINT256):0


rule [BASIC-BLOCK-8-TO-6]: <foundry>
rule [BASIC-BLOCK-12-TO-10]: <foundry>
<kevm>
<k>
( #execute => #halt )
Expand Down Expand Up @@ -255,9 +255,9 @@ module SUMMARY-SRC%CSE%ADDCONST.APPLYOP(UINT256):0
andBool ( ( notBool #range ( 0 < C_ADDCONST_ID:Int <= 9 ) )
andBool ( KV0_x:Int <=Int ( maxUInt256 -Int #lookup ( C_ADDCONST_STORAGE:Map , 0 ) )
))))))))))))))))))))))))
[priority(20), label(BASIC-BLOCK-8-TO-6)]
[priority(20), label(BASIC-BLOCK-12-TO-10)]

rule [BASIC-BLOCK-9-TO-7]: <foundry>
rule [BASIC-BLOCK-13-TO-11]: <foundry>
<kevm>
<k>
( #execute => #halt )
Expand Down Expand Up @@ -434,6 +434,6 @@ module SUMMARY-SRC%CSE%ADDCONST.APPLYOP(UINT256):0
andBool ( ( notBool #range ( 0 < C_ADDCONST_ID:Int <= 9 ) )
andBool ( ( maxUInt256 -Int #lookup ( C_ADDCONST_STORAGE:Map , 0 ) ) <Int KV0_x:Int
))))))))))))))))))))))))
[priority(20), label(BASIC-BLOCK-9-TO-7)]
[priority(20), label(BASIC-BLOCK-13-TO-11)]

endmodule
Loading
Loading