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.

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

chore: pull value merger code from sync #10080

Merged
merged 16 commits into from
Nov 27, 2024
Merged

Conversation

TomAFrench
Copy link
Member

Please read contributing guidelines and remove this line.

Copy link
Contributor

github-actions bot commented Nov 20, 2024

Changes to circuit sizes

Generated at commit: 04957af2623c78874a5a340d9ce3fce42d53f02b, compared to commit: 7ea38887e514a4bbdc7ff847efe19bd2d1b74baf

🧾 Summary (100% most significant diffs)

Program ACIR opcodes (+/-) % Circuit size (+/-) %
private_kernel_reset_4_4_4_4_4_4_4_4_1 +4,719 ❌ +14.57% +19,236 ❌ +22.24%
private_kernel_reset +5,633 ❌ +6.70% +19,440 ❌ +3.15%
rollup_block_root -168 ✅ -3.74% -144 ✅ -0.01%
parity_root -252 ✅ -5.01% -216 ✅ -0.01%
rollup_merge -168 ✅ -4.91% -144 ✅ -0.01%
rollup_block_merge -465 ✅ -3.87% -451 ✅ -0.02%
rollup_root -465 ✅ -3.88% -451 ✅ -0.02%
private_kernel_tail -6 ✅ -0.15% -6 ✅ -0.05%
parity_base -252 ✅ -5.86% -216 ✅ -0.70%
rollup_base_private -28,501 ✅ -14.42% -41,353 ✅ -1.56%
private_kernel_inner -785 ✅ -2.09% -1,034 ✅ -1.82%
private_kernel_init -741 ✅ -3.46% -986 ✅ -2.86%
rollup_base_public -91,453 ✅ -20.45% -129,514 ✅ -3.24%
private_kernel_tail_to_public -2,133 ✅ -12.27% -3,044 ✅ -10.32%

Full diff report 👇
Program ACIR opcodes (+/-) % Circuit size (+/-) %
private_kernel_reset_4_4_4_4_4_4_4_4_1 37,106 (+4,719) +14.57% 105,730 (+19,236) +22.24%
private_kernel_reset 89,662 (+5,633) +6.70% 637,479 (+19,440) +3.15%
rollup_block_root 4,322 (-168) -3.74% 2,739,521 (-144) -0.01%
parity_root 4,782 (-252) -5.01% 3,636,536 (-216) -0.01%
rollup_merge 3,252 (-168) -4.91% 1,826,915 (-144) -0.01%
rollup_block_merge 11,544 (-465) -3.87% 1,858,073 (-451) -0.02%
rollup_root 11,528 (-465) -3.88% 1,858,059 (-451) -0.02%
private_kernel_tail 4,127 (-6) -0.15% 12,509 (-6) -0.05%
parity_base 4,049 (-252) -5.86% 30,482 (-216) -0.70%
rollup_base_private 169,174 (-28,501) -14.42% 2,617,309 (-41,353) -1.56%
private_kernel_inner 36,767 (-785) -2.09% 55,848 (-1,034) -1.82%
private_kernel_init 20,668 (-741) -3.46% 33,520 (-986) -2.86%
rollup_base_public 355,674 (-91,453) -20.45% 3,867,937 (-129,514) -3.24%
private_kernel_tail_to_public 15,253 (-2,133) -12.27% 26,461 (-3,044) -10.32%

@TomAFrench
Copy link
Member Author

@asterite can you pull this branch and run the unconditional_recursion test locally? This passes locally for me but fails in CI.

@asterite
Copy link
Contributor

It passes too.

That said, I can make it fail locally if I change RUST_MIN_STACK:

RUST_MIN_STACK=100000 cargo test unconditional_recursion

Maybe that value is different in CI, compared to our machines?

@asterite
Copy link
Contributor

It seems the value is platform-dependent:

https://doc.rust-lang.org/std/thread/#stack-size

But I don't know if this is running in a non-main thread.

That said, maybe we should set that value to a fixed constant somewhere so code runs the same way everywhere.

(I think, for example, the Rust compiler sets it to a higher-than-normal value to support deeply nested code structures, so we could do the same)

@TomAFrench TomAFrench enabled auto-merge (squash) November 27, 2024 23:29
@TomAFrench
Copy link
Member Author

I've bumped the stack size as suggested by @aakoshh. I think that it's not an ideal situation but it gets us closer to unifying the codebases again.

@TomAFrench TomAFrench requested a review from aakoshh November 27, 2024 23:30
Copy link
Contributor

@aakoshh aakoshh left a comment

Choose a reason for hiding this comment

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

You're doing God's work 🙏

@TomAFrench TomAFrench merged commit 3392629 into master Nov 27, 2024
71 checks passed
@TomAFrench TomAFrench deleted the tf/replace-value-merger branch November 27, 2024 23:50
ludamad pushed a commit that referenced this pull request Nov 28, 2024
🤖 I have created a release *beep* *boop*
---


<details><summary>aztec-package: 0.65.2</summary>

##
[0.65.2](aztec-package-v0.65.1...aztec-package-v0.65.2)
(2024-11-28)


### Features

* New proving broker
([#10174](#10174))
([6fd5fc1](6fd5fc1))
</details>

<details><summary>barretenberg.js: 0.65.2</summary>

##
[0.65.2](barretenberg.js-v0.65.1...barretenberg.js-v0.65.2)
(2024-11-28)


### Miscellaneous

* **barretenberg.js:** Synchronize aztec-packages versions
</details>

<details><summary>aztec-packages: 0.65.2</summary>

##
[0.65.2](aztec-packages-v0.65.1...aztec-packages-v0.65.2)
(2024-11-28)


### Features

* Fee foresight support
([#10262](#10262))
([9e19244](9e19244))
* New proving broker
([#10174](#10174))
([6fd5fc1](6fd5fc1))
* Sequential insertion in indexed trees
([#10111](#10111))
([bfd9fa6](bfd9fa6))
* Swap polys to facilitate dynamic trace overflow
([#9976](#9976))
([b7b282c](b7b282c))


### Bug Fixes

* Don't store indices of zero leaves.
([#10270](#10270))
([c22be8b](c22be8b))
* Expect proper duplicate nullifier error patterns in e2e tests
([#10256](#10256))
([4ee8344](4ee8344))


### Miscellaneous

* Check artifact consistency
([#10271](#10271))
([6a49405](6a49405))
* Dont import things that themselves import jest in imported functions
([#10260](#10260))
([9440c1c](9440c1c))
* Fix bad merge in integration l1 publisher
([#10272](#10272))
([b5a6aa4](b5a6aa4))
* Fixing sol warnings
([#10276](#10276))
([3d113b2](3d113b2))
* Pull out sync changes
([#10274](#10274))
([391a6b7](391a6b7))
* Pull value merger code from sync
([#10080](#10080))
([3392629](3392629))
* Remove default gas settings
([#10163](#10163))
([c9a4d88](c9a4d88))
* Replace relative paths to noir-protocol-circuits
([654d801](654d801))
* Teardown context in prover coordination test
([#10257](#10257))
([7ea3888](7ea3888))
</details>

<details><summary>barretenberg: 0.65.2</summary>

##
[0.65.2](barretenberg-v0.65.1...barretenberg-v0.65.2)
(2024-11-28)


### Features

* Sequential insertion in indexed trees
([#10111](#10111))
([bfd9fa6](bfd9fa6))
* Swap polys to facilitate dynamic trace overflow
([#9976](#9976))
([b7b282c](b7b282c))


### Bug Fixes

* Don't store indices of zero leaves.
([#10270](#10270))
([c22be8b](c22be8b))


### Miscellaneous

* Pull value merger code from sync
([#10080](#10080))
([3392629](3392629))
</details>

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
AztecBot added a commit to AztecProtocol/barretenberg that referenced this pull request Nov 29, 2024
🤖 I have created a release *beep* *boop*
---


<details><summary>aztec-package: 0.65.2</summary>

##
[0.65.2](AztecProtocol/aztec-packages@aztec-package-v0.65.1...aztec-package-v0.65.2)
(2024-11-28)


### Features

* New proving broker
([#10174](AztecProtocol/aztec-packages#10174))
([6fd5fc1](AztecProtocol/aztec-packages@6fd5fc1))
</details>

<details><summary>barretenberg.js: 0.65.2</summary>

##
[0.65.2](AztecProtocol/aztec-packages@barretenberg.js-v0.65.1...barretenberg.js-v0.65.2)
(2024-11-28)


### Miscellaneous

* **barretenberg.js:** Synchronize aztec-packages versions
</details>

<details><summary>aztec-packages: 0.65.2</summary>

##
[0.65.2](AztecProtocol/aztec-packages@aztec-packages-v0.65.1...aztec-packages-v0.65.2)
(2024-11-28)


### Features

* Fee foresight support
([#10262](AztecProtocol/aztec-packages#10262))
([9e19244](AztecProtocol/aztec-packages@9e19244))
* New proving broker
([#10174](AztecProtocol/aztec-packages#10174))
([6fd5fc1](AztecProtocol/aztec-packages@6fd5fc1))
* Sequential insertion in indexed trees
([#10111](AztecProtocol/aztec-packages#10111))
([bfd9fa6](AztecProtocol/aztec-packages@bfd9fa6))
* Swap polys to facilitate dynamic trace overflow
([#9976](AztecProtocol/aztec-packages#9976))
([b7b282c](AztecProtocol/aztec-packages@b7b282c))


### Bug Fixes

* Don't store indices of zero leaves.
([#10270](AztecProtocol/aztec-packages#10270))
([c22be8b](AztecProtocol/aztec-packages@c22be8b))
* Expect proper duplicate nullifier error patterns in e2e tests
([#10256](AztecProtocol/aztec-packages#10256))
([4ee8344](AztecProtocol/aztec-packages@4ee8344))


### Miscellaneous

* Check artifact consistency
([#10271](AztecProtocol/aztec-packages#10271))
([6a49405](AztecProtocol/aztec-packages@6a49405))
* Dont import things that themselves import jest in imported functions
([#10260](AztecProtocol/aztec-packages#10260))
([9440c1c](AztecProtocol/aztec-packages@9440c1c))
* Fix bad merge in integration l1 publisher
([#10272](AztecProtocol/aztec-packages#10272))
([b5a6aa4](AztecProtocol/aztec-packages@b5a6aa4))
* Fixing sol warnings
([#10276](AztecProtocol/aztec-packages#10276))
([3d113b2](AztecProtocol/aztec-packages@3d113b2))
* Pull out sync changes
([#10274](AztecProtocol/aztec-packages#10274))
([391a6b7](AztecProtocol/aztec-packages@391a6b7))
* Pull value merger code from sync
([#10080](AztecProtocol/aztec-packages#10080))
([3392629](AztecProtocol/aztec-packages@3392629))
* Remove default gas settings
([#10163](AztecProtocol/aztec-packages#10163))
([c9a4d88](AztecProtocol/aztec-packages@c9a4d88))
* Replace relative paths to noir-protocol-circuits
([654d801](AztecProtocol/aztec-packages@654d801))
* Teardown context in prover coordination test
([#10257](AztecProtocol/aztec-packages#10257))
([7ea3888](AztecProtocol/aztec-packages@7ea3888))
</details>

<details><summary>barretenberg: 0.65.2</summary>

##
[0.65.2](AztecProtocol/aztec-packages@barretenberg-v0.65.1...barretenberg-v0.65.2)
(2024-11-28)


### Features

* Sequential insertion in indexed trees
([#10111](AztecProtocol/aztec-packages#10111))
([bfd9fa6](AztecProtocol/aztec-packages@bfd9fa6))
* Swap polys to facilitate dynamic trace overflow
([#9976](AztecProtocol/aztec-packages#9976))
([b7b282c](AztecProtocol/aztec-packages@b7b282c))


### Bug Fixes

* Don't store indices of zero leaves.
([#10270](AztecProtocol/aztec-packages#10270))
([c22be8b](AztecProtocol/aztec-packages@c22be8b))


### Miscellaneous

* Pull value merger code from sync
([#10080](AztecProtocol/aztec-packages#10080))
([3392629](AztecProtocol/aztec-packages@3392629))
</details>

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants