Improve timing reports and register poly mul inputs
This commit is contained in:
@@ -55,7 +55,11 @@ module poly_mul_sync (
|
||||
reg [7:0] load_cnt; // 0..256 for loading 256 pairs
|
||||
reg [6:0] comp_k; // 0..127, current base-case index
|
||||
|
||||
// Registered basecase_mul results
|
||||
// Registered basecase_mul inputs/results
|
||||
reg [11:0] bc_a0_reg, bc_a1_reg;
|
||||
reg [11:0] bc_b0_reg, bc_b1_reg;
|
||||
reg [11:0] bc_zeta_reg;
|
||||
reg bc_valid_reg;
|
||||
reg [11:0] c0_reg, c1_reg;
|
||||
|
||||
// Combinational read signals for COMP_CALC
|
||||
@@ -73,19 +77,19 @@ module poly_mul_sync (
|
||||
.zeta (zeta)
|
||||
);
|
||||
|
||||
// Pipelined basecase multiply. One request is issued at a time; the
|
||||
// output interface is unchanged for top-level consumers.
|
||||
// Pipelined basecase multiply. One request is issued at a time; inputs are
|
||||
// registered locally so comp_k does not directly drive the DSP input muxes.
|
||||
wire [11:0] bc_c0, bc_c1;
|
||||
wire bc_vo;
|
||||
basecase_mul_pipe u_bc (
|
||||
.clk (clk),
|
||||
.rst_n(rst_n),
|
||||
.valid_i(state == S_COMP_ISSUE),
|
||||
.a0 (mem_a0),
|
||||
.a1 (mem_a1),
|
||||
.b0 (mem_b0),
|
||||
.b1 (mem_b1),
|
||||
.zeta(zeta),
|
||||
.valid_i(bc_valid_reg),
|
||||
.a0 (bc_a0_reg),
|
||||
.a1 (bc_a1_reg),
|
||||
.b0 (bc_b0_reg),
|
||||
.b1 (bc_b1_reg),
|
||||
.zeta(bc_zeta_reg),
|
||||
.c0 (bc_c0),
|
||||
.c1 (bc_c1),
|
||||
.valid_o(bc_vo)
|
||||
@@ -122,6 +126,12 @@ module poly_mul_sync (
|
||||
state <= S_IDLE;
|
||||
load_cnt <= 8'd0;
|
||||
comp_k <= 7'd0;
|
||||
bc_a0_reg <= 12'd0;
|
||||
bc_a1_reg <= 12'd0;
|
||||
bc_b0_reg <= 12'd0;
|
||||
bc_b1_reg <= 12'd0;
|
||||
bc_zeta_reg <= 12'd0;
|
||||
bc_valid_reg <= 1'b0;
|
||||
c0_reg <= 12'd0;
|
||||
c1_reg <= 12'd0;
|
||||
for (i = 0; i < 256; i = i + 1) begin
|
||||
@@ -130,6 +140,7 @@ module poly_mul_sync (
|
||||
end
|
||||
end else begin
|
||||
state <= next_state;
|
||||
bc_valid_reg <= 1'b0;
|
||||
|
||||
// ---- LOAD phase ----
|
||||
// First coefficient captured on IDLE → LOAD transition
|
||||
@@ -147,6 +158,18 @@ module poly_mul_sync (
|
||||
end
|
||||
|
||||
// ---- COMPUTE phase ----
|
||||
// COMP_ISSUE: cut the comp_k -> memory mux -> basecase DSP path.
|
||||
// bc_valid_reg pulses on the following cycle, while these regs hold
|
||||
// stable inputs through the basecase pipeline launch.
|
||||
if (state == S_COMP_ISSUE) begin
|
||||
bc_a0_reg <= mem_a0;
|
||||
bc_a1_reg <= mem_a1;
|
||||
bc_b0_reg <= mem_b0;
|
||||
bc_b1_reg <= mem_b1;
|
||||
bc_zeta_reg <= zeta;
|
||||
bc_valid_reg <= 1'b1;
|
||||
end
|
||||
|
||||
// COMP_WAIT: capture pipelined basecase_mul results when ready.
|
||||
if (state == S_COMP_WAIT && bc_vo) begin
|
||||
c0_reg <= bc_c0;
|
||||
|
||||
@@ -13,7 +13,7 @@ module tb_mlkem_dec_katK_xsim;
|
||||
localparam EKB = 384*KP + 32; // ek_pke bytes within dk
|
||||
localparam DKPB = 384*KP; // dk_pke bytes
|
||||
localparam CTB = (KP==4) ? 1568 : (32*(10*KP+4)); // ct bytes: 768/1088/1568
|
||||
localparam integer CLK_PERIOD_NS = 100; // 10 MHz
|
||||
localparam integer CLK_PERIOD_NS = 50; // 20 MHz
|
||||
localparam integer CLK_HALF_NS = CLK_PERIOD_NS / 2;
|
||||
|
||||
reg clk=0, rst_n=0, start_i=0;
|
||||
@@ -112,7 +112,7 @@ module tb_mlkem_dec_katK_xsim;
|
||||
integer runtime_ns;
|
||||
begin
|
||||
runtime_ns = cycles * CLK_PERIOD_NS;
|
||||
$display("TIME K=%0d CASE=%0d OP=%0s cycles=%0d clk=10MHz period=%0dns runtime=%0d ns (%0d.%03d us, %0d.%03d ms)",
|
||||
$display("TIME K=%0d CASE=%0d OP=%0s cycles=%0d clk=20MHz period=%0dns runtime=%0d ns (%0d.%03d us, %0d.%03d ms)",
|
||||
KP, casenum, op_name, cycles, CLK_PERIOD_NS, runtime_ns,
|
||||
runtime_ns/1000, runtime_ns%1000,
|
||||
runtime_ns/1000000, (runtime_ns%1000000)/1000);
|
||||
|
||||
@@ -12,7 +12,7 @@ module tb_mlkem_enc_katK_xsim;
|
||||
localparam CTB = (KP==4) ? 1568 : (32*(10*KP+4)); // ct bytes: K2 768,K3 1088,K4 1568
|
||||
localparam DU = (KP==4) ? 11 : 10; // compression du
|
||||
localparam C1B = 32*DU*KP; // c1 byte count: K2 640,K3 960,K4 1408
|
||||
localparam integer CLK_PERIOD_NS = 100; // 10 MHz
|
||||
localparam integer CLK_PERIOD_NS = 50; // 20 MHz
|
||||
localparam integer CLK_HALF_NS = CLK_PERIOD_NS / 2;
|
||||
|
||||
reg clk=0, rst_n=0, start_i=0;
|
||||
@@ -105,7 +105,7 @@ module tb_mlkem_enc_katK_xsim;
|
||||
integer runtime_ns;
|
||||
begin
|
||||
runtime_ns = cycles * CLK_PERIOD_NS;
|
||||
$display("TIME K=%0d CASE=%0d OP=%0s cycles=%0d clk=10MHz period=%0dns runtime=%0d ns (%0d.%03d us, %0d.%03d ms)",
|
||||
$display("TIME K=%0d CASE=%0d OP=%0s cycles=%0d clk=20MHz period=%0dns runtime=%0d ns (%0d.%03d us, %0d.%03d ms)",
|
||||
KP, casenum, op_name, cycles, CLK_PERIOD_NS, runtime_ns,
|
||||
runtime_ns/1000, runtime_ns%1000,
|
||||
runtime_ns/1000000, (runtime_ns%1000000)/1000);
|
||||
|
||||
@@ -57,7 +57,7 @@ module tb_mlkem_hello_world_xsim;
|
||||
.dbg_mprime_o(dbg_mprime_o), .dbg_kbar_o(dbg_kbar_o),
|
||||
.dbg_decz_o(dbg_decz_o), .dbg_dech_o(dbg_dech_o)
|
||||
);
|
||||
always #5 clk = ~clk;
|
||||
always #25 clk = ~clk; // 20 MHz
|
||||
|
||||
// storage shuttled between operations (the "wire" between Alice and Bob)
|
||||
reg [7:0] ek_b [0:EKB-1];
|
||||
|
||||
@@ -7,7 +7,7 @@ module tb_mlkem_kg_katK_xsim;
|
||||
parameter KP = 2;
|
||||
localparam EKB = 384*KP + 32;
|
||||
localparam DKB = 768*KP + 96;
|
||||
localparam integer CLK_PERIOD_NS = 100; // 10 MHz
|
||||
localparam integer CLK_PERIOD_NS = 50; // 20 MHz
|
||||
localparam integer CLK_HALF_NS = CLK_PERIOD_NS / 2;
|
||||
|
||||
reg clk=0, rst_n=0, start_i=0;
|
||||
@@ -99,7 +99,7 @@ module tb_mlkem_kg_katK_xsim;
|
||||
integer runtime_ns;
|
||||
begin
|
||||
runtime_ns = cycles * CLK_PERIOD_NS;
|
||||
$display("TIME K=%0d CASE=%0d OP=%0s cycles=%0d clk=10MHz period=%0dns runtime=%0d ns (%0d.%03d us, %0d.%03d ms)",
|
||||
$display("TIME K=%0d CASE=%0d OP=%0s cycles=%0d clk=20MHz period=%0dns runtime=%0d ns (%0d.%03d us, %0d.%03d ms)",
|
||||
KP, casenum, op_name, cycles, CLK_PERIOD_NS, runtime_ns,
|
||||
runtime_ns/1000, runtime_ns%1000,
|
||||
runtime_ns/1000000, (runtime_ns%1000000)/1000);
|
||||
|
||||
@@ -23,7 +23,7 @@ module tb_mlkem_two_inst_xsim;
|
||||
localparam MLEN = 11; // "hello world"
|
||||
|
||||
reg clk=0;
|
||||
always #5 clk = ~clk;
|
||||
always #25 clk = ~clk; // 20 MHz
|
||||
|
||||
// ---------------- Instance A: KeyGen + Encaps ----------------
|
||||
reg a_rst_n=0, a_start=0;
|
||||
|
||||
Reference in New Issue
Block a user