add tests, conv files, etc

Author: rachitnigam

apps/guass-pyramid/ready-val/conv/conv2d_1.v

@@ -55,3 +55,20 @@ test-blur D N:
 
 # Quick blur test with default parameters
 test-blur-default: (test-blur "8" "4")
+
+# Test Pyramid module with specific N values for each blur stage
+test-pyramid blur0_n blur1_n blur_up_n:
+    @echo "Testing Pyramid with Blur0_N={{blur0_n}}, Blur1_N={{blur1_n}}, BlurUp_N={{blur_up_n}}"
+    sed 's/parameter Blur0_N = 16;/parameter Blur0_N = {{blur0_n}};/' tests/pyramid_tb.sv > tests/pyramid_tb_{{blur0_n}}_{{blur1_n}}_{{blur_up_n}}.sv
+    sed -i '' 's/parameter Blur1_N = 16;/parameter Blur1_N = {{blur1_n}};/' tests/pyramid_tb_{{blur0_n}}_{{blur1_n}}_{{blur_up_n}}.sv
+    sed -i '' 's/parameter BlurUp_N = 16;/parameter BlurUp_N = {{blur_up_n}};/' tests/pyramid_tb_{{blur0_n}}_{{blur1_n}}_{{blur_up_n}}.sv
+    verilator {{VFLAGS_TRACE}} -o sim_pyramid_{{blur0_n}}_{{blur1_n}}_{{blur_up_n}} tests/pyramid_tb_{{blur0_n}}_{{blur1_n}}_{{blur_up_n}}.sv valid-hold.sv
+    ./obj_dir/sim_pyramid_{{blur0_n}}_{{blur1_n}}_{{blur_up_n}}
+    @[ -f pyramid_tb.vcd ] && mv pyramid_tb.vcd pyramid_tb_{{blur0_n}}_{{blur1_n}}_{{blur_up_n}}.vcd || true
+    rm tests/pyramid_tb_{{blur0_n}}_{{blur1_n}}_{{blur_up_n}}.sv
+
+# Quick pyramid test with default parameters
+test-pyramid-default: (test-pyramid "16" "16" "16")
+
+# Test pyramid with small N values for faster simulation
+test-pyramid-fast: (test-pyramid "4" "4" "4")

apps/guass-pyramid/ready-val/conv/conv2d_144.v

@@ -0,0 +1,175 @@
+/* verilator lint_off DECLFILENAME */
+/* verilator lint_off MULTITOP */
+
+module pyramid_tb;
+  parameter Blur0_N = 16;
+  parameter Blur1_N = 16;
+  parameter BlurUp_N = 16;
+  parameter TIMEOUT = 10000; // Max cycles before timeout
+
+  logic clk, reset;
+  logic valid_i, ready_i, valid_o, ready_o;
+  logic[7:0][7:0][7:0] in, out;
+  
+  // Debug signals
+  logic[3:0] st;
+  logic[1:0] blur0_st, blur1_st, blur_up_st;
+  logic[7:0][7:0][7:0] level0_stable;
+  logic[3:0][3:0][7:0] level1_stable;
+  logic[7:0][7:0][7:0] upsampled_stable;
+
+  // Instantiate the Pyramid module
+  Pyramid #(
+    .Blur0_N(Blur0_N),
+    .Blur1_N(Blur1_N),
+    .BlurUp_N(BlurUp_N)
+  ) dut (
+    .clk(clk),
+    .reset(reset),
+    .valid_i(valid_i),
+    .ready_i(ready_i),
+    .in(in),
+    .valid_o(valid_o),
+    .ready_o(ready_o),
+    .out(out),
+    .st(st),
+    .blur0_st(blur0_st),
+    .blur1_st(blur1_st),
+    .blur_up_st(blur_up_st),
+    .level0_stable(level0_stable),
+    .level1_stable(level1_stable),
+    .upsampled_stable(upsampled_stable)
+  );
+
+  // Clock generation
+  always #5 clk = ~clk;
+
+  // Simulation control and monitoring
+  int cycle_count = 0;
+  
+  initial begin
+    $dumpfile("pyramid_tb.vcd");
+    $dumpvars(0, pyramid_tb);
+    
+    // Initialize signals
+    clk = 0;
+    reset = 1;
+    valid_i = 0;
+    ready_o = 1; // Always ready to receive output
+    
+    // Create a simple test pattern for input
+    for (int i = 0; i < 8; i++) begin
+      for (int j = 0; j < 8; j++) begin
+        in[i][j] = 8'(i * 8 + j + 1); // Pattern: 1,2,3...64
+      end
+    end
+    
+    $display("=== Pyramid Testbench ===");
+    $display("Parameters: Blur0_N=%0d, Blur1_N=%0d, BlurUp_N=%0d", Blur0_N, Blur1_N, BlurUp_N);
+    $display("Input pattern:");
+    for (int i = 0; i < 8; i++) begin
+      $write("  ");
+      for (int j = 0; j < 8; j++) begin
+        $write("%3d ", in[i][j]);
+      end
+      $display("");
+    end
+    $display("");
+
+    // Reset sequence
+    repeat(3) @(posedge clk);
+    reset = 0;
+    
+    // Wait for ready_i
+    while (!ready_i) begin
+      @(posedge clk);
+      cycle_count++;
+      if (cycle_count > TIMEOUT) begin
+        $error("TIMEOUT: Module never became ready (ready_i)");
+        $finish;
+      end
+    end
+    
+    $display("Module ready after %0d cycles", cycle_count);
+    
+    // Assert valid_i for one cycle
+    valid_i = 1;
+    @(posedge clk);
+    cycle_count++;
+    valid_i = 0;
+    
+    $display("Input submitted at cycle %0d", cycle_count);
+    
+    // Wait for output to be valid
+    while (!valid_o) begin
+      @(posedge clk);
+      cycle_count++;
+      if (cycle_count > TIMEOUT) begin
+        $error("TIMEOUT: Module never produced output (valid_o) after %0d cycles", TIMEOUT);
+        $error("Final state: st=%0d, blur0_st=%0d, blur1_st=%0d, blur_up_st=%0d", 
+               st, blur0_st, blur1_st, blur_up_st);
+        $finish;
+      end
+      
+      // Progress indicator every 100 cycles
+      if (cycle_count % 100 == 0) begin
+        $display("Cycle %0d: st=%0d, blur0_st=%0d, blur1_st=%0d, blur_up_st=%0d", 
+                 cycle_count, st, blur0_st, blur1_st, blur_up_st);
+      end
+    end
+    
+    $display("\n=== RESULTS ===");
+    $display("Processing completed in %0d cycles", cycle_count);
+    
+    $display("\nFinal output:");
+    for (int i = 0; i < 8; i++) begin
+      $write("  ");
+      for (int j = 0; j < 8; j++) begin
+        $write("%3d ", out[i][j]);
+      end
+      $display("");
+    end
+    
+    $display("\nDebug signals:");
+    $display("Final state: %0d", st);
+    $display("Blur states: blur0=%0d, blur1=%0d, blur_up=%0d", blur0_st, blur1_st, blur_up_st);
+    
+    $display("\nlevel0_stable (8x8):");
+    for (int i = 0; i < 8; i++) begin
+      $write("  ");
+      for (int j = 0; j < 8; j++) begin
+        $write("%3d ", level0_stable[i][j]);
+      end
+      $display("");
+    end
+    
+    $display("\nlevel1_stable (4x4):");
+    for (int i = 0; i < 4; i++) begin
+      $write("  ");
+      for (int j = 0; j < 4; j++) begin
+        $write("%3d ", level1_stable[i][j]);
+      end
+      $display("");
+    end
+    
+    $display("\nupsampled_stable (8x8):");
+    for (int i = 0; i < 8; i++) begin
+      $write("  ");
+      for (int j = 0; j < 8; j++) begin
+        $write("%3d ", upsampled_stable[i][j]);
+      end
+      $display("");
+    end
+    
+    $display("\n=== TEST COMPLETED SUCCESSFULLY ===");
+    $finish;
+  end
+
+  // Timeout watchdog
+  initial begin
+    #(TIMEOUT * 10); // 10ns per cycle
+    $error("GLOBAL TIMEOUT: Simulation exceeded maximum time");
+    $finish;
+  end
+
+endmodule

apps/guass-pyramid/ready-val/conv/conv2d_16.v

@@ -511,7 +511,11 @@ end
 
 endmodule
 
-module Pyramid (
+module Pyramid #(
+  parameter Blur0_N = 16,
+  parameter Blur1_N = 16,
+  parameter BlurUp_N = 16
+) (
   input logic clk,
   input logic reset,
 
@@ -525,6 +529,7 @@ module Pyramid (
 
   /// Debug signals
   // Blur states
+  output logic[3:0] st,
   output logic[1:0] blur0_st,
   output logic[1:0] blur1_st,
   output logic[1:0] blur_up_st,
@@ -544,7 +549,7 @@ localparam bit[3:0]
   Blend=7,
   Writing=8;
 
-logic[3:0] st, nxt_st;
+logic[3:0] nxt_st;
 always_comb begin
   nxt_st = st;
   // All signals are deasserted unless in specific state.
@@ -622,7 +627,7 @@ Pad#(.W(8), .D0(8), .D1(8)) pad0(.in(pad0_in), .out(pad0_out));
 logic blur0_valid_i, blur0_valid_o, blur0_ready_i, blur0_ready_o;
 logic[7:0][7:0][7:0] blur0_out;
 
-Blur#(.D0(10), .D1(10)) blur0(
+Blur#(.N(Blur0_N), .D0(10), .D1(10)) blur0(
   .clk, .reset, .state(blur0_st),
   .in(pad0_out),   .valid_i(blur0_valid_i), .ready_i(blur0_ready_i),
   .out(blur0_out), .valid_o(blur0_valid_o), .ready_o(blur0_ready_o)
@@ -660,7 +665,7 @@ Pad#(.W(8), .D0(4), .D1(4)) pad1 (
 // Should we expect it to be stable during the execution of the module?
 logic blur1_valid_i, blur1_valid_o, blur1_ready_i, blur1_ready_o;
 logic[3:0][3:0][7:0] blur1_out;
-Blur#(.D0(6), .D1(6)) blur1(
+Blur#(.N(Blur1_N), .D0(6), .D1(6)) blur1(
   .clk, .reset, .state(blur1_st),
   .in(pad1_out),   .valid_i(blur1_valid_i), .ready_i(blur1_ready_i),
   .out(blur1_out), .valid_o(blur1_valid_o), .ready_o(blur1_ready_o)
@@ -693,7 +698,7 @@ Pad#(.W(8), .D0(8), .D1(8)) pad_up(
 
 logic blur_up_valid_i, blur_up_valid_o, blur_up_ready_i, blur_up_ready_o;
 logic[7:0][7:0][7:0] blur_up_out;
-Blur#(.D0(10), .D1(10)) blur_up(
+Blur#(.N(BlurUp_N), .D0(10), .D1(10)) blur_up(
   .clk, .reset, .state(blur_up_st),
   .in(pad_up_out),   .valid_i(blur_up_valid_i), .ready_i(blur_up_ready_i),
   .out(blur_up_out), .valid_o(blur_up_valid_o), .ready_o(blur_up_ready_o)