Skip to content

fix(l1): fix illegal instructions in certain ARM processors #5143

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

Merged
fedacking merged 4 commits into from
Oct 31, 2025
Merged

fix(l1): fix illegal instructions in certain ARM processors #5143

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fba993c
Created unit test
fedacking Oct 31, 2025
21fb29e
Update mod.rs
fedacking Oct 31, 2025
163a164
Changed name of unit test.
fedacking Oct 31, 2025
ff4c830
Merge branch 'main' into aarch64-blake-testing
fedacking Oct 31, 2025
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
35 changes: 34 additions & 1 deletion crates/common/crypto/blake2f/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ type Blake2Func = fn(usize, &mut [u64; 8], &[u64; 16], &[u64; 2], bool);

static BLAKE2_FUNC: LazyLock<Blake2Func> = LazyLock::new(|| {
#[cfg(target_arch = "aarch64")]
if std::arch::is_aarch64_feature_detected!("neon") {
if std::arch::is_aarch64_feature_detected!("neon")
&& std::arch::is_aarch64_feature_detected!("sha3")
{
return self::aarch64::blake2b_f;
}

Expand All @@ -25,3 +27,34 @@ static BLAKE2_FUNC: LazyLock<Blake2Func> = LazyLock::new(|| {
pub fn blake2b_f(rounds: usize, h: &mut [u64; 8], m: &[u64; 16], t: &[u64; 2], f: bool) {
BLAKE2_FUNC(rounds, h, m, t, f)
}

#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_12r() {
Copy link
Contributor

@Oppen Oppen Oct 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

12r?

Maybe call it blake2b_smoke.

Copy link
Contributor Author

@fedacking fedacking Oct 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in 163a164

let mut h = [1, 2, 3, 4, 5, 6, 7, 8];
blake2b_f(
12,
&mut h,
&[
101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
],
&[1000, 1001],
true,
);
assert_eq!(
h,
[
16719151077261791083,
2946084527549390899,
18258373236029374890,
15305391278487550604,
16233503039257535911,
17654926667207417465,
12194914407095793501,
13409096818966589674
]
);
}
}
Loading