-
Notifications
You must be signed in to change notification settings - Fork 106
Zero-copy improvement for U256 and I256
#1867
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
base: main
Are you sure you want to change the base?
Changes from all commits
71a9ca9
1a15b23
968321a
bdb803a
26cc874
e51e9e0
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,8 +2,8 @@ use core::{cmp::Ordering, convert::Infallible, fmt::Debug}; | |
|
|
||
| use super::{ | ||
| env::internal::{ | ||
| DurationSmall, DurationVal, Env as _, I256Small, I256Val, TimepointSmall, TimepointVal, | ||
| U256Small, U256Val, | ||
| DurationSmall, DurationVal, Env as _, I256Object, I256Small, I256Val, TimepointSmall, | ||
| TimepointVal, U256Object, U256Small, U256Val, | ||
| }, | ||
| Bytes, ConversionError, Env, TryFromVal, TryIntoVal, Val, | ||
| }; | ||
|
|
@@ -227,10 +227,9 @@ impl U256 { | |
| } | ||
|
|
||
| pub fn from_u128(env: &Env, u: u128) -> Self { | ||
| let lo: Bytes = Bytes::from_array(env, &u.to_be_bytes()); | ||
| let mut bytes: Bytes = Bytes::from_array(env, &[0u8; 16]); | ||
| bytes.append(&lo); | ||
| Self::from_be_bytes(env, &bytes) | ||
| let lo_hi = (u >> 64) as u64; | ||
| let lo_lo = u as u64; | ||
| Self::from_parts(env, 0, 0, lo_hi, lo_lo) | ||
| } | ||
|
|
||
| pub fn from_parts(env: &Env, hi_hi: u64, hi_lo: u64, lo_hi: u64, lo_lo: u64) -> Self { | ||
|
|
@@ -254,14 +253,23 @@ impl U256 { | |
| } | ||
|
|
||
| pub fn to_u128(&self) -> Option<u128> { | ||
| let be_bytes = self.to_be_bytes(); | ||
| let be_bytes_hi: [u8; 16] = be_bytes.slice(0..16).try_into().unwrap(); | ||
| let be_bytes_lo: [u8; 16] = be_bytes.slice(16..32).try_into().unwrap(); | ||
| if u128::from_be_bytes(be_bytes_hi) == 0 { | ||
| Some(u128::from_be_bytes(be_bytes_lo)) | ||
| } else { | ||
| None | ||
| let v = *self.val.as_val(); | ||
|
|
||
| // If v is U256Small it can be converted directly | ||
| if let Ok(small) = U256Small::try_from(v) { | ||
| return Some(u64::from(small) as u128); | ||
| } | ||
|
Comment on lines
+258
to
+261
|
||
|
|
||
| // Otherwise use U256Object and take low sections if high are empty | ||
| let obj: U256Object = v.try_into().ok()?; | ||
| let hi_hi = self.env.obj_to_u256_hi_hi(obj).unwrap_infallible(); | ||
| let hi_lo = self.env.obj_to_u256_hi_lo(obj).unwrap_infallible(); | ||
| if hi_hi != 0 || hi_lo != 0 { | ||
| return None; | ||
| } | ||
| let lo_hi = self.env.obj_to_u256_lo_hi(obj).unwrap_infallible(); | ||
| let lo_lo = self.env.obj_to_u256_lo_lo(obj).unwrap_infallible(); | ||
| Some(((lo_hi as u128) << 64) | (lo_lo as u128)) | ||
| } | ||
|
|
||
| pub fn to_be_bytes(&self) -> Bytes { | ||
|
|
@@ -474,16 +482,14 @@ impl I256 { | |
| } | ||
|
|
||
| pub fn from_i128(env: &Env, i: i128) -> Self { | ||
| let lo: Bytes = Bytes::from_array(env, &i.to_be_bytes()); | ||
| if i < 0 { | ||
| let mut i256_bytes: Bytes = Bytes::from_array(env, &[255_u8; 16]); | ||
| i256_bytes.append(&lo); | ||
| Self::from_be_bytes(env, &i256_bytes) | ||
| let lo_hi = (i >> 64) as u64; | ||
| let lo_lo = i as u64; | ||
| let (hi_hi, hi_lo) = if i < 0 { | ||
| (-1_i64, u64::MAX) // sign extend 1 bit | ||
| } else { | ||
| let mut i256_bytes: Bytes = Bytes::from_array(env, &[0_u8; 16]); | ||
| i256_bytes.append(&lo); | ||
| Self::from_be_bytes(env, &i256_bytes) | ||
| } | ||
| (0_i64, 0_u64) // sign extend 0 bit | ||
| }; | ||
| I256::from_parts(env, hi_hi, hi_lo, lo_hi, lo_lo) | ||
| } | ||
|
dmkozh marked this conversation as resolved.
|
||
|
|
||
| pub fn from_parts(env: &Env, hi_hi: i64, hi_lo: u64, lo_hi: u64, lo_lo: u64) -> Self { | ||
|
|
@@ -507,13 +513,27 @@ impl I256 { | |
| } | ||
|
|
||
| pub fn to_i128(&self) -> Option<i128> { | ||
| let be_bytes = self.to_be_bytes(); | ||
| let be_bytes_hi: [u8; 16] = be_bytes.slice(0..16).try_into().unwrap(); | ||
| let be_bytes_lo: [u8; 16] = be_bytes.slice(16..32).try_into().unwrap(); | ||
| let i128_hi = i128::from_be_bytes(be_bytes_hi); | ||
| let i128_lo = i128::from_be_bytes(be_bytes_lo); | ||
| if (i128_hi == 0 && i128_lo >= 0) || (i128_hi == -1 && i128_lo < 0) { | ||
| Some(i128_lo) | ||
| let v = *self.val.as_val(); | ||
|
|
||
| // If v is I256Small it can be converted directly | ||
| if let Ok(small) = I256Small::try_from(v) { | ||
| return Some(i64::from(small) as i128); | ||
| } | ||
|
Comment on lines
+518
to
+521
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This seems reasonable to address if that's actually not covered
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There's some benefit to filling these test gaps ahead of merging this PR.
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Absolutely, I added some tests that hit the relevant cases of the fast path for signed and unsigned. Let me know if there is anything else! |
||
|
|
||
| // Otherwise use I256Object and take low sections if high are either | ||
| // all 1 bits or all 0 bits (negative and positive respectively) | ||
| let obj: I256Object = v.try_into().ok()?; | ||
| let hi_hi = self.env.obj_to_i256_hi_hi(obj).unwrap_infallible(); | ||
| let hi_lo = self.env.obj_to_i256_hi_lo(obj).unwrap_infallible(); | ||
| let lo_hi = self.env.obj_to_i256_lo_hi(obj).unwrap_infallible(); | ||
| let lo_lo = self.env.obj_to_i256_lo_lo(obj).unwrap_infallible(); | ||
| // The low 128 bits as an i128 | ||
| let lo = (((lo_hi as u128) << 64) | (lo_lo as u128)) as i128; | ||
|
|
||
| if lo < 0 && hi_hi == -1 && hi_lo == u64::MAX { | ||
| Some(lo) // if negative low, then high must be all 1 bit | ||
| } else if 0 <= lo && hi_hi == 0 && hi_lo == 0 { | ||
| Some(lo) // if non-negative low, then high must be all 0 bit | ||
| } else { | ||
| None | ||
| } | ||
|
|
@@ -782,6 +802,13 @@ mod test { | |
| let from = U256::from_u128(&env, start); | ||
| let end = from.to_u128().unwrap(); | ||
| assert_eq!(start, end); | ||
|
|
||
| // small (exercises the U256Small fast-path in to_u128) | ||
| let from_small = U256::from_u32(&env, 0); | ||
| assert_eq!(from_small.to_u128(), Some(0_u128)); | ||
|
|
||
| let from_small = U256::from_u32(&env, u32::MAX); | ||
| assert_eq!(from_small.to_u128(), Some(u32::MAX as u128)); | ||
| } | ||
|
|
||
| #[test] | ||
|
|
@@ -823,6 +850,16 @@ mod test { | |
| let from = I256::from_i128(&env, start); | ||
| let end = from.to_i128().unwrap(); | ||
| assert_eq!(start, end); | ||
|
|
||
| // small (exercises the I256Small fast-path in to_i128) | ||
| let from_small = I256::from_i32(&env, 0); | ||
| assert_eq!(from_small.to_i128(), Some(0_i128)); | ||
|
|
||
| let from_small = I256::from_i32(&env, i32::MAX); | ||
| assert_eq!(from_small.to_i128(), Some(i32::MAX as i128)); | ||
|
|
||
| let from_small = I256::from_i32(&env, i32::MIN); | ||
| assert_eq!(from_small.to_i128(), Some(i32::MIN as i128)); | ||
| } | ||
|
|
||
| #[test] | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.