-
Notifications
You must be signed in to change notification settings - Fork 56
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* moved demo to own file * make mod generic * scope synthesize * Be more anonymous. * removed circuit scope synthesize * reverted associated types * removed unreachable_pub * Reimplement symbol(). * removed commented lines * circuit_scope type can be inferred --------- Co-authored-by: porcuquine <[email protected]>
- Loading branch information
1 parent
fa6d5c0
commit a9a5f10
Showing
3 changed files
with
311 additions
and
320 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,255 @@ | ||
use bellpepper_core::{num::AllocatedNum, ConstraintSystem, SynthesisError}; | ||
|
||
use super::{ | ||
query::{CircuitQuery, Query}, | ||
CircuitScope, CircuitTranscript, LogMemo, Scope, | ||
}; | ||
use crate::circuit::gadgets::constraints::alloc_is_zero; | ||
use crate::coprocessor::gadgets::construct_list; | ||
use crate::coprocessor::AllocatedPtr; | ||
use crate::field::LurkField; | ||
use crate::lem::circuit::GlobalAllocator; | ||
use crate::lem::{pointers::Ptr, store::Store}; | ||
use crate::symbol::Symbol; | ||
use crate::tag::{ExprTag, Tag}; | ||
|
||
#[allow(dead_code)] | ||
#[derive(Debug, Clone)] | ||
pub(crate) enum DemoQuery<F> { | ||
Factorial(Ptr), | ||
Phantom(F), | ||
} | ||
|
||
#[derive(Debug, Clone)] | ||
pub(crate) enum DemoCircuitQuery<F: LurkField> { | ||
Factorial(AllocatedPtr<F>), | ||
} | ||
|
||
impl<F: LurkField> Query<F> for DemoQuery<F> { | ||
type CQ = DemoCircuitQuery<F>; | ||
|
||
// DemoQuery and Scope depend on each other. | ||
fn eval(&self, s: &Store<F>, scope: &mut Scope<F, Self, LogMemo<F>>) -> Ptr { | ||
match self { | ||
Self::Factorial(n) => { | ||
let n_zptr = s.hash_ptr(n); | ||
let n = n_zptr.value(); | ||
|
||
if *n == F::ZERO { | ||
s.num(F::ONE) | ||
} else { | ||
let m_ptr = self.recursive_eval(scope, s, Self::Factorial(s.num(*n - F::ONE))); | ||
let m_zptr = s.hash_ptr(&m_ptr); | ||
let m = m_zptr.value(); | ||
|
||
s.num(*n * m) | ||
} | ||
} | ||
_ => unreachable!(), | ||
} | ||
} | ||
|
||
fn recursive_eval( | ||
&self, | ||
scope: &mut Scope<F, Self, LogMemo<F>>, | ||
s: &Store<F>, | ||
subquery: Self, | ||
) -> Ptr { | ||
scope.query_recursively(s, self, subquery) | ||
} | ||
|
||
fn symbol(&self) -> Symbol { | ||
match self { | ||
Self::Factorial(_) => Symbol::sym(&["lurk", "user", "factorial"]), | ||
_ => unreachable!(), | ||
} | ||
} | ||
|
||
fn from_ptr(s: &Store<F>, ptr: &Ptr) -> Option<Self> { | ||
let (head, body) = s.car_cdr(ptr).expect("query should be cons"); | ||
let sym = s.fetch_sym(&head).expect("head should be sym"); | ||
|
||
if sym == Symbol::sym(&["lurk", "user", "factorial"]) { | ||
let (num, _) = s.car_cdr(&body).expect("query body should be cons"); | ||
Some(Self::Factorial(num)) | ||
} else { | ||
None | ||
} | ||
} | ||
|
||
fn to_ptr(&self, s: &Store<F>) -> Ptr { | ||
match self { | ||
Self::Factorial(n) => { | ||
let factorial = s.intern_symbol(&self.symbol()); | ||
|
||
s.list(vec![factorial, *n]) | ||
} | ||
_ => unreachable!(), | ||
} | ||
} | ||
|
||
fn index(&self) -> usize { | ||
match self { | ||
Self::Factorial(_) => 0, | ||
_ => unreachable!(), | ||
} | ||
} | ||
} | ||
|
||
impl<F: LurkField> CircuitQuery<F> for DemoCircuitQuery<F> { | ||
fn synthesize_eval<CS: ConstraintSystem<F>>( | ||
&self, | ||
cs: &mut CS, | ||
g: &GlobalAllocator<F>, | ||
store: &Store<F>, | ||
scope: &mut CircuitScope<F, Self, LogMemo<F>>, | ||
acc: &AllocatedPtr<F>, | ||
transcript: &CircuitTranscript<F>, | ||
) -> Result<(AllocatedPtr<F>, AllocatedPtr<F>, CircuitTranscript<F>), SynthesisError> { | ||
match self { | ||
// TODO: Factor out the recursive boilerplate so individual queries can just implement their distinct logic | ||
// using a sane framework. | ||
Self::Factorial(n) => { | ||
// FIXME: Check n tag or decide not to. | ||
let base_case_f = g.alloc_const(cs, F::ONE); | ||
let base_case = AllocatedPtr::alloc_tag( | ||
&mut cs.namespace(|| "base_case"), | ||
ExprTag::Num.to_field(), | ||
base_case_f.clone(), | ||
)?; | ||
|
||
let n_is_zero = alloc_is_zero(&mut cs.namespace(|| "n_is_zero"), n.hash())?; | ||
|
||
let (recursive_result, recursive_acc, recursive_transcript) = { | ||
let new_n = AllocatedNum::alloc(&mut cs.namespace(|| "new_n"), || { | ||
n.hash() | ||
.get_value() | ||
.map(|n| n - F::ONE) | ||
.ok_or(SynthesisError::AssignmentMissing) | ||
})?; | ||
|
||
// new_n * 1 = n - 1 | ||
cs.enforce( | ||
|| "enforce_new_n", | ||
|lc| lc + new_n.get_variable(), | ||
|lc| lc + CS::one(), | ||
|lc| lc + n.hash().get_variable() - CS::one(), | ||
); | ||
|
||
let subquery = { | ||
let symbol = g.alloc_ptr(cs, &self.symbol_ptr(store), store); | ||
|
||
let new_num = AllocatedPtr::alloc_tag( | ||
&mut cs.namespace(|| "new_num"), | ||
ExprTag::Num.to_field(), | ||
new_n, | ||
)?; | ||
construct_list( | ||
&mut cs.namespace(|| "subquery"), | ||
g, | ||
store, | ||
&[&symbol, &new_num], | ||
None, | ||
)? | ||
}; | ||
|
||
let (sub_result, new_acc, new_transcript) = scope.synthesize_query( | ||
&mut cs.namespace(|| "recursive query"), | ||
g, | ||
store, | ||
&subquery, | ||
acc, | ||
transcript, | ||
&n_is_zero.not(), | ||
)?; | ||
|
||
let result_f = n.hash().mul( | ||
&mut cs.namespace(|| "incremental multiplication"), | ||
sub_result.hash(), | ||
)?; | ||
|
||
let result = AllocatedPtr::alloc_tag( | ||
&mut cs.namespace(|| "result"), | ||
ExprTag::Num.to_field(), | ||
result_f, | ||
)?; | ||
|
||
(result, new_acc, new_transcript) | ||
}; | ||
|
||
let value = AllocatedPtr::pick( | ||
&mut cs.namespace(|| "pick value"), | ||
&n_is_zero, | ||
&base_case, | ||
&recursive_result, | ||
)?; | ||
|
||
let acc = AllocatedPtr::pick( | ||
&mut cs.namespace(|| "pick acc"), | ||
&n_is_zero, | ||
acc, | ||
&recursive_acc, | ||
)?; | ||
|
||
let transcript = CircuitTranscript::pick( | ||
&mut cs.namespace(|| "pick recursive_transcript"), | ||
&n_is_zero, | ||
transcript, | ||
&recursive_transcript, | ||
)?; | ||
|
||
Ok((value, acc, transcript)) | ||
} | ||
} | ||
} | ||
|
||
fn from_ptr<CS: ConstraintSystem<F>>( | ||
cs: &mut CS, | ||
s: &Store<F>, | ||
ptr: &Ptr, | ||
) -> Result<Option<Self>, SynthesisError> { | ||
let query = DemoQuery::from_ptr(s, ptr); | ||
Ok(if let Some(q) = query { | ||
match q { | ||
DemoQuery::Factorial(n) => Some(Self::Factorial(AllocatedPtr::alloc(cs, || { | ||
Ok(s.hash_ptr(&n)) | ||
})?)), | ||
_ => unreachable!(), | ||
} | ||
} else { | ||
None | ||
}) | ||
} | ||
|
||
fn symbol(&self) -> Symbol { | ||
match self { | ||
Self::Factorial(_) => Symbol::sym(&["lurk", "user", "factorial"]), | ||
} | ||
} | ||
} | ||
|
||
#[cfg(test)] | ||
mod test { | ||
use super::*; | ||
|
||
use ff::Field; | ||
use pasta_curves::pallas::Scalar as F; | ||
|
||
#[test] | ||
fn test_factorial() { | ||
let s = Store::default(); | ||
let mut scope: Scope<F, DemoQuery<F>, LogMemo<F>> = Scope::default(); | ||
let zero = s.num(F::ZERO); | ||
let one = s.num(F::ONE); | ||
let two = s.num(F::from_u64(2)); | ||
let three = s.num(F::from_u64(3)); | ||
let four = s.num(F::from_u64(4)); | ||
let six = s.num(F::from_u64(6)); | ||
let twenty_four = s.num(F::from_u64(24)); | ||
assert_eq!(one, DemoQuery::Factorial(zero).eval(&s, &mut scope)); | ||
assert_eq!(one, DemoQuery::Factorial(one).eval(&s, &mut scope)); | ||
assert_eq!(two, DemoQuery::Factorial(two).eval(&s, &mut scope)); | ||
assert_eq!(six, DemoQuery::Factorial(three).eval(&s, &mut scope)); | ||
assert_eq!(twenty_four, DemoQuery::Factorial(four).eval(&s, &mut scope)); | ||
} | ||
} |
Oops, something went wrong.
a9a5f10
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.
Benchmarks
Table of Contents
Overview
This benchmark report shows the Fibonacci GPU benchmark.
NVIDIA L4
Intel(R) Xeon(R) CPU @ 2.20GHz
125.78 GB RAM
Workflow run: https://github.com/lurk-lab/lurk-rs/actions/runs/7504607219
Benchmark Results
LEM Fibonacci Prove - rc = 100
fib-ref=fa6d5c0e9b69cfc682924109bc34bf30e3cdde58
fib-ref=a9a5f10aeb79f22d7a07fccb9321209358ecc2b4
num-100
1.74 s
(✅ 1.00x)1.74 s
(✅ 1.00x faster)num-200
3.36 s
(✅ 1.00x)3.37 s
(✅ 1.00x slower)LEM Fibonacci Prove - rc = 600
fib-ref=fa6d5c0e9b69cfc682924109bc34bf30e3cdde58
fib-ref=a9a5f10aeb79f22d7a07fccb9321209358ecc2b4
num-100
2.03 s
(✅ 1.00x)2.03 s
(✅ 1.00x faster)num-200
3.39 s
(✅ 1.00x)3.38 s
(✅ 1.00x faster)Made with criterion-table