改写了全部的测试用例,用python生成数据和相关的辅助代码

tb/shinTest/ShinTopSpiTb.v

@@ -3,13 +3,13 @@
 `define ENABLE_REG_RW_TEST
 `define ENABLE_DET_TEST
 `define ENABLE_SET_ADDR_TEST
-//`define ENABLE_SM1_SEND_TEST
+`define ENABLE_SM1_SEND_TEST
-//`define ENABLE_SMx_SEND_TEST
+`define ENABLE_SMx_SEND_TEST
 `define ENABLE_EXCHG_DATA_SEQ_TEST
-  //`define ENABLE_EXCHG_DATA_SEQ0_TEST
+  `define ENABLE_EXCHG_DATA_SEQ0_TEST
-  //`define ENABLE_EXCHG_DATA_SEQ1_TEST
+  `define ENABLE_EXCHG_DATA_SEQ1_TEST
-  //`define ENABLE_EXCHG_DATA_SEQ2_TEST
+  `define ENABLE_EXCHG_DATA_SEQ2_TEST
-  //`define ENABLE_EXCHG_DATA_BC_TEST
+  `define ENABLE_EXCHG_DATA_BC_TEST
 `define ENABLE_SYNC_TEST
 `define ENABLE_SYNC_SIG0_TEST
 `define ENABLE_SYNC_SIG1_TEST
@@ -548,7 +548,7 @@ initial begin
     spi_trans( (16'h00), (`SPI_READ), (64), (`IF_IQSPI(3)) );
     spi_trans( (16'h00), (`SPI_READ), (64), (`IF_IQSPI(4)) );
     _t_end = $time;
-    $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+    $fdisplay(spidata_file, "该测试用例运行时间：%2tns\n", (_t_end - _t_start) / 1000);
   end
 `endif
 
@@ -637,7 +637,7 @@ initial begin
     spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(3)) );
     spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(4)) );
     _t_end = $time;
-    $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+    $fdisplay(spidata_file, "该测试用例运行时间：%2tns\n", (_t_end - _t_start) / 1000);
   end
 `endif
 
@@ -659,23 +659,7 @@ initial begin
 
     $fdisplay(spidata_file, "--->>>设置顺序地址");
     `include "set_addr_pkt.vh"
-    //长度
-    `DEF_set_addr_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)) );
 
-    //子报文
-    $fdisplay(spidata_file, "<<发包：");
-    `DEF_set_addr_pkt(txBuf);
-    spi_trans( (`MST_TX_ADDR), (`SPI_WRITE), (`DEF_set_addr_pkt_len), (`IF_IDX(0)) ); //写入SM1
-
-    //发布请求
-    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( (`MST_RX_ADDR), (`SPI_READ), (`DEF_set_addr_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
-    
     //测试
     spi_trans( (16'hc0), (`SPI_READ), (6), (`IF_IDX(3)) );
     spi_trans( (16'h0a), (`SPI_READ), (2), (`IF_IDX(1)) );
@@ -686,14 +670,13 @@ initial begin
     //读写
     #1000
     $fdisplay(spidata_file, "--->>>设置顺序地址后，检查顺序地址");
-    //spi_trans( (16'h0010), (`SPI_READ), (5), (`IF_IDX(0)) );
     spi_trans( (16'h0000), (`SPI_READ), (16), (`IF_IDX(1)) );
     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)) );
 
     _t_end = $time;
-    $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+    $fdisplay(spidata_file, "该测试用例运行时间：%2tns\n", (_t_end - _t_start) / 1000);
   end
 `endif
 
@@ -727,7 +710,7 @@ initial begin
     spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(3)) );
     spi_trans( (16'h00c0), (`SPI_READ), (6), (`IF_IDX(4)) );
     _t_end = $time;
-    $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+    $fdisplay(spidata_file, "该测试用例运行时间：%2tns\n", (_t_end - _t_start) / 1000);
   end
 `endif
 
@@ -741,7 +724,7 @@ initial begin
     `include "sm1_pkt.vh"
 
     _t_end = $time;
-    $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+    $fdisplay(spidata_file, "该测试用例运行时间：%2tns\n", (_t_end - _t_start) / 1000);
   end
   
 `endif
@@ -760,7 +743,7 @@ initial begin
     `include "sm2_pkt.vh"
 
     _t_end = $time;
-    $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+    $fdisplay(spidata_file, "该测试用例运行时间：%2tns\n", (_t_end - _t_start) / 1000);
   end
 
   
@@ -779,7 +762,7 @@ initial begin
     spi_trans( (16'h0800), (`SPI_READ), (16), (`IF_IDX(4)) );
 
     _t_end = $time;
-    $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+    $fdisplay(spidata_file, "该测试用例运行时间：%2tns\n", (_t_end - _t_start) / 1000);
   end
   
 `endif
@@ -806,7 +789,7 @@ initial begin
     `include "seq_0_pkt.vh"
 
     _t_end = $time;
-    $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+    $fdisplay(spidata_file, "该测试用例运行时间：%2tns\n", (_t_end - _t_start) / 1000);
   end
   `endif
 
@@ -824,7 +807,7 @@ initial begin
     spi_trans( (16'h3800), (`SPI_READ), (64), (`IF_IDX(4)) );
     
     _t_end = $time;
-    $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+    $fdisplay(spidata_file, "该测试用例运行时间：%2tns\n", (_t_end - _t_start) / 1000);
   end
   `endif
 
@@ -875,7 +858,7 @@ initial begin
     `include "seq_2_pkt.vh"
 
     _t_end = $time;
-    $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+    $fdisplay(spidata_file, "该测试用例运行时间：%2tns\n", (_t_end - _t_start) / 1000);
   end
   `endif
 `endif
@@ -888,25 +871,11 @@ initial begin
     $fdisplay(spidata_file, "\n\n测试用例：广播交换数据");
     $display("read&write @ %d", s_ShinTop_Mst.interface__io_cReg_timeStamp);
     $fdisplay(spidata_file, "\n--->>>广播读");
+    
     `include "bc_r_pkt.vh"
-
+    
-    `DEF_bc_r_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)) );
-
-    $fdisplay(spidata_file, "<<发包：");
-    `DEF_bc_r_pkt(txBuf);
-    spi_trans( (`MST_TX_ADDR), (`SPI_WRITE), (`DEF_bc_r_pkt_len), (`IF_IDX(0)) ); //写入SM1
-    //发布请求
-    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( (`MST_RX_ADDR), (`SPI_READ), (`DEF_bc_r_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
-
     _t_end = $time;
-    $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+    $fdisplay(spidata_file, "该测试用例运行时间：%2tns\n", (_t_end - _t_start) / 1000);
   end
 
 
@@ -919,28 +888,13 @@ initial begin
     $fdisplay(spidata_file, "\n--->>>广播写");
     `include "bc_w_pkt.vh"
 
-    `DEF_bc_w_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)) );
-
-    $fdisplay(spidata_file, "<<发包：");
-    `DEF_bc_w_pkt(txBuf);
-    spi_trans( (`MST_TX_ADDR), (`SPI_WRITE), (`DEF_bc_w_pkt_len), (`IF_IDX(0)) ); //写入SM1
-    //发布请求
-    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( (`MST_RX_ADDR), (`SPI_READ), (`DEF_bc_w_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
-    
     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)) );
     
     _t_end = $time;
-    $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+    $fdisplay(spidata_file, "该测试用例运行时间：%2tns\n", (_t_end - _t_start) / 1000);
   end
 `endif
 
@@ -961,35 +915,9 @@ initial begin
 
     //设置SM1在写入 0x18 len触发enq
     `include "sync_pkt.vh"
-    `DEF_sync_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)) );
-
-    $fdisplay(spidata_file, "<<发包：");
-    `DEF_sync_pkt(txBuf);
-    spi_trans( (`MST_TX_ADDR), (`SPI_WRITE), (`DEF_sync_pkt_len), (`IF_IDX(0)) ); //写入SM1
-
-    //写入替换时间戳替换地址
-    txBuf[0+3] = 8'h0c;
-    txBuf[1+3] = 8'hc0;
-    spi_trans( (16'h24), (`SPI_WRITE), (2), (`IF_IDX(0)) ); //写入替换时间戳替换地址寄存器
-
-    //发布请求
-    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( (`MST_RX_ADDR), (`SPI_READ), (`DEF_sync_pkt_len), (`IF_IDX(0)) );//读一下SM0的切换地址，将fifo弹出
-    end
-
-    //清除替换时间戳替换地址
-    txBuf[0+3] = 8'h00;
-    txBuf[1+3] = 8'h00;
-    
-    spi_trans( (16'h25), (`SPI_WRITE), (2), (`IF_IDX(0)) ); //清除替换时间戳替换地址寄存器
 
     _t_end = $time;
-    $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+    $fdisplay(spidata_file, "该测试用例运行时间：%2tns\n", (_t_end - _t_start) / 1000);
   end
 `endif
 
@@ -1023,7 +951,7 @@ initial begin
 
   #100000
     _t_end = $time;
-    $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+    $fdisplay(spidata_file, "该测试用例运行时间：%2tns\n", (_t_end - _t_start) / 1000);
   end
 `endif
 
@@ -1041,13 +969,10 @@ initial begin
     spi_trans( (16'h0100), (`SPI_READ), (16'h48), (`IF_IDX(4)) );
 
     _t_end = $time;
-    $fdisplay(spidata_file, "该测试用例运行时间：%2tns", (_t_end - _t_start) / 1000);
+    $fdisplay(spidata_file, "该测试用例运行时间：%2tns\n", (_t_end - _t_start) / 1000);
   end
 `endif
   
-
-
-
   /*
   #50000
   //复位系统

tb/shinTest/gen_pkt.py

@@ -184,13 +184,9 @@ class GenPkt(object):
 
 
 
-        #+ '''//写入替换时间戳替换地址\n'''
-        #+ '''txBuf[0+3] = 8'h0c;\n'''
-        #+ '''txBuf[1+3] = 8'hc0;\n'''
-        #+ '''spi_trans( (16'h24), (`SPI_WRITE), (2), (`IF_IDX(0)) );\n'''
-
 def genWriteTransLenCode(gen_name, sm_idx):
     return '''\n//写入发送长度\n'''\
+        + '''$fdisplay(spidata_file, "--写数据交换长度");\n'''\
         + '''`DEF_%s_sm(txBuf);\n'''%(gen_name, )\
         + '''spi_trans( (`MST_TX%d_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) );\n'''%(sm_idx,)\
         + '''spi_trans( (`MST_RX%d_LEN_ADDR), (`SPI_WRITE), (2), (`IF_IDX(0)) );\n'''%(sm_idx,)
@@ -212,6 +208,26 @@ def genReadAckPktCode(gen_name, sm_idx):
         + '''$fdisplay(spidata_file, ">>回包：");\n'''\
         + '''spi_trans( (`MST_RX%d_ADDR), (`SPI_READ), (`DEF_%s_len), (`IF_IDX(0)) );\n'''%(sm_idx, gen_name,)
 
+def genEnableInsertTimeCode(pos, enableTime=True, enableDelay=True):
+    data = pos & 0x3fff
+    if enableTime:
+        data = data | 0x8000
+    if enableDelay:
+        data = data | 0x4000
+    return '''//写入替换时间戳替换地址\n'''\
+        + '''$fdisplay(spidata_file, "--增加时间戳插入");\n'''\
+        + '''txBuf[0+3] = 8'h%x;\n'''%(data & 0xff, )\
+        + '''txBuf[1+3] = 8'h%x;\n'''%((data >> 8) & 0xff, )\
+        + '''spi_trans( (16'h24), (`SPI_WRITE), (2), (`IF_IDX(0)) );\n'''
+
+def genDisableInsertTimeCode():
+    return '''\n//清除替换时间戳替换地址\n'''\
+        + '''$fdisplay(spidata_file, "--清除时间戳插入");\n'''\
+        + '''txBuf[0+3] = 8'h00;\n'''\
+        + '''txBuf[1+3] = 8'h00;\n'''\
+        + '''spi_trans( (16'h25), (`SPI_WRITE), (2), (`IF_IDX(0)) ); //清除替换时间戳替换地址寄存器\n'''
+
+
 if __name__ == '__main__':
     genPkt = GenPkt()
 
@@ -423,9 +439,30 @@ if __name__ == '__main__':
     #>>>>>>同步数据包
     genPkt.clean()
     genPkt.setPktType(0)
+
+
+
+    
+
     #subPkt参数：索引、索引类型、地址、命令、长度、数据
     genPkt.addSubPkt(0x0, 0, random.randint(0, 65535), 0xc, 12, b'\0'*12)
-    genPkt.gen("./generated/shin/sync_pkt.vh", 1)
+    
+    
+    genPkt.addBeforeExc(genEnableInsertTimeCode(0xc))
+
+    gen_file_def = "sync_pkt"
+    sm_idx = 0
+
+    genPkt.addAfterExc(genWriteTransLenCode(gen_file_def, sm_idx)
+                       +genWriteTransPktCode(gen_file_def, sm_idx)
+                       +genTrgTransPktCode(gen_file_def, sm_idx)
+                       +genReadAckPktCode(gen_file_def, sm_idx)
+                       +genDisableInsertTimeCode())
+
+
+    genPkt.gen("./generated/shin/%s.vh"%(gen_file_def, ), 1)
+
+
 
     #-------------------------------------------------------------------------
     #>>>>>>设置同步信号的数据包
@@ -576,7 +613,15 @@ if __name__ == '__main__':
     genPkt.addSubPkt(0x0, 0, random.randint(0, 65535), 0xb, 2, data)
 
 
-    genPkt.gen("./generated/shin/set_addr_pkt.vh", 1)
+    gen_file_def = "set_addr_pkt"
+    sm_idx = 0
+
+    genPkt.addAfterExc(genWriteTransLenCode(gen_file_def, sm_idx)
+                       +genWriteTransPktCode(gen_file_def, sm_idx)
+                       +genTrgTransPktCode(gen_file_def, sm_idx)
+                       +genReadAckPktCode(gen_file_def, sm_idx))
+    
+    genPkt.gen("./generated/shin/%s.vh"%(gen_file_def, ), 1)
 
 
     #-------------------------------------------------------------------------
@@ -595,7 +640,16 @@ if __name__ == '__main__':
     genPkt.addSubPkt(random.randint(0, 2048), 0, 0xc0, 0xd, 4, b"\0"*4)
     genPkt.addSubPkt(random.randint(0, 2048), 0, 0xc0, 0xd, 4, b"\0"*4)
 
-    genPkt.gen("./generated/shin/bc_r_pkt.vh", 1)
+
+    gen_file_def = "bc_r_pkt"
+    sm_idx = 0
+
+    genPkt.addAfterExc(genWriteTransLenCode(gen_file_def, sm_idx)
+                       +genWriteTransPktCode(gen_file_def, sm_idx)
+                       +genTrgTransPktCode(gen_file_def, sm_idx)
+                       +genReadAckPktCode(gen_file_def, sm_idx))
+
+    genPkt.gen("./generated/shin/%s.vh"%(gen_file_def, ), 1)
     
     
     #-------------------------------------------------------------------------
@@ -614,7 +668,15 @@ if __name__ == '__main__':
         data[i] = i + 1
     genPkt.addSubPkt(random.randint(0, 2048), 0, 0x0800, 0xe, 32, data)
 
-    genPkt.gen("./generated/shin/bc_w_pkt.vh", 1)
+    gen_file_def = "bc_w_pkt"
+    sm_idx = 0
+
+    genPkt.addAfterExc(genWriteTransLenCode(gen_file_def, sm_idx)
+                       +genWriteTransPktCode(gen_file_def, sm_idx)
+                       +genTrgTransPktCode(gen_file_def, sm_idx)
+                       +genReadAckPktCode(gen_file_def, sm_idx))
+
+    genPkt.gen("./generated/shin/%s.vh"%(gen_file_def, ), 1)