-
Notifications
You must be signed in to change notification settings - Fork 236
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: add goblin ops in add_gates_to_ensure_all_polys_are_non_zero #5468
Conversation
barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/goblin_ultra_circuit_builder.cpp
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Overall I think this is a good step but I think we need to make an important distinction between the UGH context and the Goblin context. (see my review comments for more detail on what I mean). This is probably my fault for inappropriately labelling some of the Goblin cases with a TODO when this really only applies to UGH.
@@ -46,7 +46,6 @@ class ClientIVCTests : public ::testing::Test { | |||
{ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The comments on this function may be a bit confusing/misleading - maybe we can change to say something like "default gates added to avoid nonzero polynomials will bump size to next power of 2"
@@ -15,10 +15,6 @@ void GoblinAcirComposer::create_circuit(acir_format::AcirFormat& constraint_syst | |||
|
|||
// Populate constraints in the builder via the data in constraint_system | |||
acir_format::build_constraints(builder_, constraint_system, true); | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Its debatable whether we should remove the ops here. In the case of UGH, removing them is fine since eventually we'd like a world where we dont NEED goblin ops to make a valid proof. This one, however, is a Goblin specific test so it would defeat the purpose of the test to not have any ops. So when/if we get rid of the add_gates_to_ensure..
, this test would be quietly made useless. I think we should continue to explicitly add ops here in one way or another, with a comment explaining why, so someone who thinks they're clever doesn't go and remove them later. What do you think?
@@ -48,7 +48,6 @@ TEST_F(GoblinRecursionTests, Vanilla) | |||
// Construct and accumulate a mock function circuit | |||
GoblinUltraCircuitBuilder function_circuit{ goblin.op_queue }; | |||
MockCircuits::construct_arithmetic_circuit(function_circuit, /*target_log2_dyadic_size=*/8); | |||
MockCircuits::construct_goblin_ecc_op_circuit(function_circuit); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same here
* | ||
* @param builder | ||
*/ | ||
static void construct_goblin_ecc_op_circuit(GoblinUltraCircuitBuilder& builder) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we should keep this function but expand it to include at least one of each type of op (mul, add, eq) and use this in the Goblin-specific places I mentioned to continue to ensure we're getting robust testing that's not implicitly tied to the _add_gates_to_ensure functionality.
Benchmark resultsNo metrics with a significant change found. Detailed resultsAll benchmarks are run on txs on the This benchmark source data is available in JSON format on S3 here. Values are compared against data from master at commit L2 block published to L1Each column represents the number of txs on an L2 block published to L1.
L2 chain processingEach column represents the number of blocks on the L2 chain where each block has 16 txs.
Circuits statsStats on running time and I/O sizes collected for every circuit run across all benchmarks.
Tree insertion statsThe duration to insert a fixed batch of leaves into each tree type.
MiscellaneousTransaction sizes based on how many contract classes are registered in the tx.
Transaction size based on fee payment method
Transaction processing duration by data writes.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good - thanks for the updates!
…5468) Resolves AztecProtocol/barretenberg#843. Removes the need to add golin ecc ops for each UGH circuit by ensuring we add the dummy gates as part of the function used to ensure other polynomials are non-zero due to the absence of specific gates. However, we keep adding goblin ecc gates to circuits in situations when we want to test Goblin and also in ClientIVC because merge proving is done prior to ProverInstance creation.
commit 4064e18 Author: AztecBot <[email protected]> Date: Thu Mar 28 02:17:40 2024 +0000 git subrepo push --branch=master noir-projects/aztec-nr subrepo: subdir: "noir-projects/aztec-nr" merged: "485393ab1" upstream: origin: "https://github.com/AztecProtocol/aztec-nr" branch: "master" commit: "485393ab1" git-subrepo: version: "0.4.6" origin: "???" commit: "???" [skip ci] commit a8b48b8 Author: AztecBot <[email protected]> Date: Thu Mar 28 02:17:37 2024 +0000 git_subrepo.sh: Fix parent in .gitrepo file. [skip ci] commit 1f468db Author: AztecBot <[email protected]> Date: Thu Mar 28 02:17:37 2024 +0000 chore: replace relative paths to noir-protocol-circuits commit 4329d40 Author: AztecBot <[email protected]> Date: Thu Mar 28 02:12:17 2024 +0000 git subrepo push --branch=master barretenberg subrepo: subdir: "barretenberg" merged: "8afbd6d42" upstream: origin: "https://github.com/AztecProtocol/barretenberg" branch: "master" commit: "8afbd6d42" git-subrepo: version: "0.4.6" origin: "???" commit: "???" [skip ci] commit a18288d Author: Álvaro Rodríguez <[email protected]> Date: Wed Mar 27 22:00:46 2024 +0100 feat: Dont double check num bits in brillig vm (#5489) We already have typed memory, that is checked on data ingestion and outputs of operations. It shouldn't be necessary to perform safe type conversions for MemoryValues commit b9041e4 Author: maramihali <[email protected]> Date: Wed Mar 27 16:39:39 2024 -0400 chore: add goblin ops in add_gates_to_ensure_all_polys_are_non_zero (#5468) Resolves AztecProtocol/barretenberg#843. Removes the need to add golin ecc ops for each UGH circuit by ensuring we add the dummy gates as part of the function used to ensure other polynomials are non-zero due to the absence of specific gates. However, we keep adding goblin ecc gates to circuits in situations when we want to test Goblin and also in ClientIVC because merge proving is done prior to ProverInstance creation. commit 277168f Author: esau <[email protected]> Date: Wed Mar 27 18:10:48 2024 +0100 chore: run nargo format for noir-projects (#5483)
🤖 I have created a release *beep* *boop* --- <details><summary>aztec-package: 0.32.1</summary> ## [0.32.1](aztec-package-v0.32.0...aztec-package-v0.32.1) (2024-04-02) ### Miscellaneous * Explicit type imports ([#5519](#5519)) ([2a217de](2a217de)) </details> <details><summary>barretenberg.js: 0.32.1</summary> ## [0.32.1](barretenberg.js-v0.32.0...barretenberg.js-v0.32.1) (2024-04-02) ### Features * Earthly split runners, structure reverts ([#5524](#5524)) ([fcb8787](fcb8787)) ### Bug Fixes * **ci:** Turn on earthly for everyone ([#5423](#5423)) ([bea3fcb](bea3fcb)) </details> <details><summary>aztec-cli: 0.32.1</summary> ## [0.32.1](aztec-cli-v0.32.0...aztec-cli-v0.32.1) (2024-04-02) ### Miscellaneous * Explicit type imports ([#5519](#5519)) ([2a217de](2a217de)) </details> <details><summary>aztec-packages: 0.32.1</summary> ## [0.32.1](aztec-packages-v0.32.0...aztec-packages-v0.32.1) (2024-04-02) ### Features * **acir_gen:** Fold attribute at compile-time and initial non inlined ACIR ([#5341](#5341)) ([a979150](a979150)) * **acvm:** Execute multiple circuits ([#5380](#5380)) ([bb71920](bb71920)) * Dont double check num bits in brillig vm ([#5489](#5489)) ([a18288d](a18288d)) * Earthly split runners, structure reverts ([#5524](#5524)) ([fcb8787](fcb8787)) * Parallel gtest ([#5498](#5498)) ([349ea59](349ea59)) ### Bug Fixes * **ci:** Turn on earthly for everyone ([#5423](#5423)) ([bea3fcb](bea3fcb)) * Cpp cache and add other e2e ([#5512](#5512)) ([4118bcd](4118bcd)) * Require noir-packages-test to finish ([#5505](#5505)) ([191f0df](191f0df)) * Univariate evals not set in ECCVM prover ([#5529](#5529)) ([f9a2b7c](f9a2b7c)) ### Miscellaneous * Add goblin ops in add_gates_to_ensure_all_polys_are_non_zero ([#5468](#5468)) ([b9041e4](b9041e4)) * **avm:** Add 15 additional 16-bit registers in ALU trace of AVM circuit ([#5503](#5503)) ([8725c39](8725c39)) * **avm:** Migrate memory data structure in AVM circuit to unordered map ([#5506](#5506)) ([ccd09aa](ccd09aa)) * Build contracts and protocol circuits sequentially if not enough ram ([#5499](#5499)) ([ea072b6](ea072b6)) * Bye bye shared ptrs for ultra/goblin ultra proving_keys :) ([#5407](#5407)) ([b94d0db](b94d0db)) * Clean up compute_next_accumulator ([#5516](#5516)) ([f9be2f2](f9be2f2)) * Explicit type imports ([#5519](#5519)) ([2a217de](2a217de)) * Improve caching in noir Earthfile ([#5513](#5513)) ([5d1fb44](5d1fb44)) * Inject fetcher instead of using global ([#5502](#5502)) ([a066544](a066544)) * Make get notes return all notes at beginning of array [#4991](#4991) ([#5321](#5321)) ([5c5b627](5c5b627)) * Move alphas generation to oink ([#5515](#5515)) ([3b964f3](3b964f3)) * Replace relative paths to noir-protocol-circuits ([a689e4e](a689e4e)) * Replace relative paths to noir-protocol-circuits ([db1bab5](db1bab5)) * Replace relative paths to noir-protocol-circuits ([b2ab64b](b2ab64b)) * Replace relative paths to noir-protocol-circuits ([1f468db](1f468db)) * Run nargo format for noir-projects ([#5483](#5483)) ([277168f](277168f)) </details> <details><summary>barretenberg: 0.32.1</summary> ## [0.32.1](barretenberg-v0.32.0...barretenberg-v0.32.1) (2024-04-02) ### Features * **acvm:** Execute multiple circuits ([#5380](#5380)) ([bb71920](bb71920)) * Earthly split runners, structure reverts ([#5524](#5524)) ([fcb8787](fcb8787)) * Parallel gtest ([#5498](#5498)) ([349ea59](349ea59)) ### Bug Fixes * **ci:** Turn on earthly for everyone ([#5423](#5423)) ([bea3fcb](bea3fcb)) * Cpp cache and add other e2e ([#5512](#5512)) ([4118bcd](4118bcd)) * Univariate evals not set in ECCVM prover ([#5529](#5529)) ([f9a2b7c](f9a2b7c)) ### Miscellaneous * Add goblin ops in add_gates_to_ensure_all_polys_are_non_zero ([#5468](#5468)) ([b9041e4](b9041e4)) * **avm:** Add 15 additional 16-bit registers in ALU trace of AVM circuit ([#5503](#5503)) ([8725c39](8725c39)) * **avm:** Migrate memory data structure in AVM circuit to unordered map ([#5506](#5506)) ([ccd09aa](ccd09aa)) * Bye bye shared ptrs for ultra/goblin ultra proving_keys :) ([#5407](#5407)) ([b94d0db](b94d0db)) * Clean up compute_next_accumulator ([#5516](#5516)) ([f9be2f2](f9be2f2)) * Move alphas generation to oink ([#5515](#5515)) ([3b964f3](3b964f3)) </details> --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
🤖 I have created a release *beep* *boop* --- <details><summary>aztec-package: 0.32.1</summary> ## [0.32.1](AztecProtocol/aztec-packages@aztec-package-v0.32.0...aztec-package-v0.32.1) (2024-04-02) ### Miscellaneous * Explicit type imports ([#5519](AztecProtocol/aztec-packages#5519)) ([2a217de](AztecProtocol/aztec-packages@2a217de)) </details> <details><summary>barretenberg.js: 0.32.1</summary> ## [0.32.1](AztecProtocol/aztec-packages@barretenberg.js-v0.32.0...barretenberg.js-v0.32.1) (2024-04-02) ### Features * Earthly split runners, structure reverts ([#5524](AztecProtocol/aztec-packages#5524)) ([fcb8787](AztecProtocol/aztec-packages@fcb8787)) ### Bug Fixes * **ci:** Turn on earthly for everyone ([#5423](AztecProtocol/aztec-packages#5423)) ([bea3fcb](AztecProtocol/aztec-packages@bea3fcb)) </details> <details><summary>aztec-cli: 0.32.1</summary> ## [0.32.1](AztecProtocol/aztec-packages@aztec-cli-v0.32.0...aztec-cli-v0.32.1) (2024-04-02) ### Miscellaneous * Explicit type imports ([#5519](AztecProtocol/aztec-packages#5519)) ([2a217de](AztecProtocol/aztec-packages@2a217de)) </details> <details><summary>aztec-packages: 0.32.1</summary> ## [0.32.1](AztecProtocol/aztec-packages@aztec-packages-v0.32.0...aztec-packages-v0.32.1) (2024-04-02) ### Features * **acir_gen:** Fold attribute at compile-time and initial non inlined ACIR ([#5341](AztecProtocol/aztec-packages#5341)) ([a979150](AztecProtocol/aztec-packages@a979150)) * **acvm:** Execute multiple circuits ([#5380](AztecProtocol/aztec-packages#5380)) ([bb71920](AztecProtocol/aztec-packages@bb71920)) * Dont double check num bits in brillig vm ([#5489](AztecProtocol/aztec-packages#5489)) ([a18288d](AztecProtocol/aztec-packages@a18288d)) * Earthly split runners, structure reverts ([#5524](AztecProtocol/aztec-packages#5524)) ([fcb8787](AztecProtocol/aztec-packages@fcb8787)) * Parallel gtest ([#5498](AztecProtocol/aztec-packages#5498)) ([349ea59](AztecProtocol/aztec-packages@349ea59)) ### Bug Fixes * **ci:** Turn on earthly for everyone ([#5423](AztecProtocol/aztec-packages#5423)) ([bea3fcb](AztecProtocol/aztec-packages@bea3fcb)) * Cpp cache and add other e2e ([#5512](AztecProtocol/aztec-packages#5512)) ([4118bcd](AztecProtocol/aztec-packages@4118bcd)) * Require noir-packages-test to finish ([#5505](AztecProtocol/aztec-packages#5505)) ([191f0df](AztecProtocol/aztec-packages@191f0df)) * Univariate evals not set in ECCVM prover ([#5529](AztecProtocol/aztec-packages#5529)) ([f9a2b7c](AztecProtocol/aztec-packages@f9a2b7c)) ### Miscellaneous * Add goblin ops in add_gates_to_ensure_all_polys_are_non_zero ([#5468](AztecProtocol/aztec-packages#5468)) ([b9041e4](AztecProtocol/aztec-packages@b9041e4)) * **avm:** Add 15 additional 16-bit registers in ALU trace of AVM circuit ([#5503](AztecProtocol/aztec-packages#5503)) ([8725c39](AztecProtocol/aztec-packages@8725c39)) * **avm:** Migrate memory data structure in AVM circuit to unordered map ([#5506](AztecProtocol/aztec-packages#5506)) ([ccd09aa](AztecProtocol/aztec-packages@ccd09aa)) * Build contracts and protocol circuits sequentially if not enough ram ([#5499](AztecProtocol/aztec-packages#5499)) ([ea072b6](AztecProtocol/aztec-packages@ea072b6)) * Bye bye shared ptrs for ultra/goblin ultra proving_keys :) ([#5407](AztecProtocol/aztec-packages#5407)) ([b94d0db](AztecProtocol/aztec-packages@b94d0db)) * Clean up compute_next_accumulator ([#5516](AztecProtocol/aztec-packages#5516)) ([f9be2f2](AztecProtocol/aztec-packages@f9be2f2)) * Explicit type imports ([#5519](AztecProtocol/aztec-packages#5519)) ([2a217de](AztecProtocol/aztec-packages@2a217de)) * Improve caching in noir Earthfile ([#5513](AztecProtocol/aztec-packages#5513)) ([5d1fb44](AztecProtocol/aztec-packages@5d1fb44)) * Inject fetcher instead of using global ([#5502](AztecProtocol/aztec-packages#5502)) ([a066544](AztecProtocol/aztec-packages@a066544)) * Make get notes return all notes at beginning of array [#4991](AztecProtocol/aztec-packages#4991) ([#5321](AztecProtocol/aztec-packages#5321)) ([5c5b627](AztecProtocol/aztec-packages@5c5b627)) * Move alphas generation to oink ([#5515](AztecProtocol/aztec-packages#5515)) ([3b964f3](AztecProtocol/aztec-packages@3b964f3)) * Replace relative paths to noir-protocol-circuits ([a689e4e](AztecProtocol/aztec-packages@a689e4e)) * Replace relative paths to noir-protocol-circuits ([db1bab5](AztecProtocol/aztec-packages@db1bab5)) * Replace relative paths to noir-protocol-circuits ([b2ab64b](AztecProtocol/aztec-packages@b2ab64b)) * Replace relative paths to noir-protocol-circuits ([1f468db](AztecProtocol/aztec-packages@1f468db)) * Run nargo format for noir-projects ([#5483](AztecProtocol/aztec-packages#5483)) ([277168f](AztecProtocol/aztec-packages@277168f)) </details> <details><summary>barretenberg: 0.32.1</summary> ## [0.32.1](AztecProtocol/aztec-packages@barretenberg-v0.32.0...barretenberg-v0.32.1) (2024-04-02) ### Features * **acvm:** Execute multiple circuits ([#5380](AztecProtocol/aztec-packages#5380)) ([bb71920](AztecProtocol/aztec-packages@bb71920)) * Earthly split runners, structure reverts ([#5524](AztecProtocol/aztec-packages#5524)) ([fcb8787](AztecProtocol/aztec-packages@fcb8787)) * Parallel gtest ([#5498](AztecProtocol/aztec-packages#5498)) ([349ea59](AztecProtocol/aztec-packages@349ea59)) ### Bug Fixes * **ci:** Turn on earthly for everyone ([#5423](AztecProtocol/aztec-packages#5423)) ([bea3fcb](AztecProtocol/aztec-packages@bea3fcb)) * Cpp cache and add other e2e ([#5512](AztecProtocol/aztec-packages#5512)) ([4118bcd](AztecProtocol/aztec-packages@4118bcd)) * Univariate evals not set in ECCVM prover ([#5529](AztecProtocol/aztec-packages#5529)) ([f9a2b7c](AztecProtocol/aztec-packages@f9a2b7c)) ### Miscellaneous * Add goblin ops in add_gates_to_ensure_all_polys_are_non_zero ([#5468](AztecProtocol/aztec-packages#5468)) ([b9041e4](AztecProtocol/aztec-packages@b9041e4)) * **avm:** Add 15 additional 16-bit registers in ALU trace of AVM circuit ([#5503](AztecProtocol/aztec-packages#5503)) ([8725c39](AztecProtocol/aztec-packages@8725c39)) * **avm:** Migrate memory data structure in AVM circuit to unordered map ([#5506](AztecProtocol/aztec-packages#5506)) ([ccd09aa](AztecProtocol/aztec-packages@ccd09aa)) * Bye bye shared ptrs for ultra/goblin ultra proving_keys :) ([#5407](AztecProtocol/aztec-packages#5407)) ([b94d0db](AztecProtocol/aztec-packages@b94d0db)) * Clean up compute_next_accumulator ([#5516](AztecProtocol/aztec-packages#5516)) ([f9be2f2](AztecProtocol/aztec-packages@f9be2f2)) * Move alphas generation to oink ([#5515](AztecProtocol/aztec-packages#5515)) ([3b964f3](AztecProtocol/aztec-packages@3b964f3)) </details> --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
Resolves AztecProtocol/barretenberg#843.
Removes the need to add golin ecc ops for each UGH circuit by
ensuring we add the dummy gates as part of the function used to ensure
other polynomials are non-zero due to the absence of specific gates. However, we keep adding goblin ecc gates
to circuits in situations when we want to test Goblin and also in ClientIVC because merge proving is done prior to ProverInstance creation.