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

merge

Browse Source
This commit is contained in:
Dmitry Vagner 2022-10-28 02:03:52 -07:00
parent fa05a33040
commit 7d78916a6f
2 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,40 +1,40 @@
/// Note: uncomment this to test
global test_mul_Fp12:
// 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
// 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
// stack: g, in1 , g', in1, out, in0, out
DUP7
// stack: in1, g, in1 , g', in1, out, in0, out
%store_fp6
// stack: in1 , g', in1, out, in0, out
%add_const(6)
// stack: in1', g', in1, out, in0, out
%store_fp6
// stack: in1, out, in0, out
PUSH ret_stack
// stack: ret_stack, in1, out, in0, out
SWAP3
// stack: in0, in1, out, ret_stack, out
%jump(mul_Fp12)
ret_stack:
// stack: out
DUP1
%add_const(6)
// stack: out', out
%load_fp6
// stack: h', out
DUP7
// stack: out, h', out
%load_fp6
// stack: h, h', out
%jump(0xdeadbeef)
/// global test_mul_Fp12:
/// // 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
/// // 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
/// // stack: g, in1 , g', in1, out, in0, out
/// DUP7
/// // stack: in1, g, in1 , g', in1, out, in0, out
/// %store_fp6
/// // stack: in1 , g', in1, out, in0, out
/// %add_const(6)
/// // stack: in1', g', in1, out, in0, out
/// %store_fp6
/// // stack: in1, out, in0, out
/// PUSH ret_stack
/// // stack: ret_stack, in1, out, in0, out
/// SWAP3
/// // stack: in0, in1, out, ret_stack, out
/// %jump(mul_Fp12)
/// ret_stack:
/// // stack: out
/// DUP1
/// %add_const(6)
/// // stack: out', out
/// %load_fp6
/// // stack: h', out
/// DUP7
/// // stack: out, h', out
/// %load_fp6
/// // stack: h, h', out
/// %jump(0xdeadbeef)
/// fp6 functions:

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

@ -149,52 +149,52 @@ fn test_fp6() -> Result<()> {
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();
// 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]);
// 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)
}
// as_stack(input)
// }
#[test]
fn test_fp12() -> Result<()> {
let f0 = gen_fp6();
let f1 = gen_fp6();
let g0 = gen_fp6();
let g1 = gen_fp6();
// #[test]
// fn test_fp12() -> Result<()> {
// let f0 = gen_fp6();
// let f1 = gen_fp6();
// let g0 = gen_fp6();
// let g1 = gen_fp6();
let kernel = combined_kernel();
let initial_offset = kernel.global_labels["test_mul_Fp12"];
let initial_stack: Vec<U256> = make_initial_stack(f0, f1, g0, g1);
let final_stack: Vec<U256> = run_with_kernel(&kernel, initial_offset, initial_stack)?
.stack()
.to_vec();
// let kernel = combined_kernel();
// let initial_offset = kernel.global_labels["test_mul_Fp12"];
// let initial_stack: Vec<U256> = make_initial_stack(f0, f1, g0, g1);
// let final_stack: Vec<U256> = run_with_kernel(&kernel, initial_offset, initial_stack)?
// .stack()
// .to_vec();
let mut output: Vec<u32> = mul_fp12([f0, f1], [g0, g1])
.into_iter()
.flatten()
.flatten()
.collect();
output.extend(vec![24]);
let expected = as_stack(output);
// let mut output: Vec<u32> = mul_fp12([f0, f1], [g0, g1])
// .into_iter()
// .flatten()
// .flatten()
// .collect();
// output.extend(vec![24]);
// let expected = as_stack(output);
assert_eq!(final_stack, expected);
// assert_eq!(final_stack, expected);
Ok(())
}
// Ok(())
// }