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

clean up test

Browse Source
This commit is contained in:
Dmitry Vagner 2022-10-25 16:59:32 -04:00
parent 11c232a810
commit 59dc9b2d8e
3 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
evm/src/cpu/kernel/asm/fields/fp12_mul.asm
View File

@ -1,17 +1,29 @@
/// Note: uncomment this to test /// Note: uncomment this to test
global test_mul_Fp12: global test_mul_Fp12:
// stack: in0, f, in0', f', in1, g, in1', g', in1, out, in0, out // stack: f, in0 , f', g, in1 , g', in1, out, in0, out
DUP7
// stack: in0, f, in0 , f', g, in1 , g', in1, out, in0, out
%store_fp6 %store_fp6
// stack: in0 , f', g, in1 , g', in1, out, in0, out
%add_const(6)
// stack: in0', f', g, in1 , g', in1, out, in0, out
%store_fp6 %store_fp6
// stack: g, in1 , g', in1, out, in0, out
DUP7
// stack: in1, g, in1 , g', in1, out, in0, out
%store_fp6 %store_fp6
// stack: in1 , g', in1, out, in0, out
%add_const(6)
// stack: in1', g', in1, out, in0, out
%store_fp6 %store_fp6
// stack: in1, out, in0, out // stack: in1, out, in0, out
PUSH return_on_stack PUSH ret_stack
// stack: ret_stack, in1, out, in0, out
SWAP3 SWAP3
// stack: in0, in1, out, return_on_stack, out // stack: in0, in1, out, ret_stack, out
%jump(mul_Fp12) %jump(mul_Fp12)
return_on_stack: ret_stack:
// stack: out // stack: out
DUP1 DUP1
%add_const(6) %add_const(6)

2
evm/src/cpu/kernel/asm/fields/fp6_mul.asm
View File

@ -238,7 +238,7 @@ global mul_fp6:
// stack: c0d2_ + c2d0_, c0_, d2, c1d1_, c1_d1, c2_, d0 // stack: c0d2_ + c2d0_, c0_, d2, c1d1_, c1_d1, c2_, d0
SWAP2 SWAP2
MULFP254 MULFP254
// stack: c0_d2 , c0d2_ + c2d0_ , c1d1_ , c1_d1 , c2_, d0 // stack: c0_d2 , c0d2_ + c2d0_ , c1d1_ , c1_d1 , c2_, d0
ADDFP254 ADDFP254
ADDFP254 ADDFP254
ADDFP254 ADDFP254

48
evm/src/cpu/kernel/tests/fields.rs
View File

@ -126,31 +126,6 @@ fn as_stack(xs: Vec<u32>) -> Vec<U256> {
xs.iter().map(|&x| U256::from(x)).rev().collect() xs.iter().map(|&x| U256::from(x)).rev().collect()
} }
fn make_initial_stack(
f0: [[u32; 2]; 3],
f1: [[u32; 2]; 3],
g0: [[u32; 2]; 3],
g1: [[u32; 2]; 3],
) -> Vec<U256> {
// stack: in0, f, in0', f', in1, g, in1', g', in1, out, in0, out
let f0: Vec<u32> = f0.into_iter().flatten().collect();
let f1: Vec<u32> = f1.into_iter().flatten().collect();
let g0: Vec<u32> = g0.into_iter().flatten().collect();
let g1: Vec<u32> = g1.into_iter().flatten().collect();
let mut input = vec![0];
input.extend(f0);
input.extend(vec![6]);
input.extend(f1);
input.extend(vec![12]);
input.extend(g0);
input.extend(vec![18]);
input.extend(g1);
input.extend(vec![12, 24, 0, 24]);
as_stack(input)
}
#[test] #[test]
fn test_fp6() -> Result<()> { fn test_fp6() -> Result<()> {
let c = gen_fp6(); let c = gen_fp6();
@ -174,6 +149,29 @@ fn test_fp6() -> Result<()> {
Ok(()) Ok(())
} }
fn make_initial_stack(
f0: [[u32; 2]; 3],
f1: [[u32; 2]; 3],
g0: [[u32; 2]; 3],
g1: [[u32; 2]; 3],
) -> Vec<U256> {
// stack: in0, f, in0', f', in1, g, in1', g', in1, out, in0, out
let f0: Vec<u32> = f0.into_iter().flatten().collect();
let f1: Vec<u32> = f1.into_iter().flatten().collect();
let g0: Vec<u32> = g0.into_iter().flatten().collect();
let g1: Vec<u32> = g1.into_iter().flatten().collect();
let mut input = f0;
input.extend(vec![0]);
input.extend(f1);
input.extend(g0);
input.extend(vec![12]);
input.extend(g1);
input.extend(vec![12, 24, 0, 24]);
as_stack(input)
}
#[test] #[test]
fn test_fp12() -> Result<()> { fn test_fp12() -> Result<()> {
let f0 = gen_fp6(); let f0 = gen_fp6();