From bed40c2976736748d81c2d27d06baf8199ccbd5e Mon Sep 17 00:00:00 2001 From: bacon Date: Fri, 23 May 2025 12:56:24 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=94=B9=E5=8F=98=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E7=9A=84=E6=A8=A1=E5=BC=8F,=E8=AE=B2?= =?UTF-8?q?=E5=8C=85=E4=B8=AD=E7=9A=84=E5=AD=90=E5=8C=85=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=88=86=E5=BC=80,=E4=BE=BF=E4=BA=8E?= =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tb/shinTest/ShinTopSpiTb.v | 98 ++++++++++++++++++++++++++++++-------- 1 file changed, 78 insertions(+), 20 deletions(-) diff --git a/tb/shinTest/ShinTopSpiTb.v b/tb/shinTest/ShinTopSpiTb.v index 8de3a0e..60cb3c9 100644 --- a/tb/shinTest/ShinTopSpiTb.v +++ b/tb/shinTest/ShinTopSpiTb.v @@ -25,6 +25,8 @@ module ShinTopSpiTb( integer spidata_file; integer c_line; + integer _pos; + integer _len; wire [4:0] isSoftReset; @@ -395,23 +397,73 @@ task spi_trans( input [15:0] saddress, input [7:0] scmd, input [12:0] slength,in $time/1000, ((sidx >= 5)? ((sidx >= 10)? (sidx - 10):(sidx - 5)):sidx), txBuf[1], txBuf[0], ((txBuf[2] == 0)? "Write":" Read"), slength); - for (integer i=0; i>>嗅探"); //设置SM1在写入0x3地址触发enq - //txBuf[0+3] = 8'h04; - //txBuf[1+3] = 8'h00; + `DEF_detect_pkt_sm(txBuf); 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" + $fdisplay(spidata_file, "<<发包："); `DEF_detect_pkt(txBuf); spi_trans( (`MST_TX_ADDR), (`SPI_WRITE), (`DEF_detect_pkt_len), (`IF_IDX(0)) ); //写入SM1 @@ -685,14 +738,12 @@ initial begin $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" + $fdisplay(spidata_file, "<<发包："); `DEF_detect_pkt(txBuf); spi_trans( (`MST_TX1_ADDR), (`SPI_WRITE), (`DEF_detect_pkt_len), (`IF_IDX(0)) ); //写入SM1 @@ -736,6 +787,7 @@ initial begin spi_trans( (`MST_TX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); spi_trans( (`MST_RX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); + $fdisplay(spidata_file, "<<发包："); `DEF_seq_0_pkt(txBuf); spi_trans( (`MST_TX_ADDR), (`SPI_WRITE), (`DEF_seq_0_pkt_len), (`IF_IDX(0)) ); //写入SM1 //发布请求 @@ -756,6 +808,7 @@ initial begin spi_trans( (`MST_TX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); spi_trans( (`MST_RX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); + $fdisplay(spidata_file, "<<发包："); `DEF_seq_1_pkt(txBuf); spi_trans( (`MST_TX_ADDR), (`SPI_WRITE), (`DEF_seq_1_pkt_len), (`IF_IDX(0)) ); //写入SM1 //发布请求 @@ -817,6 +870,7 @@ initial begin `include "seq_2_pkt.vh" + $fdisplay(spidata_file, "<<发包："); `DEF_seq_2_pkt_sm(txBuf); spi_trans( (`MST_TX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); spi_trans( (`MST_RX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); @@ -842,6 +896,7 @@ initial begin spi_trans( (`MST_TX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); spi_trans( (`MST_RX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); + $fdisplay(spidata_file, "<<发包："); `DEF_bc_r_pkt(txBuf); spi_trans( (`MST_TX_ADDR), (`SPI_WRITE), (`DEF_bc_r_pkt_len), (`IF_IDX(0)) ); //写入SM1 //发布请求 @@ -864,6 +919,7 @@ initial begin spi_trans( (`MST_TX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); spi_trans( (`MST_RX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); + $fdisplay(spidata_file, "<<发包："); `DEF_bc_w_pkt(txBuf); spi_trans( (`MST_TX_ADDR), (`SPI_WRITE), (`DEF_bc_w_pkt_len), (`IF_IDX(0)) ); //写入SM1 //发布请求 @@ -897,6 +953,7 @@ initial begin spi_trans( (`MST_TX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); spi_trans( (`MST_RX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); + $fdisplay(spidata_file, "<<发包："); `DEF_sync_pkt(txBuf); spi_trans( (`MST_TX_ADDR), (`SPI_WRITE), (`DEF_sync_pkt_len), (`IF_IDX(0)) ); //写入SM1 @@ -924,6 +981,7 @@ initial begin spi_trans( (`MST_TX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); spi_trans( (`MST_RX_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) ); + $fdisplay(spidata_file, "<<发包："); `DEF_sync_sig_pkt(txBuf); //spi_trans( (16'h1000), (`SPI_WRITE), (8'h94), (`IF_IDX(0)) ); //写入SM1 spi_trans( (`MST_TX_ADDR), (`SPI_WRITE), (`DEF_sync_sig_pkt_len), (`IF_IDX(0)) ); //写入SM1 From 1e4a333c06e33b30141ed48259d8662903a927d3 Mon Sep 17 00:00:00 2001 From: bacon Date: Fri, 23 May 2025 13:14:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=9E=E5=8C=85?= =?UTF-8?q?=E6=A3=80=E9=AA=8C=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tb/shinTest/ShinTopSpiTb.v | 2 -- 1 file changed, 2 deletions(-) diff --git a/tb/shinTest/ShinTopSpiTb.v b/tb/shinTest/ShinTopSpiTb.v index 60cb3c9..6bf0812 100644 --- a/tb/shinTest/ShinTopSpiTb.v +++ b/tb/shinTest/ShinTopSpiTb.v @@ -930,12 +930,10 @@ initial begin $fdisplay(spidata_file, ">>回包："); spi_trans( (`MST_RX_ADDR), (`SPI_READ), (`DEF_bc_w_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出 end - /* spi_trans( (16'h0800), (`SPI_READ), (32), (`IF_IDX(1)) ); spi_trans( (16'h0800), (`SPI_READ), (32), (`IF_IDX(2)) ); spi_trans( (16'h0800), (`SPI_READ), (32), (`IF_IDX(3)) ); spi_trans( (16'h0800), (`SPI_READ), (32), (`IF_IDX(4)) ); - */ /*--------------------------------------------------------------------------------------------------------- 测试用例 From 3228151151799ad5f3b90583e5648857de5410d5 Mon Sep 17 00:00:00 2001 From: bacon Date: Fri, 23 May 2025 14:36:23 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=94=A8=E5=AE=8F=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9A=84=E6=B5=8B=E8=AF=95=E7=94=A8?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tb/shinTest/ShinTopSpiTb.v | 44 +++++++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/tb/shinTest/ShinTopSpiTb.v b/tb/shinTest/ShinTopSpiTb.v index 6bf0812..f1e3e3c 100644 --- a/tb/shinTest/ShinTopSpiTb.v +++ b/tb/shinTest/ShinTopSpiTb.v @@ -503,8 +503,16 @@ endtask `define MST_RX_LEN_ADDR (`MST_RX0_LEN_ADDR) `define MST_TX_LEN_ADDR (`MST_TX0_LEN_ADDR) -`define TEST_REG_RW - +`define ENABLE_REG_RW_TEST +`define ENABLE_DET_TEST +`define ENABLE_SET_ADDR_TEST +//`define ENABLE_SM1_SEND_TEST +`define ENABLE_EXCHG_DATA_SEQ_TEST + //`define ENABLE_EXCHG_DATA_SEQ0_TEST + //`define ENABLE_EXCHG_DATA_SEQ1_TEST + `define ENABLE_EXCHG_DATA_SEQ2_TEST + //`define ENABLE_EXCHG_DATA_BC_TEST +//`define ENABLE_SYNC_TEST /*--------------------------------------------------------------------------------------------------------- 测试用例1 ---------------------------------------------------------------------------------------------------------*/ @@ -512,7 +520,7 @@ initial begin #1000 -`ifdef TEST_REG_RW +`ifdef ENABLE_REG_RW_TEST /*--------------------------------------------------------------------------------------------------------- 测试用例 1. 从IP中读取寄存器，上电后的寄存器期望值为0 @@ -576,6 +584,7 @@ initial begin spi_trans( (16'h00), (`SPI_READ), (1), (`IF_IDX(3)) ); spi_trans( (16'h00), (`SPI_READ), (1), (`IF_IDX(4)) ); +`ifdef ENABLE_DET_TEST /*--------------------------------------------------------------------------------------------------------- 测试用例3 ---------------------------------------------------------------------------------------------------------*/ @@ -614,7 +623,7 @@ initial begin spi_trans( (`MST_RX_ADDR), (`SPI_READ), (`DEF_detect_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出 end - +`endif // 顺序索引 //#50000 @@ -627,6 +636,7 @@ initial begin spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(3)) ); spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(4)) ); +`ifdef ENABLE_SET_ADDR_TEST /*--------------------------------------------------------------------------------------------------------- 测试用例 ---------------------------------------------------------------------------------------------------------*/ @@ -679,8 +689,9 @@ initial begin spi_trans( (16'h0000), (`SPI_READ), (16), (`IF_IDX(2)) ); spi_trans( (16'h0000), (`SPI_READ), (16), (`IF_IDX(3)) ); spi_trans( (16'h0000), (`SPI_READ), (16), (`IF_IDX(4)) ); +`endif - +`ifdef ENABLE_DET_TEST /*--------------------------------------------------------------------------------------------------------- 测试用例 ---------------------------------------------------------------------------------------------------------*/ @@ -724,9 +735,10 @@ 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 -`ifdef ENABLE_CODE +`ifdef ENABLE_SM1_SEND_TEST begin $fdisplay(spidata_file, "嗅探：使用SM1"); $fdisplay(spidata_file, "--->>>嗅探前，检查链路状态寄存器"); @@ -766,6 +778,8 @@ initial begin spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(4)) ); `endif + +`ifdef ENABLE_EXCHG_DATA_SEQ_TEST /*--------------------------------------------------------------------------------------------------------- 测试用例 1. 交换数据sm0~sm7 @@ -775,9 +789,11 @@ initial begin 4. 寄存器单读/写/读写，寄存器广播读/写/读写 5. 以上交换数据的错误形式 ---------------------------------------------------------------------------------------------------------*/ - #1000 $fdisplay(spidata_file, "\n\n测试用例：交换数据"); + `ifdef ENABLE_EXCHG_DATA_SEQ0_TEST + #1000 $display("read&write @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp); + begin $fdisplay(spidata_file, "--->>>交换数据sm0~sm7"); @@ -797,7 +813,9 @@ initial begin $fdisplay(spidata_file, ">>回包："); spi_trans( (`MST_RX_ADDR), (`SPI_READ), (`DEF_seq_0_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出 end + `endif + `ifdef ENABLE_EXCHG_DATA_SEQ1_TEST #1000 $display("read&write @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp); begin @@ -824,8 +842,9 @@ initial begin spi_trans( (16'h0800), (`SPI_READ), (64), (`IF_IDX(2)) ); spi_trans( (16'h2800), (`SPI_READ), (64), (`IF_IDX(3)) ); spi_trans( (16'h3800), (`SPI_READ), (64), (`IF_IDX(4)) ); + `endif - + `ifdef ENABLE_EXCHG_DATA_SEQ2_TEST #1000 $display("read&write @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp); begin @@ -885,8 +904,12 @@ initial begin $fdisplay(spidata_file, ">>回包："); spi_trans( (`MST_RX_ADDR), (`SPI_READ), (`DEF_seq_2_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出 end +`endif +`endif +`ifdef ENABLE_EXCHG_DATA_BC_TEST #1000 + $fdisplay(spidata_file, "\n\n测试用例：广播交换数据"); $display("read&write @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp); begin $fdisplay(spidata_file, "\n--->>>广播读"); @@ -934,7 +957,10 @@ initial begin spi_trans( (16'h0800), (`SPI_READ), (32), (`IF_IDX(2)) ); spi_trans( (16'h0800), (`SPI_READ), (32), (`IF_IDX(3)) ); spi_trans( (16'h0800), (`SPI_READ), (32), (`IF_IDX(4)) ); +`endif + +`ifdef ENABLE_SYNC_TEST /*--------------------------------------------------------------------------------------------------------- 测试用例 1. 测试 同步(sync) 和 同步输出 (sync_out) @@ -1023,6 +1049,8 @@ initial begin txBuf[0+3] = 8'h01; spi_trans( (16'h40), (`SPI_WRITE), (1), (`IF_IDX(0)) );//复位主站 spi_trans( (16'h40), (`SPI_WRITE), (1), (`IF_IDX(1)) );//复位从站2 +`endif + end From a2849b394d5293ae96910817ba10851860f4c994 Mon Sep 17 00:00:00 2001 From: bacon Date: Fri, 23 May 2025 14:37:51 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=94=A8=E5=AE=8F=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E8=BF=90=E8=A1=8C=E7=9A=84=E6=B5=8B?= =?UTF-8?q?=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 f1e3e3c..afd9b59 100644 --- a/tb/shinTest/ShinTopSpiTb.v +++ b/tb/shinTest/ShinTopSpiTb.v @@ -503,7 +503,7 @@ endtask `define MST_RX_LEN_ADDR (`MST_RX0_LEN_ADDR) `define MST_TX_LEN_ADDR (`MST_TX0_LEN_ADDR) -`define ENABLE_REG_RW_TEST +//`define ENABLE_REG_RW_TEST `define ENABLE_DET_TEST `define ENABLE_SET_ADDR_TEST //`define ENABLE_SM1_SEND_TEST From bcc6528813b5d83f43fccbe5fccf71ef6c354008 Mon Sep 17 00:00:00 2001 From: Ruige Lee Date: Fri, 23 May 2025 15:20:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dlvds=E6=96=B9=E5=90=91?= =?UTF-8?q?=E7=9A=84=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/scala/backBoard/shin/Interface.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/backBoard/shin/Interface.scala b/src/main/scala/backBoard/shin/Interface.scala index b7bacb5..5964751 100644 --- a/src/main/scala/backBoard/shin/Interface.scala +++ b/src/main/scala/backBoard/shin/Interface.scala @@ -604,7 +604,7 @@ trait InterfaceCheckSM{ this: InterfaceBase => trait InterfaceLVDSop{ this: InterfaceBase => - io.lvds.datar := AcquireReg(addr = io.lvds.addrr) + io.lvds.datar := RegEnable(AcquireReg(addr = io.lvds.addrr), io.lvds.isEnR) when( io.lvds.isEnW & isSlvMode ){