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

chore: add test and benchmarks for poseidon2 #5386

Merged
merged 6 commits into from
Jul 5, 2024
Merged

chore: add test and benchmarks for poseidon2 #5386

merged 6 commits into from
Jul 5, 2024

Conversation

TomAFrench
Copy link
Member

Description

Problem*

Resolves

Summary*

This PR adds benchmarks for poseidon2

Additional Context

Documentation*

Check one:

  • No documentation needed.
  • Documentation included in this PR.
  • [For Experimental Features] Documentation to be submitted in a separate PR.

PR Checklist*

  • I have tested the changes locally.
  • I have formatted the changes with Prettier and/or cargo fmt on default settings.

@github-actions github-actions bot added the documentation Improvements or additions to documentation label Jul 2, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 2, 2024 •
edited
Loading

🚀 Deployed on https://66858983c8c86e60c516c971--noir-docs.netlify.app

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 2, 2024 •
edited
Loading

FYI @noir-lang/developerrelations on Noir doc changes.

@TomAFrench TomAFrench requested a review from a team July 4, 2024 18:14
@TomAFrench TomAFrench enabled auto-merge July 4, 2024 18:14
@TomAFrench TomAFrench added this pull request to the merge queue Jul 5, 2024
Merged via the queue into master with commit 44abe7f Jul 5, 2024
44 checks passed
@TomAFrench TomAFrench deleted the tf/add-tests-for-poseidon2 branch July 5, 2024 15:55
AztecBot added a commit to AztecProtocol/aztec-packages that referenced this pull request Jul 6, 2024
@AztecBot
[1 changes] fix: correct range for overlfowing/underflowing integer a…
b3d0379 
…ssignment (noir-lang/noir#5416)

feat: Detect subgraphs that are completely independent from inputs or outputs (noir-lang/noir#5402)
chore: Add remaining slice methods to the interpreter (noir-lang/noir#5422)
chore: add test and benchmarks for poseidon2 (noir-lang/noir#5386)
fix: Complete call stacks with no_predicates (noir-lang/noir#5418)
feat: lsp rename/find-all-references for traits (noir-lang/noir#5409)
feat: lsp "go to definition" for modules (noir-lang/noir#5406)
fix: lsp find struct reference in return locations and paths (noir-lang/noir#5404)
feat: Sync from aztec-packages (noir-lang/noir#5408)
AztecBot added a commit to AztecProtocol/aztec-packages that referenced this pull request Jul 6, 2024
@AztecBot
fix: correct range for overlfowing/underflowing integer assignment (n…
299a61d 
…oir-lang/noir#5416)

feat: Detect subgraphs that are completely independent from inputs or outputs (noir-lang/noir#5402)
chore: Add remaining slice methods to the interpreter (noir-lang/noir#5422)
chore: add test and benchmarks for poseidon2 (noir-lang/noir#5386)
fix: Complete call stacks with no_predicates (noir-lang/noir#5418)
feat: lsp rename/find-all-references for traits (noir-lang/noir#5409)
feat: lsp "go to definition" for modules (noir-lang/noir#5406)
fix: lsp find struct reference in return locations and paths (noir-lang/noir#5404)
feat: Sync from aztec-packages (noir-lang/noir#5408)
@AztecBot AztecBot mentioned this pull request Jul 6, 2024
Merged
AztecBot added a commit to AztecProtocol/aztec-packages that referenced this pull request Jul 7, 2024
@AztecBot
[1 changes] fix: correct range for overlfowing/underflowing integer a…
b3ec97c 
…ssignment (noir-lang/noir#5416)

feat: Detect subgraphs that are completely independent from inputs or outputs (noir-lang/noir#5402)
chore: Add remaining slice methods to the interpreter (noir-lang/noir#5422)
chore: add test and benchmarks for poseidon2 (noir-lang/noir#5386)
fix: Complete call stacks with no_predicates (noir-lang/noir#5418)
feat: lsp rename/find-all-references for traits (noir-lang/noir#5409)
feat: lsp "go to definition" for modules (noir-lang/noir#5406)
fix: lsp find struct reference in return locations and paths (noir-lang/noir#5404)
feat: Sync from aztec-packages (noir-lang/noir#5408)
AztecBot added a commit to AztecProtocol/aztec-packages that referenced this pull request Jul 7, 2024
@AztecBot
fix: correct range for overlfowing/underflowing integer assignment (n…
78769a7 
…oir-lang/noir#5416)

feat: Detect subgraphs that are completely independent from inputs or outputs (noir-lang/noir#5402)
chore: Add remaining slice methods to the interpreter (noir-lang/noir#5422)
chore: add test and benchmarks for poseidon2 (noir-lang/noir#5386)
fix: Complete call stacks with no_predicates (noir-lang/noir#5418)
feat: lsp rename/find-all-references for traits (noir-lang/noir#5409)
feat: lsp "go to definition" for modules (noir-lang/noir#5406)
fix: lsp find struct reference in return locations and paths (noir-lang/noir#5404)
feat: Sync from aztec-packages (noir-lang/noir#5408)
AztecBot added a commit to AztecProtocol/aztec-packages that referenced this pull request Jul 8, 2024
@AztecBot
[1 changes] fix: correct range for overlfowing/underflowing integer a…
d02c23d 
…ssignment (noir-lang/noir#5416)

feat: Detect subgraphs that are completely independent from inputs or outputs (noir-lang/noir#5402)
chore: Add remaining slice methods to the interpreter (noir-lang/noir#5422)
chore: add test and benchmarks for poseidon2 (noir-lang/noir#5386)
fix: Complete call stacks with no_predicates (noir-lang/noir#5418)
feat: lsp rename/find-all-references for traits (noir-lang/noir#5409)
feat: lsp "go to definition" for modules (noir-lang/noir#5406)
fix: lsp find struct reference in return locations and paths (noir-lang/noir#5404)
feat: Sync from aztec-packages (noir-lang/noir#5408)
AztecBot added a commit to AztecProtocol/aztec-packages that referenced this pull request Jul 8, 2024
@AztecBot
fix: correct range for overlfowing/underflowing integer assignment (n…
7c26f0e 
…oir-lang/noir#5416)

feat: Detect subgraphs that are completely independent from inputs or outputs (noir-lang/noir#5402)
chore: Add remaining slice methods to the interpreter (noir-lang/noir#5422)
chore: add test and benchmarks for poseidon2 (noir-lang/noir#5386)
fix: Complete call stacks with no_predicates (noir-lang/noir#5418)
feat: lsp rename/find-all-references for traits (noir-lang/noir#5409)
feat: lsp "go to definition" for modules (noir-lang/noir#5406)
fix: lsp find struct reference in return locations and paths (noir-lang/noir#5404)
feat: Sync from aztec-packages (noir-lang/noir#5408)
TomAFrench pushed a commit to AztecProtocol/aztec-packages that referenced this pull request Jul 8, 2024
@AztecBot
feat: Sync from noir (#7352)
c7b1ae4 
Automated pull of development from the
[noir](https://github.com/noir-lang/noir) programming language, a
dependency of Aztec.
BEGIN_COMMIT_OVERRIDE
fix: correct range for overlfowing/underflowing integer assignment
(noir-lang/noir#5416)
feat: Detect subgraphs that are completely independent from inputs or
outputs (noir-lang/noir#5402)
chore: Add remaining slice methods to the interpreter
(noir-lang/noir#5422)
chore: add test and benchmarks for poseidon2
(noir-lang/noir#5386)
fix: Complete call stacks with no_predicates
(noir-lang/noir#5418)
feat: lsp rename/find-all-references for traits
(noir-lang/noir#5409)
feat: lsp "go to definition" for modules
(noir-lang/noir#5406)
fix: lsp find struct reference in return locations and paths
(noir-lang/noir#5404)
feat: Sync from aztec-packages
(noir-lang/noir#5408)
END_COMMIT_OVERRIDE
@AztecBot AztecBot mentioned this pull request Jul 8, 2024
Merged
rahul-kothari pushed a commit to AztecProtocol/aztec-packages that referenced this pull request Jul 9, 2024
@AztecBot
chore(master): Release 0.46.0 (#7345)
046af9b 
🤖 I have created a release *beep* *boop*
---


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

##
[0.46.0](aztec-package-v0.45.1...aztec-package-v0.46.0)
(2024-07-09)


### Features

* VK tree
([#6914](#6914))
([8631237](8631237))
</details>

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

##
[0.46.0](barretenberg.js-v0.45.1...barretenberg.js-v0.46.0)
(2024-07-09)


### Miscellaneous

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

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

##
[0.46.0](aztec-packages-v0.45.1...aztec-packages-v0.46.0)
(2024-07-09)


### ⚠ BREAKING CHANGES

* constant inputs for blackbox
([#7222](#7222))

### Features

* Add more slice methods to the stdlib
(noir-lang/noir#5424)
([6137a10](6137a10))
* Constant inputs for blackbox
([#7222](#7222))
([9f9ded2](9f9ded2))
* Detect subgraphs that are completely independent from inputs or
outputs (noir-lang/noir#5402)
([c7b1ae4](c7b1ae4))
* Lsp "go to definition" for modules
(noir-lang/noir#5406)
([c7b1ae4](c7b1ae4))
* Lsp rename/find-all-references for traits
(noir-lang/noir#5409)
([c7b1ae4](c7b1ae4))
* Lsp rename/find-all-references for type aliases
(noir-lang/noir#5414)
([6137a10](6137a10))
* Sync from aztec-packages (noir-lang/noir#5408)
([c7b1ae4](c7b1ae4))
* Sync from aztec-packages (noir-lang/noir#5432)
([6137a10](6137a10))
* TXE docs and usability
([#7305](#7305))
([6b2a351](6b2a351))
* Unquote multiple items from annotations
(noir-lang/noir#5441)
([6137a10](6137a10))
* VK tree
([#6914](#6914))
([8631237](8631237))


### Bug Fixes

* Allow importing notes from other contracts and inject them in the
macros
([#7349](#7349))
([586c0b0](586c0b0))
* Change panic to error in interpreter
(noir-lang/noir#5446)
([6137a10](6137a10))
* Complete call stacks with no_predicates
(noir-lang/noir#5418)
([c7b1ae4](c7b1ae4))
* Correct range for overlfowing/underflowing integer assignment
(noir-lang/noir#5416)
([c7b1ae4](c7b1ae4))
* Included argshash computation in public call_interfaces and cleanup
([#7354](#7354))
([13e9b94](13e9b94))
* Lsp find struct reference in return locations and paths
(noir-lang/noir#5404)
([c7b1ae4](c7b1ae4))
* Lsp struct rename/reference difference
(noir-lang/noir#5411)
([6137a10](6137a10))
* Privacy leak in private refund
([#7358](#7358))
([e05f6f0](e05f6f0)),
closes
[#7321](#7321)


### Miscellaneous

* Add remaining slice methods to the interpreter
(noir-lang/noir#5422)
([c7b1ae4](c7b1ae4))
* Add test and benchmarks for poseidon2
(noir-lang/noir#5386)
([c7b1ae4](c7b1ae4))
* **avm:** Avoid including flavor where possible
([#7361](#7361))
([dbdffd6](dbdffd6))
* **avm:** Better log_derivative_inverse_round
([#7360](#7360))
([6329833](6329833))
* **avm:** Smaller prover
([#7359](#7359))
([7d8c833](7d8c833))
* **avm:** Smaller transcript
([#7357](#7357))
([3952a44](3952a44))
* **bb:** Do not instantiate Relation
([#7389](#7389))
([d9cbf4c](d9cbf4c))
* Counters
([#7342](#7342))
([819f370](819f370))
* **docs:** Fix link to docker
([#7395](#7395))
([ad4a401](ad4a401))
* **docs:** Update token tutorial
([#7241](#7241))
([0414eb5](0414eb5))
* Dummy workflow (noir-lang/noir#5438)
([6137a10](6137a10))
* Extracts refactoring of reading error payloads from
[#5403](#5403)
(noir-lang/noir#5413)
([6137a10](6137a10))
* Generate declaration files for VKs
([#7391](#7391))
([7c96636](7c96636))
* Merge `BarretenbergVerifierBackend` and `BarretenbergBackend`
(noir-lang/noir#5399)
([6137a10](6137a10))
* Move SSA checks to a new folder
(noir-lang/noir#5434)
([6137a10](6137a10))
* Notify Noir team on changes to the stdlib
([#7387](#7387))
([061aac3](061aac3))
* Optimize private call stack item hash for gate count
([#7285](#7285))
([783d9b6](783d9b6))
* Optimize public call stack item hashing
([#7330](#7330))
([4a5093c](4a5093c))
* Refactor logic around inlining `no_predicates` functions
(noir-lang/noir#5433)
([6137a10](6137a10))
* Replace relative paths to noir-protocol-circuits
([8510269](8510269))
* Replace relative paths to noir-protocol-circuits
([9eb8d1c](9eb8d1c))
* Sync external contributions
([#6984](#6984))
([a265b29](a265b29))


### Documentation

* Making private refunds smooth-brain friendly
([#7343](#7343))
([533c937](533c937))
* Update overview.md (fix link text)
([#7344](#7344))
([79e5856](79e5856))
</details>

<details><summary>barretenberg: 0.46.0</summary>

##
[0.46.0](barretenberg-v0.45.1...barretenberg-v0.46.0)
(2024-07-09)


### ⚠ BREAKING CHANGES

* constant inputs for blackbox
([#7222](#7222))

### Features

* Constant inputs for blackbox
([#7222](#7222))
([9f9ded2](9f9ded2))


### Miscellaneous

* **avm:** Avoid including flavor where possible
([#7361](#7361))
([dbdffd6](dbdffd6))
* **avm:** Better log_derivative_inverse_round
([#7360](#7360))
([6329833](6329833))
* **avm:** Smaller prover
([#7359](#7359))
([7d8c833](7d8c833))
* **avm:** Smaller transcript
([#7357](#7357))
([3952a44](3952a44))
* **bb:** Do not instantiate Relation
([#7389](#7389))
([d9cbf4c](d9cbf4c))
* Counters
([#7342](#7342))
([819f370](819f370))
</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 Jul 10, 2024
@AztecBot
chore(master): Release 0.46.0 (#7345)
d79d195 
🤖 I have created a release *beep* *boop*
---


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

##
[0.46.0](AztecProtocol/aztec-packages@aztec-package-v0.45.1...aztec-package-v0.46.0)
(2024-07-09)


### Features

* VK tree
([#6914](AztecProtocol/aztec-packages#6914))
([8631237](AztecProtocol/aztec-packages@8631237))
</details>

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

##
[0.46.0](AztecProtocol/aztec-packages@barretenberg.js-v0.45.1...barretenberg.js-v0.46.0)
(2024-07-09)


### Miscellaneous

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

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

##
[0.46.0](AztecProtocol/aztec-packages@aztec-packages-v0.45.1...aztec-packages-v0.46.0)
(2024-07-09)


### ⚠ BREAKING CHANGES

* constant inputs for blackbox
([#7222](AztecProtocol/aztec-packages#7222))

### Features

* Add more slice methods to the stdlib
(noir-lang/noir#5424)
([6137a10](AztecProtocol/aztec-packages@6137a10))
* Constant inputs for blackbox
([#7222](AztecProtocol/aztec-packages#7222))
([9f9ded2](AztecProtocol/aztec-packages@9f9ded2))
* Detect subgraphs that are completely independent from inputs or
outputs (noir-lang/noir#5402)
([c7b1ae4](AztecProtocol/aztec-packages@c7b1ae4))
* Lsp "go to definition" for modules
(noir-lang/noir#5406)
([c7b1ae4](AztecProtocol/aztec-packages@c7b1ae4))
* Lsp rename/find-all-references for traits
(noir-lang/noir#5409)
([c7b1ae4](AztecProtocol/aztec-packages@c7b1ae4))
* Lsp rename/find-all-references for type aliases
(noir-lang/noir#5414)
([6137a10](AztecProtocol/aztec-packages@6137a10))
* Sync from aztec-packages (noir-lang/noir#5408)
([c7b1ae4](AztecProtocol/aztec-packages@c7b1ae4))
* Sync from aztec-packages (noir-lang/noir#5432)
([6137a10](AztecProtocol/aztec-packages@6137a10))
* TXE docs and usability
([#7305](AztecProtocol/aztec-packages#7305))
([6b2a351](AztecProtocol/aztec-packages@6b2a351))
* Unquote multiple items from annotations
(noir-lang/noir#5441)
([6137a10](AztecProtocol/aztec-packages@6137a10))
* VK tree
([#6914](AztecProtocol/aztec-packages#6914))
([8631237](AztecProtocol/aztec-packages@8631237))


### Bug Fixes

* Allow importing notes from other contracts and inject them in the
macros
([#7349](AztecProtocol/aztec-packages#7349))
([586c0b0](AztecProtocol/aztec-packages@586c0b0))
* Change panic to error in interpreter
(noir-lang/noir#5446)
([6137a10](AztecProtocol/aztec-packages@6137a10))
* Complete call stacks with no_predicates
(noir-lang/noir#5418)
([c7b1ae4](AztecProtocol/aztec-packages@c7b1ae4))
* Correct range for overlfowing/underflowing integer assignment
(noir-lang/noir#5416)
([c7b1ae4](AztecProtocol/aztec-packages@c7b1ae4))
* Included argshash computation in public call_interfaces and cleanup
([#7354](AztecProtocol/aztec-packages#7354))
([13e9b94](AztecProtocol/aztec-packages@13e9b94))
* Lsp find struct reference in return locations and paths
(noir-lang/noir#5404)
([c7b1ae4](AztecProtocol/aztec-packages@c7b1ae4))
* Lsp struct rename/reference difference
(noir-lang/noir#5411)
([6137a10](AztecProtocol/aztec-packages@6137a10))
* Privacy leak in private refund
([#7358](AztecProtocol/aztec-packages#7358))
([e05f6f0](AztecProtocol/aztec-packages@e05f6f0)),
closes
[#7321](AztecProtocol/aztec-packages#7321)


### Miscellaneous

* Add remaining slice methods to the interpreter
(noir-lang/noir#5422)
([c7b1ae4](AztecProtocol/aztec-packages@c7b1ae4))
* Add test and benchmarks for poseidon2
(noir-lang/noir#5386)
([c7b1ae4](AztecProtocol/aztec-packages@c7b1ae4))
* **avm:** Avoid including flavor where possible
([#7361](AztecProtocol/aztec-packages#7361))
([dbdffd6](AztecProtocol/aztec-packages@dbdffd6))
* **avm:** Better log_derivative_inverse_round
([#7360](AztecProtocol/aztec-packages#7360))
([6329833](AztecProtocol/aztec-packages@6329833))
* **avm:** Smaller prover
([#7359](AztecProtocol/aztec-packages#7359))
([7d8c833](AztecProtocol/aztec-packages@7d8c833))
* **avm:** Smaller transcript
([#7357](AztecProtocol/aztec-packages#7357))
([3952a44](AztecProtocol/aztec-packages@3952a44))
* **bb:** Do not instantiate Relation
([#7389](AztecProtocol/aztec-packages#7389))
([d9cbf4c](AztecProtocol/aztec-packages@d9cbf4c))
* Counters
([#7342](AztecProtocol/aztec-packages#7342))
([819f370](AztecProtocol/aztec-packages@819f370))
* **docs:** Fix link to docker
([#7395](AztecProtocol/aztec-packages#7395))
([ad4a401](AztecProtocol/aztec-packages@ad4a401))
* **docs:** Update token tutorial
([#7241](AztecProtocol/aztec-packages#7241))
([0414eb5](AztecProtocol/aztec-packages@0414eb5))
* Dummy workflow (noir-lang/noir#5438)
([6137a10](AztecProtocol/aztec-packages@6137a10))
* Extracts refactoring of reading error payloads from
[#5403](AztecProtocol/aztec-packages#5403)
(noir-lang/noir#5413)
([6137a10](AztecProtocol/aztec-packages@6137a10))
* Generate declaration files for VKs
([#7391](AztecProtocol/aztec-packages#7391))
([7c96636](AztecProtocol/aztec-packages@7c96636))
* Merge `BarretenbergVerifierBackend` and `BarretenbergBackend`
(noir-lang/noir#5399)
([6137a10](AztecProtocol/aztec-packages@6137a10))
* Move SSA checks to a new folder
(noir-lang/noir#5434)
([6137a10](AztecProtocol/aztec-packages@6137a10))
* Notify Noir team on changes to the stdlib
([#7387](AztecProtocol/aztec-packages#7387))
([061aac3](AztecProtocol/aztec-packages@061aac3))
* Optimize private call stack item hash for gate count
([#7285](AztecProtocol/aztec-packages#7285))
([783d9b6](AztecProtocol/aztec-packages@783d9b6))
* Optimize public call stack item hashing
([#7330](AztecProtocol/aztec-packages#7330))
([4a5093c](AztecProtocol/aztec-packages@4a5093c))
* Refactor logic around inlining `no_predicates` functions
(noir-lang/noir#5433)
([6137a10](AztecProtocol/aztec-packages@6137a10))
* Replace relative paths to noir-protocol-circuits
([8510269](AztecProtocol/aztec-packages@8510269))
* Replace relative paths to noir-protocol-circuits
([9eb8d1c](AztecProtocol/aztec-packages@9eb8d1c))
* Sync external contributions
([#6984](AztecProtocol/aztec-packages#6984))
([a265b29](AztecProtocol/aztec-packages@a265b29))


### Documentation

* Making private refunds smooth-brain friendly
([#7343](AztecProtocol/aztec-packages#7343))
([533c937](AztecProtocol/aztec-packages@533c937))
* Update overview.md (fix link text)
([#7344](AztecProtocol/aztec-packages#7344))
([79e5856](AztecProtocol/aztec-packages@79e5856))
</details>

<details><summary>barretenberg: 0.46.0</summary>

##
[0.46.0](AztecProtocol/aztec-packages@barretenberg-v0.45.1...barretenberg-v0.46.0)
(2024-07-09)


### ⚠ BREAKING CHANGES

* constant inputs for blackbox
([#7222](AztecProtocol/aztec-packages#7222))

### Features

* Constant inputs for blackbox
([#7222](AztecProtocol/aztec-packages#7222))
([9f9ded2](AztecProtocol/aztec-packages@9f9ded2))


### Miscellaneous

* **avm:** Avoid including flavor where possible
([#7361](AztecProtocol/aztec-packages#7361))
([dbdffd6](AztecProtocol/aztec-packages@dbdffd6))
* **avm:** Better log_derivative_inverse_round
([#7360](AztecProtocol/aztec-packages#7360))
([6329833](AztecProtocol/aztec-packages@6329833))
* **avm:** Smaller prover
([#7359](AztecProtocol/aztec-packages#7359))
([7d8c833](AztecProtocol/aztec-packages@7d8c833))
* **avm:** Smaller transcript
([#7357](AztecProtocol/aztec-packages#7357))
([3952a44](AztecProtocol/aztec-packages@3952a44))
* **bb:** Do not instantiate Relation
([#7389](AztecProtocol/aztec-packages#7389))
([d9cbf4c](AztecProtocol/aztec-packages@d9cbf4c))
* Counters
([#7342](AztecProtocol/aztec-packages#7342))
([819f370](AztecProtocol/aztec-packages@819f370))
</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
Reviewers

@michaeljklein michaeljklein michaeljklein approved these changes

Assignees
No one assigned
Labels
documentation Improvements or additions to documentation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@TomAFrench @michaeljklein