From e0ee489d38ec5bc572b5552c3ca80a92a578961f Mon Sep 17 00:00:00 2001 From: Dmitry Vagner Date: Mon, 14 Nov 2022 15:58:37 -0800 Subject: [PATCH] fix fp12 test --- evm/src/cpu/kernel/asm/fields/fp12_mul.asm | 97 +++++++------ evm/src/cpu/kernel/tests/fields.rs | 156 +++++++++++---------- 2 files changed, 128 insertions(+), 125 deletions(-) diff --git a/evm/src/cpu/kernel/asm/fields/fp12_mul.asm b/evm/src/cpu/kernel/asm/fields/fp12_mul.asm index 8f220e5b..249bf252 100644 --- a/evm/src/cpu/kernel/asm/fields/fp12_mul.asm +++ b/evm/src/cpu/kernel/asm/fields/fp12_mul.asm @@ -1,39 +1,39 @@ /// Note: uncomment this to test -/// global test_mul_fp12: -/// // stack: f, inA , f', g, inB , g', inB, out, inA, out -/// DUP7 -/// // stack: inA, f, inA , f', g, inB , g', inB, out, inA, out -/// %store_fp6 -/// // stack: inA , f', g, inB , g', inB, out, inA, out -/// %offset_fp6 -/// // stack: inA', f', g, inB , g', inB, out, inA, out -/// %store_fp6 -/// // stack: g, inB , g', inB, out, inA, out -/// DUP7 -/// // stack: inB, g, inB , g', inB, out, inA, out -/// %store_fp6 -/// // stack: inB , g', inB, out, inA, out -/// %offset_fp6 -/// // stack: inB', g', inB, out, inA, out -/// %store_fp6 -/// // stack: inB, out, inA, out -/// PUSH ret_stack -/// // stack: ret_stack, inB, out, inA, out -/// SWAP3 -/// // stack: inA, inB, out, ret_stack, out -/// %jump(mul_fp12) -/// ret_stack: -/// // stack: out -/// DUP1 %offset_fp6 -/// // 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, inA , f', g, inB , g', inB, out, inA, out + DUP7 + // stack: inA, f, inA , f', g, inB , g', inB, out, inA, out + %store_fp6 + // stack: inA , f', g, inB , g', inB, out, inA, out + %offset_fp6 + // stack: inA', f', g, inB , g', inB, out, inA, out + %store_fp6 + // stack: g, inB , g', inB, out, inA, out + DUP7 + // stack: inB, g, inB , g', inB, out, inA, out + %store_fp6 + // stack: inB , g', inB, out, inA, out + %offset_fp6 + // stack: inB', g', inB, out, inA, out + %store_fp6 + // stack: inB, out, inA, out + PUSH ret_stack + // stack: ret_stack, inB, out, inA, out + SWAP3 + // stack: inA, inB, out, ret_stack, out + %jump(mul_fp12) +ret_stack: + // stack: out + DUP1 %offset_fp6 + // stack: out', out + %load_fp6 + // stack: h', out + DUP7 + // stack: out, h', out + %load_fp6 + // stack: h, h', out + %jump(0xdeadbeef) /// fp6 functions: @@ -259,28 +259,25 @@ post_sq2: JUMP /// fp6 functions: -/// fn | num | ops | cost -/// ------------------------- -/// load | 2 | 40 | 80 -/// store | 2 | 40 | 80 -/// dup | 2 | 6 | 12 -/// swap | 2 | 16 | 32 -/// add | 1 | 16 | 16 -/// mul | 1 | 157 | 157 -/// sq | 2 | | -/// dbl | 1 | 13 | 13 +/// fn | num | ops | cost +/// --------------------------- +/// load | 2 | 40 | 80 +/// store | 2 | 40 | 80 +/// dup | 4 | 6 | 24 +/// swap | 4 | 16 | 64 +/// add | 4 | 16 | 64 +/// mul_fp | 2 | 21 | 42 +/// mul_fp2 | 4 | 59 | 236 /// /// lone stack operations: /// op | num /// ------------ -/// ADD | 3 -/// SWAP | 4 -/// DUP | 5 +/// ADD | 6 +/// DUP | 9 /// PUSH | 6 -/// POP | 3 -/// JUMP | 4 +/// POP | 5 /// -/// TOTAL: +/// TOTAL: 618 /// input: /// F = f + f'z diff --git a/evm/src/cpu/kernel/tests/fields.rs b/evm/src/cpu/kernel/tests/fields.rs index 289a8598..80155202 100644 --- a/evm/src/cpu/kernel/tests/fields.rs +++ b/evm/src/cpu/kernel/tests/fields.rs @@ -39,11 +39,11 @@ fn add3_fp2(a: [u32; 2], b: [u32; 2], c: [u32; 2]) -> [u32; 2] { [add3_fp(a, b, c), add3_fp(a_, b_, c_)] } -// fn sub_fp2(a: [u32; 2], b: [u32; 2]) -> [u32; 2] { -// let [a, a_] = a; -// let [b, b_] = b; -// [sub_fp(a, b), sub_fp(a_, b_)] -// } +fn sub_fp2(a: [u32; 2], b: [u32; 2]) -> [u32; 2] { + let [a, a_] = a; + let [b, b_] = b; + [sub_fp(a, b), sub_fp(a_, b_)] +} fn mul_fp2(a: [u32; 2], b: [u32; 2]) -> [u32; 2] { let [a, a_] = a; @@ -59,25 +59,25 @@ fn i9(a: [u32; 2]) -> [u32; 2] { [sub_fp(mul_fp(9, a), a_), add_fp(a, mul_fp(9, a_))] } -// fn add_fp6(c: [[u32; 2]; 3], d: [[u32; 2]; 3]) -> [[u32; 2]; 3] { -// let [c0, c1, c2] = c; -// let [d0, d1, d2] = d; +fn add_fp6(c: [[u32; 2]; 3], d: [[u32; 2]; 3]) -> [[u32; 2]; 3] { + let [c0, c1, c2] = c; + let [d0, d1, d2] = d; -// let e0 = add_fp2(c0, d0); -// let e1 = add_fp2(c1, d1); -// let e2 = add_fp2(c2, d2); -// [e0, e1, e2] -// } + let e0 = add_fp2(c0, d0); + let e1 = add_fp2(c1, d1); + let e2 = add_fp2(c2, d2); + [e0, e1, e2] +} -// fn sub_fp6(c: [[u32; 2]; 3], d: [[u32; 2]; 3]) -> [[u32; 2]; 3] { -// let [c0, c1, c2] = c; -// let [d0, d1, d2] = d; +fn sub_fp6(c: [[u32; 2]; 3], d: [[u32; 2]; 3]) -> [[u32; 2]; 3] { + let [c0, c1, c2] = c; + let [d0, d1, d2] = d; -// let e0 = sub_fp2(c0, d0); -// let e1 = sub_fp2(c1, d1); -// let e2 = sub_fp2(c2, d2); -// [e0, e1, e2] -// } + let e0 = sub_fp2(c0, d0); + let e1 = sub_fp2(c1, d1); + let e2 = sub_fp2(c2, d2); + [e0, e1, e2] +} fn mul_fp6(c: [[u32; 2]; 3], d: [[u32; 2]; 3]) -> [[u32; 2]; 3] { let [c0, c1, c2] = c; @@ -101,20 +101,20 @@ fn mul_fp6(c: [[u32; 2]; 3], d: [[u32; 2]; 3]) -> [[u32; 2]; 3] { ] } -// fn sh(c: [[u32; 2]; 3]) -> [[u32; 2]; 3] { -// let [c0, c1, c2] = c; -// [i9(c2), c0, c1] -// } +fn sh(c: [[u32; 2]; 3]) -> [[u32; 2]; 3] { + let [c0, c1, c2] = c; + [i9(c2), c0, c1] +} -// fn mul_fp12(f: [[[u32; 2]; 3]; 2], g: [[[u32; 2]; 3]; 2]) -> [[[u32; 2]; 3]; 2] { -// let [f0, f1] = f; -// let [g0, g1] = g; +fn mul_fp12(f: [[[u32; 2]; 3]; 2], g: [[[u32; 2]; 3]; 2]) -> [[[u32; 2]; 3]; 2] { + let [f0, f1] = f; + let [g0, g1] = g; -// let h0 = mul_fp6(f0, g0); -// let h1 = mul_fp6(f1, g1); -// let h01 = mul_fp6(add_fp6(f0, f1), add_fp6(g0, g1)); -// [add_fp6(h0, sh(h1)), sub_fp6(h01, add_fp6(h0, h1))] -// } + let h0 = mul_fp6(f0, g0); + let h1 = mul_fp6(f1, g1); + let h01 = mul_fp6(add_fp6(f0, f1), add_fp6(g0, g1)); + [add_fp6(h0, sh(h1)), sub_fp6(h01, add_fp6(h0, h1))] +} fn gen_fp6() -> [[u32; 2]; 3] { let mut rng = thread_rng(); @@ -151,52 +151,58 @@ 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 { -// // stack: in0, f, in0', f', in1, g, in1', g', in1, out, in0, out -// let f0: Vec = f0.into_iter().flatten().collect(); -// let f1: Vec = f1.into_iter().flatten().collect(); -// let g0: Vec = g0.into_iter().flatten().collect(); -// let g1: Vec = g1.into_iter().flatten().collect(); +fn make_initial_stack( + in1: u32, + in2: u32, + out: u32, + f0: [[u32; 2]; 3], + f1: [[u32; 2]; 3], + g0: [[u32; 2]; 3], + g1: [[u32; 2]; 3], +) -> Vec { + // stack: in0, f, in0', f', in1, g, in1', g', in1, out, in0, out + let f0: Vec = f0.into_iter().flatten().collect(); + let f1: Vec = f1.into_iter().flatten().collect(); + let g0: Vec = g0.into_iter().flatten().collect(); + let g1: Vec = 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![in1]); + input.extend(f1); + input.extend(g0); + input.extend(vec![in2]); + input.extend(g1); + input.extend(vec![in2, out, in1, out]); -// 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 in1 = 64; + let in2 = 76; + let out = 88; -// let kernel = combined_kernel(); -// let initial_offset = kernel.global_labels["test_mul_Fp12"]; -// let initial_stack: Vec = make_initial_stack(f0, f1, g0, g1); -// let final_stack: Vec = run_with_kernel(&kernel, initial_offset, initial_stack)? -// .stack() -// .to_vec(); + let f0 = gen_fp6(); + let f1 = gen_fp6(); + let g0 = gen_fp6(); + let g1 = gen_fp6(); -// let mut output: Vec = mul_fp12([f0, f1], [g0, g1]) -// .into_iter() -// .flatten() -// .flatten() -// .collect(); -// output.extend(vec![24]); -// let expected = as_stack(output); + let initial_offset = KERNEL.global_labels["test_mul_fp12"]; + let initial_stack: Vec = make_initial_stack(in1, in2, out, f0, f1, g0, g1); + let final_stack: Vec = run_interpreter(initial_offset, initial_stack)? + .stack() + .to_vec(); -// assert_eq!(final_stack, expected); + let mut output: Vec = mul_fp12([f0, f1], [g0, g1]) + .into_iter() + .flatten() + .flatten() + .collect(); + output.extend(vec![out]); + let expected = as_stack(output); -// Ok(()) -// } + assert_eq!(final_stack, expected); + + Ok(()) +}