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

feat: g1 optimizations #2

Open
wants to merge 3 commits into
base: patch-v0.8.0
Choose a base branch
from
Open

feat: g1 optimizations #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4648de9
feat(wip): msm optimizations
0xWOLAND Aug 26, 2024
485cb1a
feat(wip): msm optimizations
0xWOLAND Aug 26, 2024
93e6906
chore(wip): debug msm
0xWOLAND Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 61 additions & 54 deletions src/fp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,13 +473,18 @@ impl Fp {
}

#[inline]
#[cfg(target_os = "zkvm")]
pub fn add_inp(&mut self, rhs: &Fp) {
unsafe {
syscall_bls12381_fp_addmod(
self.0.as_mut_ptr() as *mut u32,
rhs.0.as_ptr() as *const u32,
);
cfg_if! {
if #[cfg(target_os = "zkvm")] {
unsafe {
syscall_bls12381_fp_addmod(
self.0.as_mut_ptr() as *mut u32,
rhs.0.as_ptr() as *const u32,
);
}
} else {
*self = self.cpu_add(rhs);
}
}
}

Expand All @@ -500,15 +505,19 @@ impl Fp {

#[inline]
pub fn add(&self, rhs: &Fp) -> Fp {
let mut out = *self;
out.add_inp(rhs);
out
}

#[inline]
pub fn double_inp(&mut self) {
cfg_if::cfg_if! {
if #[cfg(target_os = "zkvm")] {
let mut out = self.clone();
unsafe {
syscall_bls12381_fp_addmod(out.0.as_mut_ptr() as *mut u32, rhs.0.as_ptr() as *const u32);
}
out
let tmp = *self;
self.add_inp(&tmp);
} else {
self.cpu_add(rhs)
*self = self.cpu_add(self);
}
}
}
Expand Down Expand Up @@ -554,31 +563,28 @@ impl Fp {
}

#[inline]
#[cfg(target_os = "zkvm")]
pub fn sub_inp(&mut self, rhs: &Fp) {
unsafe {
syscall_bls12381_fp_submod(
self.0.as_mut_ptr() as *mut u32,
rhs.0.as_ptr() as *const u32,
);
}
}

#[inline]
pub fn sub(&self, rhs: &Fp) -> Fp {
cfg_if::cfg_if! {
cfg_if! {
if #[cfg(target_os = "zkvm")] {
let mut out = self.clone();
unsafe {
syscall_bls12381_fp_submod(out.0.as_mut_ptr() as *mut u32, rhs.0.as_ptr() as *const u32);
syscall_bls12381_fp_submod(
self.0.as_mut_ptr() as *mut u32,
rhs.0.as_ptr() as *const u32,
);
}
out
} else {
rhs.neg().add(self)
*self = self.cpu_sub(rhs);
}
}
}

#[inline]
pub fn sub(&self, rhs: &Fp) -> Fp {
let mut out = *self;
out.sub_inp(rhs);
out
}

#[inline]
/// CPU version of the subtraction operation. Necessary to prevent syscalls in unconstrained mode.
pub(crate) fn cpu_sub(&self, rhs: &Fp) -> Fp {
Expand Down Expand Up @@ -740,15 +746,20 @@ impl Fp {
}

#[inline]
#[cfg(target_os = "zkvm")]
pub fn mul_inp(&mut self, rhs: &Fp) {
unsafe {
syscall_bls12381_fp_mulmod(
self.0.as_mut_ptr() as *mut u32,
rhs.0.as_ptr() as *const u32,
);
cfg_if! {
if #[cfg(target_os = "zkvm")] {
unsafe {
syscall_bls12381_fp_mulmod(
self.0.as_mut_ptr() as *mut u32,
rhs.0.as_ptr() as *const u32,
);
}
self.mul_r_inv_internal();
} else {
*self = self.cpu_mul(rhs);
}
}
self.mul_r_inv_internal();
}

#[inline]
Expand Down Expand Up @@ -801,18 +812,9 @@ impl Fp {

#[inline]
pub fn mul(&self, rhs: &Fp) -> Fp {
cfg_if::cfg_if! {
if #[cfg(target_os = "zkvm")] {
let mut out = self.clone();
unsafe {
syscall_bls12381_fp_mulmod(out.0.as_mut_ptr() as *mut u32, rhs.0.as_ptr() as *const u32);
}
out.mul_r_inv_internal();
out
} else {
self.cpu_mul(rhs)
}
}
let mut out = *self;
out.mul_inp(rhs);
out
}

/// Internal function to multiply the internal representation by `R_INV`, equivalent to transforming from
Expand Down Expand Up @@ -841,15 +843,20 @@ impl Fp {
}

#[inline]
#[cfg(target_os = "zkvm")]
pub fn square_inp(&mut self) {
unsafe {
syscall_bls12381_fp_mulmod(
self.0.as_mut_ptr() as *mut u32,
self.0.as_ptr() as *const u32,
);
cfg_if! {
if #[cfg(target_os = "zkvm")] {
unsafe {
syscall_bls12381_fp_mulmod(
self.0.as_mut_ptr() as *mut u32,
self.0.as_ptr() as *const u32,
);
}
self.mul_r_inv_internal();
} else {
*self = self.cpu_square();
}
}
self.mul_r_inv_internal();
}

/// CPU version of the squaring operation. Necessary to prevent syscalls in unconstrained mode.
Expand Down
Loading
Loading