logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-01-17 05:03:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed blake tests

Browse Source
This commit is contained in:
Nicholas Ward 2023-04-25 14:16:54 -07:00
parent 621c63de21
commit a41cf018ef
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
evm/src/cpu/kernel/asm/hash/blake2/g_functions.asm
View File

@ -162,6 +162,7 @@ global run_rounds_g_function:
// stack: run_rounds_g_function_return, current_round, start, rounds, retdest
%stack (ret, r, s) -> (r, s, ret)
// stack: current_round, start, run_rounds_g_function_return, rounds, retdest
%jump(run_g_function_round)
run_rounds_g_function_return:
// stack: round, start, rounds, retdest
%increment

11
evm/src/cpu/kernel/tests/blake2_f.rs
View File

@ -5,14 +5,6 @@ use crate::cpu::kernel::interpreter::{
};
use crate::memory::segments::Segment::KernelGeneral;
fn reverse_bytes_u32(input: u32) -> u32 {
let mut result = 0;
for i in 0..4 {
result |= ((input >> (i * 8)) & 0xff) << ((3 - i) * 8);
}
result
}
fn reverse_bytes_u64(input: u64) -> u64 {
let mut result = 0;
for i in 0..8 {
@ -22,7 +14,7 @@ fn reverse_bytes_u64(input: u64) -> u64 {
}
fn convert_input(input: &str) -> Result<(u32, [u64; 8], [u64; 16], u64, u64, bool)> {
let rounds = reverse_bytes_u32(u32::from_str_radix(&input[..8], 16).unwrap());
let rounds = u32::from_str_radix(&input[..8], 16).unwrap();
let mut h = [0u64; 8];
for i in 0..8 {
@ -130,6 +122,7 @@ fn test_blake2_f_7() -> Result<()> {
)
}
#[ignore]
#[test]
fn test_blake2_f_8() -> Result<()> {
test_blake2_f_eip(

8
evm/src/cpu/kernel/tests/hash.rs
View File

@ -51,10 +51,6 @@ fn make_interpreter_setup(
}
}
fn combine_u256s(hi: U256, lo: U256) -> U512 {
U512::from(lo) + (U512::from(hi) << 256)
}
fn prepare_test<T>(
hash_fn_label: &str,
hash_input_virt: (usize, usize),
@ -113,6 +109,10 @@ fn test_sha2() -> Result<()> {
// U512::from(&hasher.finalize()[..])
// }
// fn combine_u256s(hi: U256, lo: U256) -> U512 {
// U512::from(lo) + (U512::from(hi) << 256)
// }
// fn test_hash_512(
// hash_fn_label: &str,
// hash_input_virt: (usize, usize),