fix: the try-catch lowering hack for 0.8.25 #549

abinavpp · 2024-05-19T21:09:05Z

What ❔

Fixes the try-catch lowering hack.

Why ❔

CPR-1705

Checklist

PR title corresponds to the body of PR (we generate changelog entries from PRs).
Tests for the changes have been added / updated.
Documentation comments have been added / updated.

This patch moves the success tag tracking of the try-call ast to its annotation instead of CompilerContext. This fixes the lowering of nested try-catch statements. This fixes CPR-1705.

This should help with the rebase onto older releases.

hedgar2017

Thanks, LGTM!

Could you update the changelog? Assume it's a version 1.0.1

abinavpp · 2024-05-20T11:51:13Z

Thanks, LGTM!

Could you update the changelog? Assume it's a version 1.0.1

Done.

…mpilererror-in-our-fork

github-actions · 2024-05-28T19:55:22Z

Benchmark results:

╔═╡ Size (-%) ╞════════════════╡ All M3B3 ╞═╗
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╠═╡ Cycles (-%) ╞══════════════╡ All M3B3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╠═╡ Ergs (-%) ╞════════════════╡ All M3B3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╚═══════════════════════════════════════════╝

╔═╡ Size (-%) ╞════════════════╡ All MzB3 ╞═╗
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╠═╡ Cycles (-%) ╞══════════════╡ All MzB3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╠═╡ Ergs (-%) ╞════════════════╡ All MzB3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╚═══════════════════════════════════════════╝

╔═╡ Size (-%) ╞═════╡ EVMInterpreter M3B3 ╞═╗
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                                 NaN ║
╠═╡ Cycles (-%) ╞═══╡ EVMInterpreter M3B3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╠═╡ Ergs (-%) ╞═════╡ EVMInterpreter M3B3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╠═╡ Ergs/gas ╞══════╡ EVMInterpreter M3B3 ╞═╣
║ ADD                                69.333 ║
║ MUL                                40.400 ║
║ SUB                                69.333 ║
║ DIV                                48.800 ║
║ SDIV                               65.600 ║
║ MOD                                47.600 ║
║ SMOD                               63.200 ║
║ ADDMOD                             39.625 ║
║ MULMOD                             36.625 ║
║ EXP                                 9.667 ║
║ SIGNEXTEND                         46.400 ║
║ LT                                 73.333 ║
║ GT                                 73.333 ║
║ SLT                                97.333 ║
║ SGT                                95.333 ║
║ EQ                                 73.333 ║
║ ISZERO                             65.000 ║
║ AND                                67.333 ║
║ OR                                 69.333 ║
║ XOR                                69.333 ║
║ NOT                                61.000 ║
║ BYTE                               77.333 ║
║ SHL                                75.333 ║
║ SHR                                73.333 ║
║ SAR                                91.333 ║
║ SGT                                95.333 ║
║ SHA3                               28.519 ║
║ ADDRESS                            93.781 ║
║ BALANCE                            73.230 ║
║ ORIGIN                           1389.719 ║
║ CALLER                             93.781 ║
║ CALLVALUE                          93.781 ║
║ CALLDATALOAD                       63.333 ║
║ CALLDATASIZE                       94.000 ║
║ CALLDATACOPY                       71.533 ║
║ CODESIZE                           91.000 ║
║ CODECOPY                          145.574 ║
║ GASPRICE                         1392.438 ║
║ EXTCODESIZE                         5.149 ║
║ EXTCODECOPY                         4.667 ║
║ RETURNDATASIZE                     89.000 ║
║ RETURNDATACOPY                     55.889 ║
║ EXTCODEHASH                         9.087 ║
║ BLOCKHASH                         244.700 ║
║ COINBASE                         1392.719 ║
║ TIMESTAMP                        1389.719 ║
║ NUMBER                           1389.719 ║
║ PREVRANDAO                       1389.719 ║
║ GASLIMIT                         1395.719 ║
║ CHAINID                          1389.719 ║
║ SELFBALANCE                       641.312 ║
║ BASEFEE                          1386.719 ║
║ POP                                81.500 ║
║ MLOAD                              80.186 ║
║ MSTORE                             82.069 ║
║ MSTORE8                            89.912 ║
║ SLOAD                              27.212 ║
║ SSTORE                              9.099 ║
║ JUMP                               37.333 ║
║ JUMPI                              32.818 ║
║ PC                                 94.281 ║
║ MSIZE                             103.781 ║
║ GAS                                88.281 ║
║ JUMPDEST                          127.562 ║
║ PUSH0                              91.281 ║
║ PUSH1                              78.854 ║
║ PUSH2                              96.854 ║
║ PUSH4                             158.854 ║
║ PUSH5                             180.854 ║
║ PUSH6                             202.854 ║
║ PUSH7                             224.854 ║
║ PUSH8                             246.854 ║
║ PUSH9                             268.854 ║
║ PUSH10                            290.854 ║
║ PUSH11                            312.854 ║
║ PUSH12                            332.854 ║
║ PUSH13                            356.854 ║
║ PUSH14                            378.854 ║
║ PUSH15                            400.854 ║
║ PUSH16                            422.854 ║
║ PUSH17                            444.854 ║
║ PUSH18                            466.854 ║
║ PUSH19                            488.854 ║
║ PUSH20                            510.854 ║
║ PUSH21                            532.854 ║
║ PUSH22                            554.854 ║
║ PUSH23                            576.854 ║
║ PUSH24                            598.854 ║
║ PUSH25                            620.854 ║
║ PUSH26                            642.854 ║
║ PUSH27                            664.854 ║
║ PUSH28                            686.854 ║
║ PUSH29                            708.854 ║
║ PUSH30                            730.854 ║
║ PUSH31                            752.854 ║
║ PUSH32                            774.854 ║
║ DUP1                               63.000 ║
║ DUP2                               67.000 ║
║ DUP3                               67.000 ║
║ DUP4                               67.000 ║
║ DUP5                               67.000 ║
║ DUP6                               67.000 ║
║ DUP7                               67.000 ║
║ DUP8                               67.000 ║
║ DUP9                               67.000 ║
║ DUP10                              67.000 ║
║ DUP11                              67.000 ║
║ DUP12                              67.000 ║
║ DUP13                              65.000 ║
║ DUP14                              67.000 ║
║ DUP15                              67.000 ║
║ DUP16                              67.000 ║
║ SWAP1                              67.667 ║
║ SWAP2                              67.667 ║
║ SWAP3                              67.667 ║
║ SWAP4                              67.667 ║
║ SWAP5                              67.667 ║
║ SWAP6                              67.667 ║
║ SWAP7                              67.667 ║
║ SWAP8                              67.667 ║
║ SWAP9                              67.667 ║
║ SWAP10                             67.667 ║
║ SWAP11                             67.667 ║
║ SWAP12                             67.667 ║
║ SWAP13                             67.667 ║
║ SWAP14                             67.667 ║
║ SWAP15                             65.667 ║
║ SWAP16                             67.667 ║
║ CALL                               56.371 ║
║ STATICCALL                         53.248 ║
║ DELEGATECALL                       52.286 ║
║ CREATE                              5.046 ║
║ CREATE2                             7.067 ║
║ RETURN                              1.000 ║
║ REVERT                              1.000 ║
╠═╡ Ergs/gas (-%) ╞═╡ EVMInterpreter M3B3 ╞═╣
╚═══════════════════════════════════════════╝

╔═╡ Size (-%) ╞═════╡ EVMInterpreter MzB3 ╞═╗
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                                 NaN ║
╠═╡ Cycles (-%) ╞═══╡ EVMInterpreter MzB3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╠═╡ Ergs (-%) ╞═════╡ EVMInterpreter MzB3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╚═══════════════════════════════════════════╝

╔═╡ Size (-%) ╞══════════╡ Real life M3B3 ╞═╗
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╠═╡ Cycles (-%) ╞════════╡ Real life M3B3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╠═╡ Ergs (-%) ╞══════════╡ Real life M3B3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╚═══════════════════════════════════════════╝

╔═╡ Size (-%) ╞══════════╡ Real life MzB3 ╞═╗
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╠═╡ Cycles (-%) ╞════════╡ Real life MzB3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╠═╡ Ergs (-%) ╞══════════╡ Real life MzB3 ╞═╣
║ Mean                                0.000 ║
║ Best                                0.000 ║
║ Worst                               0.000 ║
║ Total                               0.000 ║
╚═══════════════════════════════════════════╝

hedgar2017 · 2024-05-28T21:01:30Z

@antonbaliasnikov is there ZKSYNC_VERSION set for the reference build?

antonbaliasnikov · 2024-05-29T08:19:50Z

@antonbaliasnikov is there ZKSYNC_VERSION set for the reference build?

Yeah, this was due to last second changes in SOL_*/SOLC_* variable renaming. I updated the latest-ci tag to take the reference case and restarted the workflow. Let's wait for the new results.

antonbaliasnikov · 2024-05-29T08:54:45Z

New results for the reference, all looks good now.

hedgar2017

Let's merge when reference passes.

antonbaliasnikov · 2024-05-29T09:33:59Z

Let's merge when reference passes.

The reference does not contain this patch, so it failed with:

E+M3B3 0.8.25    INVALID tests/solidity/simple/try_catch/nested_2.sol Failed to compile sources: `solc` errors found: ["InternalCompilerError: Assembly exception for bytecode\n\n"]
E+MzB3 0.8.25    INVALID tests/solidity/simple/try_catch/nested_2.sol Failed to compile sources: `solc` errors found: ["InternalCompilerError: Assembly exception for bytecode\n\n"]

hedgar2017 · 2024-05-29T09:34:46Z

Let's merge when reference passes.

The reference does not contain this patch, so it failed with:


E+M3B3 0.8.25    INVALID tests/solidity/simple/try_catch/nested_2.sol Failed to compile sources: `solc` errors found: ["InternalCompilerError: Assembly exception for bytecode\n\n"]

E+MzB3 0.8.25    INVALID tests/solidity/simple/try_catch/nested_2.sol Failed to compile sources: `solc` errors found: ["InternalCompilerError: Assembly exception for bytecode\n\n"]

Please check DM in Slack!

abinavpp · 2024-05-29T09:36:25Z

Let's merge when reference passes.

Reference is expected to fail right? The reference solc binary doesn't have this patch that would fix the compilation of try_catch/nested_2.sol, right?

hedgar2017 · 2024-05-29T09:38:18Z

Let's merge when reference passes.

Reference is expected to fail right? The reference solc binary doesn't have this patch that would fix the compilation of try_catch/nested_2.sol, right?

Nope. Reference has always supposed to pass, as it contains neither the fix nor the reproducer to fail.

Its only purpose is to produce a benchmark for candidate to compare with.

hedgar2017 · 2024-05-29T10:17:36Z

@antonbaliasnikov thanks. Let's have CI changes in one commit.

hedgar2017 · 2024-05-29T10:23:08Z

@abinavpp after rebase, the changelog should go away and we'll end up with two commits: the fix and the CI.

Fix the try-catch lowering hack

c04cdae

This patch moves the success tag tracking of the try-call ast to its annotation instead of CompilerContext. This fixes the lowering of nested try-catch statements. This fixes CPR-1705.

abinavpp requested review from akiramenai and hedgar2017 May 19, 2024 21:10

hedgar2017 removed the request for review from akiramenai May 20, 2024 05:32

Use the solAssert with message instead

e4655cd

This should help with the rebase onto older releases.

hedgar2017 requested changes May 20, 2024

View reviewed changes

abinavpp added 2 commits May 20, 2024 13:43

tryCallSuccessTag -> successTag

ce62b49

Update changelog

17b8532

Update Changelog.md

0d1d133

hedgar2017 changed the title ~~Fix the try-catch lowering hack~~ fix: the try-catch lowering hack May 20, 2024

hedgar2017 approved these changes May 20, 2024

View reviewed changes

abinavpp mentioned this pull request May 28, 2024

chore: revamp CI v0.8.25 #559

Merged

7 tasks

chore: revamp CI v0.8.25 (#559)

03f98ef

hedgar2017 changed the title ~~fix: the try-catch lowering hack~~ fix: the try-catch lowering hack for 0.8.25 May 28, 2024

Merge remote-tracking branch 'ml/0.8.25' into app-cpr-1705-internalco…

a89f5e7

…mpilererror-in-our-fork

hedgar2017 requested changes May 29, 2024

View reviewed changes

antonbaliasnikov added 2 commits May 29, 2024 10:57

ci: always use main tester for reference benchmarks

888959c

ci: remove prerelease flag

cf8adb3

abinavpp force-pushed the 0.8.25 branch from 03f98ef to d2fb7b9 Compare May 29, 2024 20:45

abinavpp closed this May 29, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: the try-catch lowering hack for 0.8.25 #549

fix: the try-catch lowering hack for 0.8.25 #549

abinavpp commented May 19, 2024 •

edited by hedgar2017

Loading

hedgar2017 left a comment

abinavpp commented May 20, 2024

github-actions bot commented May 28, 2024 •

edited

Loading

hedgar2017 commented May 28, 2024

antonbaliasnikov commented May 29, 2024

antonbaliasnikov commented May 29, 2024

hedgar2017 left a comment

antonbaliasnikov commented May 29, 2024 •

edited

Loading

hedgar2017 commented May 29, 2024

abinavpp commented May 29, 2024

hedgar2017 commented May 29, 2024 •

edited

Loading

hedgar2017 commented May 29, 2024

hedgar2017 commented May 29, 2024

fix: the try-catch lowering hack for 0.8.25 #549

fix: the try-catch lowering hack for 0.8.25 #549

Conversation

abinavpp commented May 19, 2024 • edited by hedgar2017 Loading

What ❔

Why ❔

Checklist

hedgar2017 left a comment

Choose a reason for hiding this comment

abinavpp commented May 20, 2024

github-actions bot commented May 28, 2024 • edited Loading

hedgar2017 commented May 28, 2024

antonbaliasnikov commented May 29, 2024

antonbaliasnikov commented May 29, 2024

hedgar2017 left a comment

Choose a reason for hiding this comment

antonbaliasnikov commented May 29, 2024 • edited Loading

hedgar2017 commented May 29, 2024

abinavpp commented May 29, 2024

hedgar2017 commented May 29, 2024 • edited Loading

hedgar2017 commented May 29, 2024

hedgar2017 commented May 29, 2024

abinavpp commented May 19, 2024 •

edited by hedgar2017

Loading

github-actions bot commented May 28, 2024 •

edited

Loading

antonbaliasnikov commented May 29, 2024 •

edited

Loading

hedgar2017 commented May 29, 2024 •

edited

Loading