Upd tb

Author: RDSik

.gitignore

@@ -1,18 +1,14 @@
-sim/verilator/*
-!si5340_config_loader_tb.py
-!si5340_config_loader.sv
-!test.py
-sim/cocotb/*
+sim/*
 !test.py
 !si5340_config_loader_tb.py
 !wave.do
-sim/modelsim/*
-!wave.do
 syn/*
 !Manifest.py
 !quartus_preflow.tcl
 !si5340_config_loader.sdc
 myenv
 obj_dir
 *.vcd
-*.v.bak
+*.v.bak
+*.wlf
+transcript

README.md

@@ -58,7 +58,7 @@ deactivate
 
 ### Using macrofile:
 ```bash
-cd .\sim\modelsim\
+cd .\src\tb\
 vsim
 do wave.do
 ```

sim/cocotb/si5340_config_loader_tb.py sim/si5340_config_loader_tb.pysim/cocotb/si5340_config_loader_tb.py renamed to sim/si5340_config_loader_tb.py

@@ -6,7 +6,7 @@
 from cocotb.runner import get_runner
 
 def test_runner():
-    src = Path("../../src")
+    src = Path("../src")
 
     hdl_toplevel_lang = os.getenv("HDL_TOPLEVEL_LANG", "verilog")
     sim = os.getenv("SIM", "questa")

sim/cocotb/test.py sim/test.pysim/cocotb/test.py renamed to sim/test.py

@@ -1,15 +1,41 @@
 [*]
 [*] GTKWave Analyzer v3.4.0 (w)1999-2022 BSI
-[*] Fri Dec 20 20:07:51 2024
+[*] Tue Dec 31 14:54:57 2024
 [*]
 [dumpfile] "/home/rds/fpga/my_projects/si5340-config-loader/src/si5340_config_loader_tb.vcd"
-[dumpfile_mtime] "Fri Dec 20 20:06:30 2024"
-[dumpfile_size] 135092
+[dumpfile_mtime] "Tue Dec 31 14:54:57 2024"
+[dumpfile_size] 135561
 [savefile] "/home/rds/fpga/my_projects/si5340-config-loader/src/gtkw.gtkw"
 [timestart] 0
-[size] 1920 1000
-[pos] -103 -103
+[size] 1920 916
+[pos] -1 -1
 *-21.498796 -1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+[markername] AA
+[markername] BB
+[markername] CC
+[markername] DD
+[markername] EE
+[markername] FF
+[markername] GG
+[markername] HH
+[markername] II
+[markername] JJ
+[markername] KK
+[markername] LL
+[markername] MM
+[markername] NN
+[markername] OO
+[markername] PP
+[markername] QQ
+[markername] RR
+[markername] SS
+[markername] TT
+[markername] UU
+[markername] VV
+[markername] WW
+[markername] XX
+[markername] YY
+[markername] ZZ
 [treeopen] si5340_config_loader_tb.
 [sst_width] 314
 [signals_width] 200
@@ -18,7 +44,6 @@
 @22
 si5340_config_loader_tb.CLK_PER[31:0]
 si5340_config_loader_tb.PAUSE_NS[31:0]
-si5340_config_loader_tb.dut.CONFIG_MEM[79:0]
 si5340_config_loader_tb.dut.PAUSE_NS[31:0]
 si5340_config_loader_tb.dut.QUEUE_WIDTH[31:0]
 @28
@@ -147,12 +172,6 @@ si5340_config_loader_tb.dut.load_i
 @22
 si5340_config_loader_tb.dut.mem_index[8:0]
 si5340_config_loader_tb.dut.pause_cnt[3:0]
-si5340_config_loader_tb.dut.queue[0][10:0]
-si5340_config_loader_tb.dut.queue[1][10:0]
-si5340_config_loader_tb.dut.queue[2][10:0]
-si5340_config_loader_tb.dut.queue[3][10:0]
-si5340_config_loader_tb.dut.queue[4][10:0]
-si5340_config_loader_tb.dut.queue[5][10:0]
 @28
 si5340_config_loader_tb.dut.queue_index[2:0]
 si5340_config_loader_tb.dut.queue_len[2:0]

sim/cocotb/wave.do sim/wave.dosim/cocotb/wave.do renamed to sim/wave.do

@@ -2,11 +2,9 @@
 `define ENV_SV
 
 `include "../timescale.v"
-
 class environment;
 
-    localparam CLK_PER = 8;
-    localparam NUMBER  = 1;
+    localparam NUMBER = 1;
 
     local virtual si5340_config_loader_if dut_if;
 
@@ -17,7 +15,7 @@ class environment;
     task rst_gen();
         begin
             dut_if.arstn_i = 0;
-            #CLK_PER;
+            @(posedge dut_if.clk_i);
             dut_if.arstn_i = 1;
         end
     endtask
@@ -41,10 +39,10 @@ class environment;
                 @(posedge dut_if.clk_i);
                 dut_if.write_i = 0;
                 dut_if.load_i = 0;
-                #(CLK_PER*256);
+                repeat (256) @(posedge dut_if.clk_i);
                 $display("Get cmd_ack at %g ns.", $time);
                 $display("-----------------------------------------");
-                #(CLK_PER*750);
+                repeat (750) @(posedge dut_if.clk_i);
             end
         end
     endtask
@@ -59,10 +57,10 @@ class environment;
                 @(posedge dut_if.clk_i);
                 dut_if.write_i = 0;
                 dut_if.load_i = 0;
-                #(CLK_PER*256);
+                repeat (256) @(posedge dut_if.clk_i);
                 $display("Get cmd_ack at %g ns.", $time);
                 $display("-----------------------------------------");
-                #(CLK_PER*1300);
+                repeat (1300) @(posedge dut_if.clk_i);
             end
         end
     endtask

src/gtkw.gtkw

@@ -2,16 +2,17 @@
 
 /* verilator lint_off MODDUP */
 module si5340_config_loader_tb();
-/* verilator lint_on MODDUP */
 
     si5340_config_loader_if dut_if();
     environment env;
 
     localparam CLK_PER  = 8;
     localparam PAUSE_NS = 10;
-                                                         
+    localparam CONFIG_MEM = "../config.mem";
+    
     si5340_config_loader #(
-        .PAUSE_NS (PAUSE_NS)
+        .CONFIG_MEM (CONFIG_MEM),
+        .PAUSE_NS   (PAUSE_NS  )
     ) dut (
         .clk_i        (dut_if.clk_i       ),
         .arstn_i      (dut_if.arstn_i     ),
@@ -38,7 +39,6 @@ module si5340_config_loader_tb();
     initial begin
         $dumpfile("si5340_config_loader_tb.vcd");
         $dumpvars(0, si5340_config_loader_tb);
-        // $monitor("time=%g, load=%b, write=%b", $time, dut_if.load_i, dut_if.write_i);
     end
 
 endmodule

src/tb/environment.sv

@@ -1,16 +1,16 @@
 vlib work
 vmap work
 
-vlog ../../src/tb/si5340_config_loader_tb.sv
-vlog ../../src/tb/si5340_config_loader_if.sv
-vlog ../../src/tb/environment.sv
-vlog ../../src/i2c_master_bit_ctrl.v
-vlog ../../src/i2c_master_byte_ctrl.v
-vlog ../../src/i2c_master_defines.v
-vlog ../../src/timescale.v
-vlog ../../src/si5340_config_loader.sv
-vlog ../../src/i2c_ctrl_if.sv
-vlog ../../src/cfg_pkg.svh
+vlog si5340_config_loader_tb.sv
+vlog si5340_config_loader_if.sv
+vlog environment.sv
+vlog ../i2c_master_bit_ctrl.v
+vlog ../i2c_master_byte_ctrl.v
+vlog ../i2c_master_defines.v
+vlog ../timescale.v
+vlog ../si5340_config_loader.sv
+vlog ../i2c_ctrl_if.sv
+vlog ../cfg_pkg.svh
 
 vsim -voptargs="+acc" si5340_config_loader_tb
 add log -r /*
@@ -73,24 +73,5 @@ add wave -expand -color #ee66ff -radix hex -group I2C_CORE \
 /si5340_config_loader_tb/dut/i2c_inst/cnt_done \
 /si5340_config_loader_tb/dut/i2c_inst/c_state  \
 
-TreeUpdate [SetDefaultTree]
-WaveRestoreCursors {{Cursor 1} {7650915 ps} 0}
-quietly wave cursor active 1
-configure wave -namecolwidth 267
-configure wave -valuecolwidth 100
-configure wave -justifyvalue left
-configure wave -signalnamewidth 0
-configure wave -snapdistance 10
-configure wave -datasetprefix 0
-configure wave -rowmargin 4
-configure wave -childrowmargin 2
-configure wave -gridoffset 0
-configure wave -gridperiod 1
-configure wave -griddelta 40
-configure wave -timeline 0
-configure wave -timelineunits ns
-update
-WaveRestoreZoom {0 ps} {21 us}
-
 run -all
 wave zoom full