Refactor Query #1146
Merged
Refactor Query #1146
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
porcuquine
force-pushed
the
query-refactor
branch
from
0cec606
to
a309297
Compare
porcuquine
force-pushed
the
query-refactor
branch
2 times, most recently
from
c69001e
to
90d76ea
Compare
adr1anh
reviewed
Feb 20, 2024
Comment on lines
+1153
to
+1161
| let (key, value) = s.car_cdr(kv).expect("kv missing"); | ||
| // NOTE: This is an unconstrained allocation, but when actually hooked up to Lurk reduction, it must be | ||
| // constrained appropriately. | ||
| let allocated_key = | ||
| AllocatedPtr::alloc(ns!(cs, "allocated_key"), || Ok(s.hash_ptr(&key))).unwrap(); | ||
| // NOTE: The returned value is unused here, but when actually hooked up to Lurk reduction, it must be used | ||
| // as the result of evaluating the query. | ||
| let _allocated_value = | ||
| self.synthesize_toplevel_query(cs, g, s, i, &allocated_key, value)?; |
There was a problem hiding this comment.
By "constrained appropriately", you mean that the Lurk reduction will be computed the allocated_key and that the circuit_scope would allocate the allocated_value that would be reused here ?
adr1anh
previously approved these changes
Feb 20, 2024
| @@ -87,8 +88,13 @@ where | |||
| store: &Store<F>, | |||
| result: AllocatedPtr<F>, | |||
| dependency_provenances: Vec<AllocatedPtr<F>>, | |||
| allocated_key: Option<&AllocatedPtr<F>>, | |||
There was a problem hiding this comment.
I don't understand why you're passing an option here, since you only call this function once on a Some
There was a problem hiding this comment.
Because I wasn't sure if we would need to do this the other way. It's just for generality. Once we get this completely nailed down (and optimized), we can remove any unneeded code paths.
| q.clone() | ||
| } else { | ||
| self.synthesize_query(ns!(cs, "query"), g, store)? | ||
| }; |
There was a problem hiding this comment.
This seems dangerous. none/some will lead to non-uniform circuits
gabriel-barrett
requested changes
Feb 20, 2024
porcuquine
force-pushed
the
query-refactor
branch
from
509e227
to
868f59e
Compare
gabriel-barrett
approved these changes
Feb 20, 2024
winston-h-zhang
pushed a commit
that referenced
this pull request
Feb 27, 2024
* Refactor Query to be more granular. * Use allocated_key when proving query. * Fixed `allocated_key` (#1156) --------- Co-authored-by: porcuquine <porcuquine@users.noreply.github.com> Co-authored-by: Gabriel Barreto <gabriel.aquino.barreto@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR refactors the
CircuitQueryandRecursiveCircuitQuerytraits to allow more granular implementations. This is a step toward more flexible and optimized Coroutine circuit proofs.UPDATE: 90d76ea intends to a fix a bug whereby the allocated keys and values were not properly connected.
Notice that this fix remove a few hashes and noticeably reduces constraints, since we are now correctly reusing an allocated value rather than expensively recomputing it.