generated from eigerco/beerus
-
Notifications
You must be signed in to change notification settings - Fork 103
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
<!--- Please provide a general summary of your changes in the title above --> ## Pull Request type <!-- Please try to limit your pull request to one type; submit multiple pull requests if needed. --> Please check the type of change your PR introduces: - [ ] Bugfix - [x] Feature - [ ] Code style update (formatting, renaming) - [ ] Refactoring (no functional changes, no API changes) - [ ] Build-related changes - [ ] Documentation content changes - [ ] Other (please describe): ## What is the current behavior? Every operation requires immediate reduction. Many mul/sqr operations on u256 are followed by add/sub which can be easily aggregated before doing a single mod operation. This requires u512 arithmetic. This PR adds addition and subtraction for u512. ## What is the new behavior? Following functions are added ```rust pub fn u512_add(lhs: u512, rhs: u512) -> u512; pub fn u512_sub(lhs: u512, rhs: u512) -> u512; ``` ## Does this introduce a breaking change? - [ ] Yes - [x] No <!-- If this does introduce a breaking change, please describe the impact and migration path for existing applications below. -->
- Loading branch information
Showing
4 changed files
with
139 additions
and
0 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
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
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,50 @@ | ||
use alexandria_math::u512_arithmetics::{u512_add, u512_sub}; | ||
use core::integer::u512; | ||
|
||
const MAX_128: u128 = 0xffffffffffffffffffffffffffffffff; | ||
const A: u256 = 9099547013904003590785796930435194473319680151794113978918064868415326638035; | ||
const B: u256 = 8021715850804026033197027745655159931503181100513576347155970296011118125764; | ||
|
||
#[inline(always)] | ||
fn mu512(limb0: u128, limb1: u128, limb2: u128, limb3: u128) -> u512 { | ||
u512 { limb0, limb1, limb2, limb3 } | ||
} | ||
|
||
#[test] | ||
fn test_u512_add() { | ||
assert( | ||
u512_add(mu512(1, 2, 3, 4), mu512(5, 6, 7, 8)) == mu512(6, 8, 10, 12), 'incorrect u512 add' | ||
); | ||
assert( | ||
u512_add(mu512(MAX_128, 1, 2, 3), mu512(4, 5, 6, 7)) == mu512(3, 7, 8, 10), | ||
'incorrect u512 add' | ||
); | ||
} | ||
|
||
#[test] | ||
fn test_u512_sub() { | ||
let sub0 = u512_sub(mu512(5, 6, 7, 8), mu512(1, 2, 3, 4)); | ||
assert(sub0 == mu512(4, 4, 4, 4), 'incorrect u512 sub'); | ||
|
||
let sub1 = u512_sub(mu512(3, 2, 1, MAX_128,), mu512(7, 6, 5, 4)); | ||
assert( | ||
sub1 == mu512( | ||
0xfffffffffffffffffffffffffffffffc, | ||
0xfffffffffffffffffffffffffffffffb, | ||
0xfffffffffffffffffffffffffffffffb, | ||
0xfffffffffffffffffffffffffffffffa | ||
), | ||
'incorrect u512 sub1' | ||
); | ||
|
||
let sub2 = u512_sub(mu512(3, 2, 1, 1), mu512(7, 6, 5, 0)); | ||
assert( | ||
sub2 == mu512( | ||
0xfffffffffffffffffffffffffffffffc, | ||
0xfffffffffffffffffffffffffffffffb, | ||
0xfffffffffffffffffffffffffffffffb, | ||
0 | ||
), | ||
'incorrect u512 sub2' | ||
); | ||
} |
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,87 @@ | ||
use core::integer::u512; | ||
use core::integer::{u128_overflowing_add, u128_overflowing_sub}; | ||
use core::result::ResultTrait; | ||
|
||
pub fn u256_overflow_add(lhs: u256, rhs: u256) -> Result<u256, u256> implicits(RangeCheck) nopanic { | ||
let (sum, overflow) = core::integer::u256_overflowing_add(lhs, rhs); | ||
if overflow { | ||
Result::Err(sum) | ||
} else { | ||
Result::Ok(sum) | ||
} | ||
} | ||
|
||
pub fn u256_overflow_sub(lhs: u256, rhs: u256) -> Result<u256, u256> implicits(RangeCheck) nopanic { | ||
let (sum, overflow) = core::integer::u256_overflow_sub(lhs, rhs); | ||
if overflow { | ||
Result::Err(sum) | ||
} else { | ||
Result::Ok(sum) | ||
} | ||
} | ||
|
||
#[derive(Copy, Drop, Hash, PartialEq, Serde)] | ||
pub struct u256X2 { | ||
low: u256, | ||
high: u256, | ||
} | ||
|
||
pub impl U512Intou256X2 of Into<u512, u256X2> { | ||
#[inline(always)] | ||
fn into(self: u512) -> u256X2 { | ||
let u512 { limb0: low, limb1: high, limb2, limb3 } = self; | ||
u256X2 { low: u256 { low, high }, high: u256 { low: limb2, high: limb3 } } | ||
} | ||
} | ||
|
||
#[inline(always)] | ||
pub fn u512_add(lhs: u512, rhs: u512) -> u512 { | ||
let lhs: u256X2 = lhs.into(); | ||
let rhs: u256X2 = rhs.into(); | ||
|
||
// No overflow allowed | ||
let u256 { low: limb2, high: limb3 } = u256_overflow_add(lhs.high, rhs.high) | ||
.expect('u512 add overflow'); | ||
|
||
match u256_overflow_add(lhs.low, rhs.low) { | ||
Result::Ok(u256 { low: limb0, high: limb1 }) => { u512 { limb0, limb1, limb2, limb3 } }, | ||
Result::Err(u256 { low: limb0, | ||
high: limb1 }) => { | ||
// Try to move overflow to limb2 | ||
return match u128_overflowing_add(limb2, 1_u128) { | ||
Result::Ok(limb2) => u512 { limb0, limb1, limb2, limb3 }, | ||
Result::Err(limb2) => { | ||
// Try to move overflow to limb3 | ||
let limb3 = u128_overflowing_add(limb3, 1_u128).expect('u512 add overflow'); | ||
u512 { limb0, limb1, limb2, limb3 } | ||
}, | ||
}; | ||
}, | ||
} | ||
} | ||
|
||
#[inline(always)] | ||
pub fn u512_sub(lhs: u512, rhs: u512) -> u512 { | ||
let lhs: u256X2 = lhs.into(); | ||
let rhs: u256X2 = rhs.into(); | ||
|
||
// No overflow allowed | ||
let u256 { low: limb2, high: limb3 } = u256_overflow_sub(lhs.high, rhs.high) | ||
.expect('u512 sub overflow'); | ||
|
||
match u256_overflow_sub(lhs.low, rhs.low) { | ||
Result::Ok(u256 { low: limb0, high: limb1 }) => { u512 { limb0, limb1, limb2, limb3 } }, | ||
Result::Err(u256 { low: limb0, | ||
high: limb1 }) => { | ||
// Try to move overflow to limb2 | ||
return match u128_overflowing_sub(limb2, 1_u128) { | ||
Result::Ok(limb2) => u512 { limb0, limb1, limb2, limb3 }, | ||
Result::Err(limb2) => { | ||
// Try to move overflow to limb3 | ||
let limb3 = u128_overflowing_sub(limb3, 1_u128).expect('u512 sub overflow'); | ||
u512 { limb0, limb1, limb2, limb3 } | ||
}, | ||
}; | ||
}, | ||
} | ||
} |