From 5250bf96cf202ebf4a567a0bb7052a332cf96d55 Mon Sep 17 00:00:00 2001 From: Anshuman Mohan <10830208+anshumanmohan@users.noreply.github.com> Date: Thu, 13 Jun 2024 17:19:06 -0400 Subject: [PATCH] Prefer `seq_mem`s to `comb_mem`s all over (#2127) * Port Python code to seq mems * Update expect files to deal with new seq mems * Fix gen_exp to use seq mems * Catch up expect files to seq mems * Trigger Build * Silly mistake * Expect files chasing after silly mistake --- calyx-py/calyx/gen_exp.py | 15 +++--- frontends/ntt-pipeline/gen-ntt-pipeline.py | 14 +++--- tests/correctness/exp/any-base-1.expect | 2 +- tests/correctness/exp/any-base-2.expect | 2 +- tests/correctness/exp/any-base-3.expect | 2 +- tests/correctness/exp/degree-4-signed.expect | 2 +- .../correctness/exp/degree-4-unsigned.expect | 2 +- tests/correctness/exp/degree-8-signed.expect | 2 +- .../correctness/exp/degree-8-unsigned.expect | 2 +- tests/correctness/exp/neg-base.expect | 2 +- .../ntt-pipeline/ntt-16-reduced-4.expect | 2 +- tests/correctness/ntt-pipeline/ntt-16.expect | 2 +- tests/correctness/ntt-pipeline/ntt-8.expect | 2 +- tests/frontend/exp/degree-2-unsigned.expect | 12 +++-- tests/frontend/exp/degree-4-signed.expect | 12 +++-- tests/frontend/exp/degree-4-unsigned.expect | 12 +++-- .../ntt-pipeline/ntt-4-reduced-2.expect | 50 ++++++++++++------- tests/frontend/ntt-pipeline/ntt-4.expect | 50 ++++++++++++------- 18 files changed, 110 insertions(+), 77 deletions(-) diff --git a/calyx-py/calyx/gen_exp.py b/calyx-py/calyx/gen_exp.py index 92c738b5a6..95d1c880b7 100644 --- a/calyx-py/calyx/gen_exp.py +++ b/calyx-py/calyx/gen_exp.py @@ -704,9 +704,9 @@ def build_base_not_e(degree, width, int_width, is_signed) -> Program: main = builder.component("main") base_reg = main.reg(width, "base_reg") exp_reg = main.reg(width, "exp_reg") - x = main.comb_mem_d1("x", width, 1, 1, is_external=True) - b = main.comb_mem_d1("b", width, 1, 1, is_external=True) - ret = main.comb_mem_d1("ret", width, 1, 1, is_external=True) + x = main.seq_mem_d1("x", width, 1, 1, is_external=True) + b = main.seq_mem_d1("b", width, 1, 1, is_external=True) + ret = main.seq_mem_d1("ret", width, 1, 1, is_external=True) f = main.comp_instance("f", "fp_pow_full") read_base = main.mem_load_d1(b, 0, base_reg, "read_base") @@ -740,14 +740,15 @@ def build_base_is_e(degree, width, int_width, is_signed) -> Program: main = builder.component("main") t = main.reg(width, "t") - x = main.comb_mem_d1("x", width, 1, 1, is_external=True) - ret = main.comb_mem_d1("ret", width, 1, 1, is_external=True) + x = main.seq_mem_d1("x", width, 1, 1, is_external=True) + ret = main.seq_mem_d1("ret", width, 1, 1, is_external=True) e = main.comp_instance("e", "exp") with main.group("init") as init: x.addr0 = 0 - t.in_ = x.read_data - t.write_en = 1 + x.content_en = 1 + t.in_ = x.done @ x.read_data + t.write_en = x.done @ 1 init.done = t.done write_to_memory = main.mem_store_d1(ret, 0, e.out, "write_to_memory") diff --git a/frontends/ntt-pipeline/gen-ntt-pipeline.py b/frontends/ntt-pipeline/gen-ntt-pipeline.py index d035b024bb..0b1261583f 100755 --- a/frontends/ntt-pipeline/gen-ntt-pipeline.py +++ b/frontends/ntt-pipeline/gen-ntt-pipeline.py @@ -206,13 +206,15 @@ def preamble_group(comp: cb.ComponentBuilder, row): phis = comp.get_cell("phis") with main.group(f"preamble_{row}_reg") as preamble_reg: input.addr0 = row - reg.write_en = 1 - reg.in_ = input.read_data + input.content_en = 1 + reg.write_en = input.done @ 1 + reg.in_ = input.done @ input.read_data preamble_reg.done = reg.done with main.group(f"preamble_{row}_phi") as preamble_phi: phis.addr0 = row - phi.write_en = 1 - phi.in_ = phis.read_data + phis.content_en = 1 + phi.write_en = phis.done @ 1 + phi.in_ = phis.done @ phis.read_data preamble_phi.done = phi.done def epilogue_group(comp: cb.ComponentBuilder, row): @@ -222,8 +224,8 @@ def epilogue_group(comp: cb.ComponentBuilder, row): def insert_cells(comp: cb.ComponentBuilder): # memories - comp.comb_mem_d1("a", input_bitwidth, n, bitwidth, is_external=True) - comp.comb_mem_d1("phis", input_bitwidth, n, bitwidth, is_external=True) + comp.seq_mem_d1("a", input_bitwidth, n, bitwidth, is_external=True) + comp.seq_mem_d1("phis", input_bitwidth, n, bitwidth, is_external=True) for r in range(n): comp.reg(input_bitwidth, f"r{r}") # r_regs diff --git a/tests/correctness/exp/any-base-1.expect b/tests/correctness/exp/any-base-1.expect index 61bc1487c6..7f1d9e0fde 100644 --- a/tests/correctness/exp/any-base-1.expect +++ b/tests/correctness/exp/any-base-1.expect @@ -1,5 +1,5 @@ { - "cycles": 212, + "cycles": 216, "memories": { "b": [ "4.5" diff --git a/tests/correctness/exp/any-base-2.expect b/tests/correctness/exp/any-base-2.expect index 684b83ce03..0ca5bf67a5 100644 --- a/tests/correctness/exp/any-base-2.expect +++ b/tests/correctness/exp/any-base-2.expect @@ -1,5 +1,5 @@ { - "cycles": 207, + "cycles": 211, "memories": { "b": [ "7.5" diff --git a/tests/correctness/exp/any-base-3.expect b/tests/correctness/exp/any-base-3.expect index 30fcd7e6a4..71f36e7fe6 100644 --- a/tests/correctness/exp/any-base-3.expect +++ b/tests/correctness/exp/any-base-3.expect @@ -1,5 +1,5 @@ { - "cycles": 303, + "cycles": 307, "memories": { "b": [ "0.75" diff --git a/tests/correctness/exp/degree-4-signed.expect b/tests/correctness/exp/degree-4-signed.expect index 8b3e2d6a23..b09674cdcc 100644 --- a/tests/correctness/exp/degree-4-signed.expect +++ b/tests/correctness/exp/degree-4-signed.expect @@ -1,5 +1,5 @@ { - "cycles": 55, + "cycles": 56, "memories": { "ret": [ "2.7182769775390625" diff --git a/tests/correctness/exp/degree-4-unsigned.expect b/tests/correctness/exp/degree-4-unsigned.expect index 19c96047e9..2bffa80517 100644 --- a/tests/correctness/exp/degree-4-unsigned.expect +++ b/tests/correctness/exp/degree-4-unsigned.expect @@ -1,5 +1,5 @@ { - "cycles": 48, + "cycles": 49, "memories": { "ret": [ "2.7182769775390625" diff --git a/tests/correctness/exp/degree-8-signed.expect b/tests/correctness/exp/degree-8-signed.expect index 846a5d869e..5caebdbb6a 100644 --- a/tests/correctness/exp/degree-8-signed.expect +++ b/tests/correctness/exp/degree-8-signed.expect @@ -1,5 +1,5 @@ { - "cycles": 133, + "cycles": 134, "memories": { "ret": [ "0.0001068115234375" diff --git a/tests/correctness/exp/degree-8-unsigned.expect b/tests/correctness/exp/degree-8-unsigned.expect index ce68145f7e..0dbc85dd24 100644 --- a/tests/correctness/exp/degree-8-unsigned.expect +++ b/tests/correctness/exp/degree-8-unsigned.expect @@ -1,5 +1,5 @@ { - "cycles": 74, + "cycles": 75, "memories": { "ret": [ "9181.710357666015625" diff --git a/tests/correctness/exp/neg-base.expect b/tests/correctness/exp/neg-base.expect index 9d05a7ffa1..9208893975 100644 --- a/tests/correctness/exp/neg-base.expect +++ b/tests/correctness/exp/neg-base.expect @@ -1,5 +1,5 @@ { - "cycles": 220, + "cycles": 224, "memories": { "b": [ "-2.600006103515625" diff --git a/tests/correctness/ntt-pipeline/ntt-16-reduced-4.expect b/tests/correctness/ntt-pipeline/ntt-16-reduced-4.expect index 2174700c0a..d8543b98d3 100644 --- a/tests/correctness/ntt-pipeline/ntt-16-reduced-4.expect +++ b/tests/correctness/ntt-pipeline/ntt-16-reduced-4.expect @@ -1,5 +1,5 @@ { - "cycles": 647, + "cycles": 695, "memories": { "a": [ 7371, diff --git a/tests/correctness/ntt-pipeline/ntt-16.expect b/tests/correctness/ntt-pipeline/ntt-16.expect index 098e88d012..f1c644447e 100644 --- a/tests/correctness/ntt-pipeline/ntt-16.expect +++ b/tests/correctness/ntt-pipeline/ntt-16.expect @@ -1,5 +1,5 @@ { - "cycles": 200, + "cycles": 248, "memories": { "a": [ 7371, diff --git a/tests/correctness/ntt-pipeline/ntt-8.expect b/tests/correctness/ntt-pipeline/ntt-8.expect index 64c920f515..cd9101f29c 100644 --- a/tests/correctness/ntt-pipeline/ntt-8.expect +++ b/tests/correctness/ntt-pipeline/ntt-8.expect @@ -1,5 +1,5 @@ { - "cycles": 142, + "cycles": 166, "memories": { "a": [ 5390, diff --git a/tests/frontend/exp/degree-2-unsigned.expect b/tests/frontend/exp/degree-2-unsigned.expect index f8c466918a..cee7ca2c19 100644 --- a/tests/frontend/exp/degree-2-unsigned.expect +++ b/tests/frontend/exp/degree-2-unsigned.expect @@ -1,6 +1,6 @@ import "primitives/core.futil"; import "primitives/binary_operators.futil"; -import "primitives/memories/comb.futil"; +import "primitives/memories/seq.futil"; component exp(x: 32) -> (out: 32) { cells { exponent_value = std_reg(32); @@ -165,15 +165,16 @@ component fp_pow(base: 32, integer_exp: 32) -> (out: 32) { component main() -> () { cells { t = std_reg(32); - @external x = comb_mem_d1(32, 1, 1); - @external ret = comb_mem_d1(32, 1, 1); + @external x = seq_mem_d1(32, 1, 1); + @external ret = seq_mem_d1(32, 1, 1); e = exp(); } wires { group init { x.addr0 = 1'd0; - t.in = x.read_data; - t.write_en = 1'd1; + x.content_en = 1'd1; + t.in = x.done ? x.read_data; + t.write_en = x.done ? 1'd1; init[done] = t.done; } group write_to_memory { @@ -181,6 +182,7 @@ component main() -> () { ret.write_en = 1'd1; ret.write_data = e.out; write_to_memory[done] = ret.done; + ret.content_en = 1'd1; } } control { diff --git a/tests/frontend/exp/degree-4-signed.expect b/tests/frontend/exp/degree-4-signed.expect index 619f76d207..1d6722b04d 100644 --- a/tests/frontend/exp/degree-4-signed.expect +++ b/tests/frontend/exp/degree-4-signed.expect @@ -1,6 +1,6 @@ import "primitives/core.futil"; import "primitives/binary_operators.futil"; -import "primitives/memories/comb.futil"; +import "primitives/memories/seq.futil"; component exp(x: 16) -> (out: 16) { cells { exponent_value = std_reg(16); @@ -258,15 +258,16 @@ component fp_pow(base: 16, integer_exp: 16) -> (out: 16) { component main() -> () { cells { t = std_reg(16); - @external x = comb_mem_d1(16, 1, 1); - @external ret = comb_mem_d1(16, 1, 1); + @external x = seq_mem_d1(16, 1, 1); + @external ret = seq_mem_d1(16, 1, 1); e = exp(); } wires { group init { x.addr0 = 1'd0; - t.in = x.read_data; - t.write_en = 1'd1; + x.content_en = 1'd1; + t.in = x.done ? x.read_data; + t.write_en = x.done ? 1'd1; init[done] = t.done; } group write_to_memory { @@ -274,6 +275,7 @@ component main() -> () { ret.write_en = 1'd1; ret.write_data = e.out; write_to_memory[done] = ret.done; + ret.content_en = 1'd1; } } control { diff --git a/tests/frontend/exp/degree-4-unsigned.expect b/tests/frontend/exp/degree-4-unsigned.expect index 4ce6a5d1e7..6922e988a7 100644 --- a/tests/frontend/exp/degree-4-unsigned.expect +++ b/tests/frontend/exp/degree-4-unsigned.expect @@ -1,6 +1,6 @@ import "primitives/core.futil"; import "primitives/binary_operators.futil"; -import "primitives/memories/comb.futil"; +import "primitives/memories/seq.futil"; component exp(x: 16) -> (out: 16) { cells { exponent_value = std_reg(16); @@ -229,15 +229,16 @@ component fp_pow(base: 16, integer_exp: 16) -> (out: 16) { component main() -> () { cells { t = std_reg(16); - @external x = comb_mem_d1(16, 1, 1); - @external ret = comb_mem_d1(16, 1, 1); + @external x = seq_mem_d1(16, 1, 1); + @external ret = seq_mem_d1(16, 1, 1); e = exp(); } wires { group init { x.addr0 = 1'd0; - t.in = x.read_data; - t.write_en = 1'd1; + x.content_en = 1'd1; + t.in = x.done ? x.read_data; + t.write_en = x.done ? 1'd1; init[done] = t.done; } group write_to_memory { @@ -245,6 +246,7 @@ component main() -> () { ret.write_en = 1'd1; ret.write_data = e.out; write_to_memory[done] = ret.done; + ret.content_en = 1'd1; } } control { diff --git a/tests/frontend/ntt-pipeline/ntt-4-reduced-2.expect b/tests/frontend/ntt-pipeline/ntt-4-reduced-2.expect index 815607be46..0ee6b23a4e 100644 --- a/tests/frontend/ntt-pipeline/ntt-4-reduced-2.expect +++ b/tests/frontend/ntt-pipeline/ntt-4-reduced-2.expect @@ -7,12 +7,12 @@ // | 3 | a[1] - a[3] * phis[1] | a[2] - a[3] * phis[3] | // +---+-----------------------+-----------------------+ import "primitives/core.futil"; -import "primitives/memories/comb.futil"; +import "primitives/memories/seq.futil"; import "primitives/binary_operators.futil"; component main() -> () { cells { - @external a = comb_mem_d1(32, 4, 3); - @external phis = comb_mem_d1(32, 4, 3); + @external a = seq_mem_d1(32, 4, 3); + @external phis = seq_mem_d1(32, 4, 3); r0 = std_reg(32); A0 = std_reg(32); phi0 = std_reg(32); @@ -41,50 +41,58 @@ component main() -> () { wires { group preamble_0_reg { a.addr0 = 3'd0; - r0.write_en = 1'd1; - r0.in = a.read_data; + a.content_en = 1'd1; + r0.write_en = a.done ? 1'd1; + r0.in = a.done ? a.read_data; preamble_0_reg[done] = r0.done; } group preamble_0_phi { phis.addr0 = 3'd0; - phi0.write_en = 1'd1; - phi0.in = phis.read_data; + phis.content_en = 1'd1; + phi0.write_en = phis.done ? 1'd1; + phi0.in = phis.done ? phis.read_data; preamble_0_phi[done] = phi0.done; } group preamble_1_reg { a.addr0 = 3'd1; - r1.write_en = 1'd1; - r1.in = a.read_data; + a.content_en = 1'd1; + r1.write_en = a.done ? 1'd1; + r1.in = a.done ? a.read_data; preamble_1_reg[done] = r1.done; } group preamble_1_phi { phis.addr0 = 3'd1; - phi1.write_en = 1'd1; - phi1.in = phis.read_data; + phis.content_en = 1'd1; + phi1.write_en = phis.done ? 1'd1; + phi1.in = phis.done ? phis.read_data; preamble_1_phi[done] = phi1.done; } group preamble_2_reg { a.addr0 = 3'd2; - r2.write_en = 1'd1; - r2.in = a.read_data; + a.content_en = 1'd1; + r2.write_en = a.done ? 1'd1; + r2.in = a.done ? a.read_data; preamble_2_reg[done] = r2.done; } group preamble_2_phi { phis.addr0 = 3'd2; - phi2.write_en = 1'd1; - phi2.in = phis.read_data; + phis.content_en = 1'd1; + phi2.write_en = phis.done ? 1'd1; + phi2.in = phis.done ? phis.read_data; preamble_2_phi[done] = phi2.done; } group preamble_3_reg { a.addr0 = 3'd3; - r3.write_en = 1'd1; - r3.in = a.read_data; + a.content_en = 1'd1; + r3.write_en = a.done ? 1'd1; + r3.in = a.done ? a.read_data; preamble_3_reg[done] = r3.done; } group preamble_3_phi { phis.addr0 = 3'd3; - phi3.write_en = 1'd1; - phi3.in = phis.read_data; + phis.content_en = 1'd1; + phi3.write_en = phis.done ? 1'd1; + phi3.in = phis.done ? phis.read_data; preamble_3_phi[done] = phi3.done; } group precursor_0 { @@ -216,24 +224,28 @@ component main() -> () { a.write_en = 1'd1; a.write_data = A0.out; epilogue_0[done] = a.done; + a.content_en = 1'd1; } group epilogue_1 { a.addr0 = 3'd1; a.write_en = 1'd1; a.write_data = A1.out; epilogue_1[done] = a.done; + a.content_en = 1'd1; } group epilogue_2 { a.addr0 = 3'd2; a.write_en = 1'd1; a.write_data = A2.out; epilogue_2[done] = a.done; + a.content_en = 1'd1; } group epilogue_3 { a.addr0 = 3'd3; a.write_en = 1'd1; a.write_data = A3.out; epilogue_3[done] = a.done; + a.content_en = 1'd1; } } control { diff --git a/tests/frontend/ntt-pipeline/ntt-4.expect b/tests/frontend/ntt-pipeline/ntt-4.expect index e711716bd4..a8f6cc1957 100644 --- a/tests/frontend/ntt-pipeline/ntt-4.expect +++ b/tests/frontend/ntt-pipeline/ntt-4.expect @@ -7,12 +7,12 @@ // | 3 | a[1] - a[3] * phis[1] | a[2] - a[3] * phis[3] | // +---+-----------------------+-----------------------+ import "primitives/core.futil"; -import "primitives/memories/comb.futil"; +import "primitives/memories/seq.futil"; import "primitives/binary_operators.futil"; component main() -> () { cells { - @external a = comb_mem_d1(32, 4, 3); - @external phis = comb_mem_d1(32, 4, 3); + @external a = seq_mem_d1(32, 4, 3); + @external phis = seq_mem_d1(32, 4, 3); r0 = std_reg(32); A0 = std_reg(32); phi0 = std_reg(32); @@ -41,50 +41,58 @@ component main() -> () { wires { group preamble_0_reg { a.addr0 = 3'd0; - r0.write_en = 1'd1; - r0.in = a.read_data; + a.content_en = 1'd1; + r0.write_en = a.done ? 1'd1; + r0.in = a.done ? a.read_data; preamble_0_reg[done] = r0.done; } group preamble_0_phi { phis.addr0 = 3'd0; - phi0.write_en = 1'd1; - phi0.in = phis.read_data; + phis.content_en = 1'd1; + phi0.write_en = phis.done ? 1'd1; + phi0.in = phis.done ? phis.read_data; preamble_0_phi[done] = phi0.done; } group preamble_1_reg { a.addr0 = 3'd1; - r1.write_en = 1'd1; - r1.in = a.read_data; + a.content_en = 1'd1; + r1.write_en = a.done ? 1'd1; + r1.in = a.done ? a.read_data; preamble_1_reg[done] = r1.done; } group preamble_1_phi { phis.addr0 = 3'd1; - phi1.write_en = 1'd1; - phi1.in = phis.read_data; + phis.content_en = 1'd1; + phi1.write_en = phis.done ? 1'd1; + phi1.in = phis.done ? phis.read_data; preamble_1_phi[done] = phi1.done; } group preamble_2_reg { a.addr0 = 3'd2; - r2.write_en = 1'd1; - r2.in = a.read_data; + a.content_en = 1'd1; + r2.write_en = a.done ? 1'd1; + r2.in = a.done ? a.read_data; preamble_2_reg[done] = r2.done; } group preamble_2_phi { phis.addr0 = 3'd2; - phi2.write_en = 1'd1; - phi2.in = phis.read_data; + phis.content_en = 1'd1; + phi2.write_en = phis.done ? 1'd1; + phi2.in = phis.done ? phis.read_data; preamble_2_phi[done] = phi2.done; } group preamble_3_reg { a.addr0 = 3'd3; - r3.write_en = 1'd1; - r3.in = a.read_data; + a.content_en = 1'd1; + r3.write_en = a.done ? 1'd1; + r3.in = a.done ? a.read_data; preamble_3_reg[done] = r3.done; } group preamble_3_phi { phis.addr0 = 3'd3; - phi3.write_en = 1'd1; - phi3.in = phis.read_data; + phis.content_en = 1'd1; + phi3.write_en = phis.done ? 1'd1; + phi3.in = phis.done ? phis.read_data; preamble_3_phi[done] = phi3.done; } group precursor_0 { @@ -216,24 +224,28 @@ component main() -> () { a.write_en = 1'd1; a.write_data = A0.out; epilogue_0[done] = a.done; + a.content_en = 1'd1; } group epilogue_1 { a.addr0 = 3'd1; a.write_en = 1'd1; a.write_data = A1.out; epilogue_1[done] = a.done; + a.content_en = 1'd1; } group epilogue_2 { a.addr0 = 3'd2; a.write_en = 1'd1; a.write_data = A2.out; epilogue_2[done] = a.done; + a.content_en = 1'd1; } group epilogue_3 { a.addr0 = 3'd3; a.write_en = 1'd1; a.write_data = A3.out; epilogue_3[done] = a.done; + a.content_en = 1'd1; } } control {