From 5ca43eea77b528c0bf5bb1335b15abf16842b91b Mon Sep 17 00:00:00 2001 From: bacon Date: Thu, 22 May 2025 15:32:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E4=BE=8B,=E6=B5=8B=E8=AF=95=E4=B8=BB=E7=AB=99?= =?UTF-8?q?=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tb/shinTest/ShinTopSpiTb.v | 147 +++++++++++++++++++++++++------------ 1 file changed, 102 insertions(+), 45 deletions(-) diff --git a/tb/shinTest/ShinTopSpiTb.v b/tb/shinTest/ShinTopSpiTb.v index e977a7b..d90f14c 100644 --- a/tb/shinTest/ShinTopSpiTb.v +++ b/tb/shinTest/ShinTopSpiTb.v @@ -426,6 +426,31 @@ endtask `define IF_OSPI(idx) ((5) + (idx)) `define SPI_WRITE 8'h0 `define SPI_READ 8'h1 + +`define MST_TX_TRIGGER(idx) (8'h1 + ((idx) * 2) + ((idx) * 8)) +`define MST_RX0_ADDR 16'h0800 +`define MST_TX0_ADDR 16'h1000 +`define MST_RX1_ADDR 16'h1800 +`define MST_TX1_ADDR 16'h2000 +`define MST_RX2_ADDR 16'h2800 +`define MST_TX2_ADDR 16'h3000 +`define MST_RX3_ADDR 16'h3800 +`define MST_TX3_ADDR 16'h4000 +`define MST_RX0_LEN_ADDR 16'h0306 +`define MST_TX0_LEN_ADDR 16'h0302 +`define MST_RX1_LEN_ADDR 16'h030e +`define MST_TX1_LEN_ADDR 16'h030a +`define MST_RX2_LEN_ADDR 16'h0316 +`define MST_TX2_LEN_ADDR 16'h0312 +`define MST_RX3_LEN_ADDR 16'h031e +`define MST_TX3_LEN_ADDR 16'h031a + +`define MST_TX_TRG (`MST_TX_TRIGGER(0)) +`define MST_RX_ADDR (`MST_RX0_ADDR) +`define MST_TX_ADDR (`MST_TX0_ADDR) +`define MST_RX_LEN_ADDR (`MST_RX0_LEN_ADDR) +`define MST_TX_LEN_ADDR (`MST_TX0_LEN_ADDR) + `define TEST_REG_RW /*--------------------------------------------------------------------------------------------------------- @@ -520,20 +545,20 @@ initial begin //设置SM1在写入0x4 len 触发enq //设置SM0在读出0x4 len 触发deq `DEF_detect_pkt_sm(txBuf); - spi_trans( (16'h0302), (`SPI_WRITE), (2), (`IF_IDX(0)) ); - spi_trans( (16'h0306), (`SPI_WRITE), (2), (`IF_IDX(0)) ); + spi_trans( (`MST_TX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); + spi_trans( (`MST_RX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); //无子报文 `DEF_detect_pkt(txBuf); - spi_trans( (16'h1000), (`SPI_WRITE), (`DEF_detect_pkt_len), (`IF_IDX(0)) ); //写入SM1 + spi_trans( (`MST_TX_ADDR), (`SPI_WRITE), (`DEF_detect_pkt_len), (`IF_IDX(0)) ); //写入SM1 //发布请求 - txBuf[0+3] = 8'h01; + txBuf[0+3] = `MST_TX_TRG; //8'h01; spi_trans( (16'h20), (`SPI_WRITE), (1), (`IF_IDX(0)) );//发送SM0 接收SM0, 请求发送 @(posedge isResp) #5 begin end $fdisplay(spidata_file, ">>回包："); - spi_trans( (16'h800), (`SPI_READ), (`DEF_detect_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出 + spi_trans( (`MST_RX_ADDR), (`SPI_READ), (`DEF_detect_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出 end @@ -568,19 +593,19 @@ initial begin `include "set_addr_pkt.vh" //长度 `DEF_set_addr_pkt_sm(txBuf); - spi_trans( (16'h0302), (`SPI_WRITE), (2), (`IF_IDX(0)) ); - spi_trans( (16'h0306), (`SPI_WRITE), (2), (`IF_IDX(0)) ); + spi_trans( (`MST_TX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); + spi_trans( (`MST_RX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); //子报文 `DEF_set_addr_pkt(txBuf); - spi_trans( (16'h1000), (`SPI_WRITE), (`DEF_set_addr_pkt_len), (`IF_IDX(0)) ); //写入SM1 + spi_trans( (`MST_TX_ADDR), (`SPI_WRITE), (`DEF_set_addr_pkt_len), (`IF_IDX(0)) ); //写入SM1 //发布请求 - txBuf[0+3] = 8'h01; + txBuf[0+3] = `MST_TX_TRG; spi_trans( (16'h20), (`SPI_WRITE), (1), (`IF_IDX(0)) );//发送SM0 接收SM0, 请求发送 @(posedge isResp) #5 begin end $fdisplay(spidata_file, ">>回包："); - spi_trans( (16'h800), (`SPI_READ), (`DEF_set_addr_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出 + spi_trans( (`MST_RX_ADDR), (`SPI_READ), (`DEF_set_addr_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出 end @@ -609,6 +634,7 @@ initial begin #1000 $fdisplay(spidata_file, "\n\n测试用例：发送嗅探包，需要在波形文件里检查"); begin + $fdisplay(spidata_file, "嗅探：使用SM0"); $fdisplay(spidata_file, "--->>>嗅探前，检查链路状态寄存器"); //spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(0)) ); spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(1)) ); @@ -621,22 +647,62 @@ initial begin //txBuf[0+3] = 8'h04; //txBuf[1+3] = 8'h00; `DEF_detect_pkt_sm(txBuf); - spi_trans( (16'h0302), (`SPI_WRITE), (2), (`IF_IDX(0)) ); - spi_trans( (16'h0306), (`SPI_WRITE), (2), (`IF_IDX(0)) ); + spi_trans( (`MST_TX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); + spi_trans( (`MST_RX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); //无子报文 //`include "detect_pkt.vh" `DEF_detect_pkt(txBuf); - spi_trans( (16'h1000), (`SPI_WRITE), (`DEF_detect_pkt_len), (`IF_IDX(0)) ); //写入SM1 + spi_trans( (`MST_TX_ADDR), (`SPI_WRITE), (`DEF_detect_pkt_len), (`IF_IDX(0)) ); //写入SM1 //发布请求 - txBuf[0+3] = 8'h01; + txBuf[0+3] = `MST_TX_TRG; spi_trans( (16'h20), (`SPI_WRITE), (1), (`IF_IDX(0)) );//发送SM0 接收SM0, 请求发送 @(posedge isResp) #5 begin end $fdisplay(spidata_file, ">>回包："); - spi_trans( (16'h800), (`SPI_READ), (`DEF_detect_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出 + spi_trans( (`MST_RX_ADDR), (`SPI_READ), (`DEF_detect_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出 + end + + $fdisplay(spidata_file, "--->>>嗅探后，检查链路状态寄存器"); + //spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(0)) ); + spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(1)) ); + spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(2)) ); + spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(3)) ); + spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(4)) ); + + +`ifndef ENABLE_CODE + begin + $fdisplay(spidata_file, "嗅探：使用SM1"); + $fdisplay(spidata_file, "--->>>嗅探前，检查链路状态寄存器"); + //spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(0)) ); + spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(1)) ); + spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(2)) ); + spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(3)) ); + spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(4)) ); + + $fdisplay(spidata_file, "--->>>嗅探"); + //设置SM1在写入0x3地址触发enq + //txBuf[0+3] = 8'h04; + //txBuf[1+3] = 8'h00; + `DEF_detect_pkt_sm(txBuf); + spi_trans( (`MST_TX1_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); + spi_trans( (`MST_RX1_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); + + //无子报文MST_TX1_LEN_ADDR + //`include "detect_pkt.vh" + `DEF_detect_pkt(txBuf); + spi_trans( (`MST_TX1_ADDR), (`SPI_WRITE), (`DEF_detect_pkt_len), (`IF_IDX(0)) ); //写入SM1 + + //发布请求 + + txBuf[0+3] = `MST_TX_TRIGGER(1); + spi_trans( (16'h20), (`SPI_WRITE), (1), (`IF_IDX(0)) );//发送SM1 接收SM1, 请求发送 + @(posedge isResp) #5 begin end + $fdisplay(spidata_file, ">>回包："); + spi_trans( (`MST_RX1_ADDR), (`SPI_READ), (`DEF_detect_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出 end @@ -647,8 +713,7 @@ initial begin spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(2)) ); spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(3)) ); spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(4)) ); - - +`endif /*--------------------------------------------------------------------------------------------------------- 测试用例 @@ -667,20 +732,18 @@ initial begin `include "seq_0_pkt.vh" //设置SM1在写入516 len触发enq - //txBuf[0+3] = 8'h04; - //txBuf[1+3] = 8'h02; `DEF_seq_0_pkt_sm(txBuf); - spi_trans( (16'h0302), (`SPI_WRITE), (2), (`IF_IDX(0)) ); - spi_trans( (16'h0306), (`SPI_WRITE), (2), (`IF_IDX(0)) ); + spi_trans( (`MST_TX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); + spi_trans( (`MST_RX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); `DEF_seq_0_pkt(txBuf); - spi_trans( (16'h1000), (`SPI_WRITE), (`DEF_seq_0_pkt_len), (`IF_IDX(0)) ); //写入SM1 + spi_trans( (`MST_TX_ADDR), (`SPI_WRITE), (`DEF_seq_0_pkt_len), (`IF_IDX(0)) ); //写入SM1 //发布请求 - txBuf[0+3] = 8'h01; + txBuf[0+3] = `MST_TX_TRG; spi_trans( (16'h20), (`SPI_WRITE), (1), (`IF_IDX(0)) );//发送SM0 接收SM0, 请求发送 @(posedge isResp) #5 begin end $fdisplay(spidata_file, ">>回包："); - spi_trans( (16'h800), (`SPI_READ), (`DEF_seq_0_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出 + spi_trans( (`MST_RX_ADDR), (`SPI_READ), (`DEF_seq_0_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出 end #1000 @@ -689,21 +752,19 @@ initial begin $fdisplay(spidata_file, "\n--->>>交换数据写dev2_sm0/dev1_sm2/dev3_sm4/dev4_sm6"); `include "seq_1_pkt.vh" - //txBuf[0+3] = 8'h54; - //txBuf[1+3] = 8'h01; `DEF_seq_1_pkt_sm(txBuf); - spi_trans( (16'h0302), (`SPI_WRITE), (2), (`IF_IDX(0)) ); - spi_trans( (16'h0306), (`SPI_WRITE), (2), (`IF_IDX(0)) ); + spi_trans( (`MST_TX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); + spi_trans( (`MST_RX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); `DEF_seq_1_pkt(txBuf); - spi_trans( (16'h1000), (`SPI_WRITE), (`DEF_seq_1_pkt_len), (`IF_IDX(0)) ); //写入SM1 + spi_trans( (`MST_TX_ADDR), (`SPI_WRITE), (`DEF_seq_1_pkt_len), (`IF_IDX(0)) ); //写入SM1 //发布请求 - txBuf[0+3] = 8'h01; + txBuf[0+3] = `MST_TX_TRG; spi_trans( (16'h20), (`SPI_WRITE), (1), (`IF_IDX(0)) );//发送SM0 接收SM0, 请求发送 @(posedge isResp) #5 begin end $fdisplay(spidata_file, ">>回包："); - spi_trans( (16'h800), (`SPI_READ), (`DEF_seq_1_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出 + spi_trans( (`MST_RX_ADDR), (`SPI_READ), (`DEF_seq_1_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出 end //spi_trans( (16'h1800), (`SPI_READ), (64), (`IF_IDX(1)) ); @@ -726,14 +787,12 @@ initial begin begin //设置SM1在写入 0x18 len触发enq `include "sync_pkt.vh" - //txBuf[0+3] = 8'h18; - //txBuf[1+3] = 8'h00; `DEF_sync_pkt_sm(txBuf); - spi_trans( (16'h0302), (`SPI_WRITE), (2), (`IF_IDX(0)) ); - spi_trans( (16'h0306), (`SPI_WRITE), (2), (`IF_IDX(0)) ); + spi_trans( (`MST_TX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); + spi_trans( (`MST_RX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); `DEF_sync_pkt(txBuf); - spi_trans( (16'h1000), (`SPI_WRITE), (`DEF_sync_pkt_len), (`IF_IDX(0)) ); //写入SM1 + spi_trans( (`MST_TX_ADDR), (`SPI_WRITE), (`DEF_sync_pkt_len), (`IF_IDX(0)) ); //写入SM1 //写入替换时间戳替换地址 txBuf[0+3] = 8'h0c; @@ -741,11 +800,11 @@ initial begin spi_trans( (16'h24), (`SPI_WRITE), (2), (`IF_IDX(0)) ); //写入替换时间戳替换地址寄存器 //发布请求 - txBuf[0+3] = 8'h01; + txBuf[0+3] = `MST_TX_TRG; spi_trans( (16'h20), (`SPI_WRITE), (1), (`IF_IDX(0)) );//发送SM0 接收SM0, 请求发送 @(posedge isResp) #5 begin $fdisplay(spidata_file, ">>回包："); - spi_trans( (16'h800), (`SPI_READ), (`DEF_sync_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出 + spi_trans( (`MST_RX_ADDR), (`SPI_READ), (`DEF_sync_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出 end //清除替换时间戳替换地址 @@ -755,22 +814,20 @@ initial begin spi_trans( (16'h25), (`SPI_WRITE), (2), (`IF_IDX(0)) ); //清除替换时间戳替换地址寄存器 `include "sync_sig_pkt.vh" - //txBuf[0+3] = 8'h94; - //txBuf[1+3] = 8'h00; `DEF_sync_sig_pkt_sm(txBuf); - spi_trans( (16'h0302), (`SPI_WRITE), (2), (`IF_IDX(0)) ); - spi_trans( (16'h0306), (`SPI_WRITE), (2), (`IF_IDX(0)) ); + spi_trans( (`MST_TX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); + spi_trans( (`MST_RX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); `DEF_sync_sig_pkt(txBuf); //spi_trans( (16'h1000), (`SPI_WRITE), (8'h94), (`IF_IDX(0)) ); //写入SM1 - spi_trans( (16'h1000), (`SPI_WRITE), (`DEF_sync_sig_pkt_len), (`IF_IDX(0)) ); //写入SM1 + spi_trans( (`MST_TX_ADDR), (`SPI_WRITE), (`DEF_sync_sig_pkt_len), (`IF_IDX(0)) ); //写入SM1 //发布请求 - txBuf[0+3] = 8'h01; + txBuf[0+3] = `MST_TX_TRG; spi_trans( (16'h20), (`SPI_WRITE), (1), (`IF_IDX(0)) );//发送SM0 接收SM0, 请求发送 @(posedge isResp) #5 begin end $fdisplay(spidata_file, ">>回包："); - spi_trans( (16'h800), (`SPI_READ), (`DEF_sync_sig_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出 + spi_trans( (`MST_RX_ADDR), (`SPI_READ), (`DEF_sync_sig_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出 end From 892faf6aed7f3ea5dceef6fce5e6e3e63f61684f Mon Sep 17 00:00:00 2001 From: bacon Date: Thu, 22 May 2025 16:09:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E7=9A=84=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tb/shinTest/ShinTopSpiTb.v | 2 +- tb/shinTest/gen_pkt.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tb/shinTest/ShinTopSpiTb.v b/tb/shinTest/ShinTopSpiTb.v index d90f14c..ac38f0d 100644 --- a/tb/shinTest/ShinTopSpiTb.v +++ b/tb/shinTest/ShinTopSpiTb.v @@ -673,7 +673,7 @@ initial begin spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(4)) ); -`ifndef ENABLE_CODE +`ifdef ENABLE_CODE begin $fdisplay(spidata_file, "嗅探：使用SM1"); $fdisplay(spidata_file, "--->>>嗅探前，检查链路状态寄存器"); diff --git a/tb/shinTest/gen_pkt.py b/tb/shinTest/gen_pkt.py index f761cf6..4b559af 100755 --- a/tb/shinTest/gen_pkt.py +++ b/tb/shinTest/gen_pkt.py @@ -205,7 +205,7 @@ if __name__ == '__main__': genPkt.clean() genPkt.setPktType(0) #subPkt参数：索引、索引类型、地址、命令、长度、数据 - genPkt.addSubPkt(0x0, 0, random.randint(0, 65535), 0xe, 12, b'\0'*12) + genPkt.addSubPkt(0x0, 0, random.randint(0, 65535), 0xc, 12, b'\0'*12) genPkt.gen("./generated/shin/sync_pkt.vh", 1) #------------------------------------------------------------------------- @@ -247,7 +247,7 @@ if __name__ == '__main__': data[0] = 0x3f data[1] = 0xff #subPkt参数：索引、索引类型、地址、命令、长度、数据 - genPkt.addSubPkt(0x0, 0, random.randint(0, 65535), 0xd, 2, data) + genPkt.addSubPkt(0x0, 0, random.randint(0, 65535), 0xb, 2, data) genPkt.gen("./generated/shin/set_addr_pkt.vh", 1) \ No newline at end of file From c62010e1825d01bbe435a10bb1c42774814e6267 Mon Sep 17 00:00:00 2001 From: bacon Date: Thu, 22 May 2025 16:12:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=BB=E7=AB=99SM1?= =?UTF-8?q?=E5=8F=91=E9=80=81=E7=9A=84=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tb/shinTest/ShinTopSpiTb.v | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tb/shinTest/ShinTopSpiTb.v b/tb/shinTest/ShinTopSpiTb.v index ac38f0d..d90f14c 100644 --- a/tb/shinTest/ShinTopSpiTb.v +++ b/tb/shinTest/ShinTopSpiTb.v @@ -673,7 +673,7 @@ initial begin spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(4)) ); -`ifdef ENABLE_CODE +`ifndef ENABLE_CODE begin $fdisplay(spidata_file, "嗅探：使用SM1"); $fdisplay(spidata_file, "--->>>嗅探前，检查链路状态寄存器");