增加代码,测试SM的收发与数据交换

tb/shinTest/ShinTopSpiTb.v

@@ -424,7 +424,7 @@ endtask
 `define IF_OSPI(idx)        ((5) + (idx))
 `define SPI_WRITE           8'h0
 `define SPI_READ            8'h1
-
+`define TEST_REG_RW
 
 /*---------------------------------------------------------------------------------------------------------
 测试用例1
@@ -432,12 +432,19 @@ endtask
 initial begin
 
   #1000
-  $fdisplay(spidata_file, "测试用例1-从IP中读取寄存器，上电后的寄存器期望值为0");
+
+`ifdef TEST_REG_RW
+/*---------------------------------------------------------------------------------------------------------
+测试用例
+1. 从IP中读取寄存器，上电后的寄存器期望值为0
+---------------------------------------------------------------------------------------------------------*/
+  $fdisplay(spidata_file, "测试用例：从IP中读取寄存器，上电后的寄存器期望值为0");
   spi_trans( (16'h00), (`SPI_READ), (64), (`IF_IQSPI(0)) );
   spi_trans( (16'h00), (`SPI_READ), (64), (`IF_IQSPI(1)) );
   spi_trans( (16'h00), (`SPI_READ), (64), (`IF_IQSPI(2)) );
   spi_trans( (16'h00), (`SPI_READ), (64), (`IF_IQSPI(3)) );
   spi_trans( (16'h00), (`SPI_READ), (64), (`IF_IQSPI(4)) );
+`endif
 
 
   if ((`INTERFACE_IDX) == 5) begin
@@ -462,10 +469,11 @@ initial begin
 
 
 /*---------------------------------------------------------------------------------------------------------
-测试用例2
+测试用例
+1. 设置IP为主站或从站，并读取设置结果，期望：0主，1~4从
 ---------------------------------------------------------------------------------------------------------*/
   //设置主站从站
-  $fdisplay(spidata_file, "\n\n测试用例2-设置IP为主站或从站，并读取设置结果，期望：0主，1~4从");
+  $fdisplay(spidata_file, "\n\n测试用例：设置IP为主站或从站，并读取设置结果，期望：0主，1~4从");
   txBuf[0+3] = 8'h01;
   spi_trans( (16'h00), (`SPI_WRITE), (1), (`IF_IDX(0)) );
 
@@ -490,14 +498,12 @@ initial begin
   spi_trans( (16'h00), (`SPI_READ), (1), (`IF_IDX(4)) );
 
 /*---------------------------------------------------------------------------------------------------------
-
 测试用例3
-
 ---------------------------------------------------------------------------------------------------------*/
 
   //嗅探
   #10000
-  $fdisplay(spidata_file, "\n\n测试用例3-发送嗅探包，需要在波形文件里检查");
+  $fdisplay(spidata_file, "\n\n测试用例：发送嗅探包，需要在波形文件里检查");
   begin
     $fdisplay(spidata_file, "--->>>嗅探前，检查链路状态寄存器");
     //spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(0)) );
@@ -541,9 +547,9 @@ initial begin
   spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(4)) );
 
 /*---------------------------------------------------------------------------------------------------------
-测试用例4
+测试用例
 ---------------------------------------------------------------------------------------------------------*/
-  $fdisplay(spidata_file, "\n\n测试用例4-设置顺序索引");
+  $fdisplay(spidata_file, "\n\n测试用例：设置顺序索引");
   $display("index @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp);
 
   begin
@@ -603,8 +609,7 @@ initial begin
 
 
   //读写
-  #50000
+  #1000
-  #50000
   $fdisplay(spidata_file, "--->>>设置顺序地址后，检查顺序地址");
   //spi_trans( (16'h0010), (`SPI_READ), (5), (`IF_IDX(0)) );
   spi_trans( (16'h0000), (`SPI_READ), (16), (`IF_IDX(1)) );
@@ -614,11 +619,11 @@ initial begin
 
 
 /*---------------------------------------------------------------------------------------------------------
-测试用例5
+测试用例
 ---------------------------------------------------------------------------------------------------------*/
   //嗅探
-  #10000
+  #1000
-  $fdisplay(spidata_file, "\n\n测试用例5-发送嗅探包，需要在波形文件里检查");
+  $fdisplay(spidata_file, "\n\n测试用例：发送嗅探包，需要在波形文件里检查");
   begin
     $fdisplay(spidata_file, "--->>>嗅探前，检查链路状态寄存器");
     //spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(0)) );
@@ -651,8 +656,6 @@ initial begin
 
 
   // 顺序索引
-  #50000
-  #50000
   $fdisplay(spidata_file, "--->>>嗅探后，检查链路状态寄存器");
   //spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(0)) );
   spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(1)) );
@@ -663,21 +666,26 @@ initial begin
 
 
 /*---------------------------------------------------------------------------------------------------------
-测试用例6
+测试用例
+1. 交换数据sm0~sm7
+2. 交换数据sm0~sm7
+3. 交换数据sm0~sm7(中断、状态)
+4. 交换数据sm0~sm7(R/W/RW, BR/BW/BRW)
+4. 寄存器单读/写/读写，寄存器广播读/写/读写
+5. 以上交换数据的错误形式
 ---------------------------------------------------------------------------------------------------------*/
-  #50000
+  #1000
-  #50000
+  $fdisplay(spidata_file, "\n\n测试用例：交换数据");
-  $fdisplay(spidata_file, "\n\n测试用例6-交换数据");
   $display("read&write @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp);
   begin
-
+    $fdisplay(spidata_file, "--->>>交换数据sm0~sm7");
     //设置SM1在写入516 len触发enq
     txBuf[0+3] = 8'h04;
     txBuf[1+3] = 8'h02;
     spi_trans( (16'h0302), (`SPI_WRITE), (2), (`IF_IDX(0)) );
     spi_trans( (16'h0306), (`SPI_WRITE), (2), (`IF_IDX(0)) );
 
-    `include "seq_pkt.vh"
+    `include "seq_0_pkt.vh"
     spi_trans( (16'h1000), (`SPI_WRITE), (516), (`IF_IDX(0)) ); //写入SM1
     //发布请求
     txBuf[0+3] = 8'h01;
@@ -687,30 +695,38 @@ initial begin
 
     spi_trans( (16'ha03), (`SPI_READ), (1), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
 
+  #1000
+  $display("read&write @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp);
+  begin
+    $fdisplay(spidata_file, "\n--->>>交换数据写dev2_sm0/dev1_sm2/dev3_sm4/dev4_sm6");
+    txBuf[0+3] = 8'h54;
+    txBuf[1+3] = 8'h01;
+    spi_trans( (16'h0302), (`SPI_WRITE), (2), (`IF_IDX(0)) );
+    spi_trans( (16'h0306), (`SPI_WRITE), (2), (`IF_IDX(0)) );
+
+    `include "seq_1_pkt.vh"
+    spi_trans( (16'h1000), (`SPI_WRITE), (516), (`IF_IDX(0)) ); //写入SM1
+    //发布请求
+    txBuf[0+3] = 8'h01;
+    spi_trans( (16'h20), (`SPI_WRITE), (1), (`IF_IDX(0)) );//发送SM0 接收SM0, 请求发送
+    @(posedge isResp) #5 begin end
+  end
+
+    spi_trans( (16'h1800), (`SPI_READ), (64), (`IF_IDX(1)) );
+    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)) );
+
 
 /*---------------------------------------------------------------------------------------------------------
-测试用例7
+测试用例
-测试 同步(sync) 和 同步输出 (sync_out)
+1. 测试 同步(sync) 和 同步输出 (sync_out)
 ---------------------------------------------------------------------------------------------------------*/
-
   // 同步
-  #90000
+  #1000
-  #90000
-  #90000
-  #90000
-  #90000
-  #90000
-  #90000
-  #90000
-  #90000  
-  #90000
-  #90000
-  #90000
-  #90000
-  #90000
 
   $display("sync @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp);
-  $fdisplay(spidata_file, "\n\n测试用例-测试同步(sync)和同步输出(sync_out)");
+  $fdisplay(spidata_file, "\n\n测试用例：测试同步(sync)和同步输出(sync_out)");
   begin
     //设置SM1在写入 0x18 len触发enq
     txBuf[0+3] = 8'h18;
@@ -757,8 +773,8 @@ initial begin
 
     spi_trans( (16'h833), (`SPI_READ), (1), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
   end
-  
+    #50
-  //清脉冲
+    //清脉冲
     txBuf[0+3] = 0;  //负载0x122 sync0脉冲宽度
     txBuf[1+3] = 0;  //负载0x123
     txBuf[2+3] = 0;  //负载0x124 sync1脉冲宽度
@@ -767,7 +783,13 @@ initial begin
     txBuf[5+3] = 0;  //负载0x127 
     txBuf[6+3] = 0;  //负载0x128 sync3脉冲宽度
     txBuf[7+3] = 0;  //负载0x129
-    spi_trans( (16'h0122), (`SPI_WRITE), (8), (`IF_IDX(2)) ); //slv2
+    spi_trans( (16'h0122), (`SPI_READ), (8), (`IF_IDX(2)) ); //slv2
+
+    spi_trans( (16'h0100), (`SPI_READ), (32), (`IF_IDX(0)) );
+    spi_trans( (16'h0100), (`SPI_READ), (32), (`IF_IDX(1)) );
+    spi_trans( (16'h0100), (`SPI_READ), (32), (`IF_IDX(2)) );
+    spi_trans( (16'h0100), (`SPI_READ), (32), (`IF_IDX(3)) );
+    spi_trans( (16'h0100), (`SPI_READ), (32), (`IF_IDX(4)) );
 end
 
 

tb/shinTest/gen_pkt.py

@@ -108,10 +108,14 @@ class GenPkt(object):
 
 if __name__ == '__main__':
     genPkt = GenPkt()
-    
+
+    #-------------------------------------------------------------------------
+    #>>>>>>嗅探数据包
     genPkt.setPktType(1)
     genPkt.gen("./generated/shin/detect_pkt.vh")
-    
+
+    #-------------------------------------------------------------------------
+    #>>>>>>普通数据包   
     genPkt.clean()
     genPkt.setPktType(0)
     
@@ -120,21 +124,50 @@ if __name__ == '__main__':
     genPkt.addSubPkt(0x01, 0, 0x0840, 0x1, 56, None)
     genPkt.addSubPkt(0x03, 0, 0x1040, 0x0, 56, None)
     for i in range(5):
-        genPkt.addSubPkt(random.randint(100, 4000), 0, random.randint(0, 65536), 0x0, 56, None)
+        genPkt.addSubPkt(random.randint(100, 4000), 0, 
+                         random.randint(0, 65536), 0x0, 
+                         56, None)
     #genPkt.addSubPkt(10, 2, 0x300, 0x2, 4, None)
     #genPkt.addSubPkt(11, 1, 0x300, 0x2, 4, None)
-    genPkt.gen("./generated/shin/seq_pkt.vh")
+    genPkt.gen("./generated/shin/seq_0_pkt.vh")
 
+    #-------------------------------------------------------------------------
+    #>>>>>>普通数据包0,用来操作sync
     genPkt.clean()
     genPkt.setPktType(0)
 
+    data = bytearray(b"\0"*100)
+    data[0] = 0 #0x0300
+    data[1] = 0 #0x0301
+    data[2] = 64 #0x302 长度1
+    data[3] = 0   #0x303 长度2
+
+
+    #subPkt参数：索引、索引类型、地址、命令、长度、数据
+    genPkt.addSubPkt(0x02, 0, 0x0300, 0x1, 4, data) #sm0
+    genPkt.addSubPkt(0x01, 0, 0x0308, 0x1, 4, data) #sm2
+    genPkt.addSubPkt(0x03, 0, 0x0310, 0x1, 4, data) #sm4
+    genPkt.addSubPkt(0x04, 0, 0x0318, 0x1, 4, data) #sm6
+
+    for i in range(64):
+        data[i] = i
+    genPkt.addSubPkt(0x02, 0, 0x0800, 0x1, 64, data)
+    genPkt.addSubPkt(0x01, 0, 0x1800, 0x1, 64, data)
+    genPkt.addSubPkt(0x03, 0, 0x2800, 0x1, 64, data)
+    genPkt.addSubPkt(0x04, 0, 0x3800, 0x1, 64, data)
+
+    genPkt.gen("./generated/shin/seq_1_pkt.vh")
+
+    #-------------------------------------------------------------------------
+    #>>>>>>同步数据包
+    genPkt.clean()
+    genPkt.setPktType(0)
     #subPkt参数：索引、索引类型、地址、命令、长度、数据
     genPkt.addSubPkt(0x0, 0, random.randint(0, 65536), 0xe, 12, b'\0'*12)
-
-
     genPkt.gen("./generated/shin/sync_pkt.vh")
 
-
+    #-------------------------------------------------------------------------
+    #>>>>>>设置同步信号的数据包
     genPkt.clean()
     genPkt.setPktType(0)
 
@@ -144,6 +177,7 @@ if __name__ == '__main__':
     
     data[16] = 0x90 #地址0x130, sync同步点
     data[17] = 0x88 #地址0x131
+    #data[18] = 0x10
     
     data[24] = 0xff #地址0x138, sync周期 4B
     data[25] = 0x0f #地址0x139