ruige/eb001
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mp_eb_dev' of github.com:whutddk/RISCV-MAC-SWICH into mp_eb_dev

Browse Source
This commit is contained in:
Ruige
2025-09-08 17:10:09 +08:00
parent 1d5a257b58 9c43daf51e
commit 43b70e674c
10 changed files with 249 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -41,7 +41,7 @@ shin:
sbt "test:runMain test.testShinModule"
testShin:
./tb/shinTest/gen_pkt.py
python3 ./tb/shinTest/gen_pkt.py
mkdir -p generated/log
rm -rf generated/log/*
iverilog -Wall \
@@ -52,10 +52,10 @@ testShin:
-D IVERILOG_COMPILE \
./tb/shinTest/ShinTopSpiTb.v
vvp -N ./tb/build/shinTest.iverilog -lxt2 -fst || true
./tb/shinTest/check_testcase.py
python3 ./tb/shinTest/check_testcase.py
testShinClk:
./tb/shinTest/gen_pkt_clk.py
python3 ./tb/shinTest/gen_pkt_clk.py --dev1 0 200
mkdir -p generated/log
rm -rf generated/log/*
iverilog -Wall \
@@ -66,7 +66,7 @@ testShinClk:
-D IVERILOG_COMPILE \
./tb/shinTest/ShinTopSpiTb_clk.v
vvp -N ./tb/build/shinTest_clk.iverilog -lxt2 -fst || true
./tb/shinTest/check_testcase.py
python3 ./tb/shinTest/check_testcase.py
testCDR:
iverilog -Wall \

28
tb/shinTest/Makefile_vcs
View File

@@ -9,7 +9,7 @@ VCS = vcs -sverilog +v2k -timescale=1ns/1ps \
-l compile.log \
-debug_access+none \
+define+VCS_COMPILE \
-fastpartcomp=j$(nproc) \
-fastpartcomp=j${CPU_COUNT} \
SIM = ./${OUTPUT} -l run.log
@@ -24,12 +24,32 @@ testShin_vcs:
testShinClk_vcs:
python3 ./shinTest/gen_pkt_clk.py
python3 ./shinTest/gen_pkt_clk.py --dev1 0 90 --dev2 0 -90
mkdir -p generated/log
rm -rf generated/log/*
${VCS} -f ./shinTestClk_vcs.f
${SIM}
python3 ./shinTest/check_testcase.py
mv spi_trans_data.txt generated/spi_trans_data1.txt
mv generated/wave.vcd generated/wave1.vcd
\
python3 ./shinTest/gen_pkt_clk.py --dev1 45 180 --dev3 25 -180
mkdir -p generated/log
rm -rf generated/log/*
${VCS} -f ./shinTestClk_vcs.f
${SIM}
python3 ./shinTest/check_testcase.py
mv spi_trans_data.txt generated/spi_trans_data2.txt
mv generated/wave.vcd generated/wave2.vcd
\
python3 ./shinTest/gen_pkt_clk.py --dev1 45 190 --dev3 25 -190
mkdir -p generated/log
rm -rf generated/log/*
${VCS} -f ./shinTestClk_vcs.f
${SIM}
python3 ./shinTest/check_testcase.py
mv spi_trans_data.txt generated/spi_trans_data3.txt
mv generated/wave.vcd generated/wave3.vcd
testShinMany_vcs:
@@ -58,7 +78,7 @@ testShin:
./shinTest/check_testcase.py
testShinClk:
./shinTest/gen_pkt_clk.py
./shinTest/gen_pkt_clk.py --dev1 0 200
mkdir -p generated/log
rm -rf generated/log/*
iverilog -Wall \
@@ -77,4 +97,4 @@ fstShinClk:
gtkwave ./generated/wave_clk.fst 1>/dev/null 2>&1 &
clean:
rm -rf ./generated/log/* ./generated/shin/*.vh ./generated/shinTest.* ./generated/wave*.*
rm -rf ./generated/log/* ./generated/shin/*.vh ./generated/shinTest.* ./generated/wave*.* ./generated/spi_trans*.*

19
tb/shinTest/ShinTopSpiTb.v
View File

@@ -442,7 +442,12 @@ begin
`ifdef VCS_COMPILE
$dumpfile("./generated/wave.vcd"); //生成的vcd文件名称
$dumpvars(0, ShinTopSpiTb);//tb模块名称
//$dumpvars(0, ShinTopSpiTb);//tb模块名称
$dumpvars(0, ShinTopSpiTb.s_ShinTop_Mst);//tb模块名称
//$dumpvars(0, ShinTopSpiTb.s_ShinTop_slv124);//tb模块名称
//$dumpvars(0, ShinTopSpiTb.s_ShinTop_slv125);//tb模块名称
//$dumpvars(0, ShinTopSpiTb.s_ShinTop_slv126);//tb模块名称
//$dumpvars(0, ShinTopSpiTb.s_ShinTop_slv127);//tb模块名称
`endif
`ifdef IVERILOG_COMPILE
@@ -525,7 +530,7 @@ end
reg isBusy = 0;
reg [11:0] length;
reg [7:0] idx;
reg [16:0] idx;
reg [11:0] transCnt;
reg [11:0] byteCnt;
@@ -598,7 +603,7 @@ end
//mst slv0~slv3的 内部qspi调用即设置
//sidx为0~4；外部spi为5~9，外部qspi为10~15
task spi_trans( input [15:0] saddress, input [7:0] scmd, input [12:0] slength,input [7:0] sidx );
task spi_trans( input [15:0] saddress, input [7:0] scmd, input [12:0] slength,input [16:0] sidx );
begin
txBuf[0] <= saddress[15:8];
txBuf[1] <= saddress[7:0];
@@ -660,13 +665,15 @@ task spi_trans( input [15:0] saddress, input [7:0] scmd, input [12:0] slength,in
if (scmd == 0) begin
addr_type = txBuf[_pos + 1] & 8'h3;
dev = (txBuf[_pos] >> 2) * 256 + ((txBuf[_pos + 1] >> 2) & 8'hff);
dev = (txBuf[_pos] * 256) >> 2;
dev = dev + ((txBuf[_pos + 1] >> 2) & 8'hff);
addr = txBuf[_pos + 2] * 256 + (txBuf[_pos + 3] & 8'hff);
cmd = (txBuf[_pos + 4] >> 4) & 8'h0f;
len = (txBuf[_pos + 4] & 8'h0f) * 256 + (txBuf[_pos + 5] & 8'hff);
end else begin
addr_type = rxBuf[_pos + 1] & 8'h3;
dev = (rxBuf[_pos] >> 2) * 256 + ((rxBuf[_pos + 1] >> 2) & 8'hff);
dev = (txBuf[_pos] * 256) >> 2;
dev = dev + ((rxBuf[_pos + 1] >> 2) & 8'hff);
addr = rxBuf[_pos + 2] * 256 + (rxBuf[_pos + 3] & 8'hff);
cmd = (rxBuf[_pos + 4] >> 4) & 8'h0f;
len = (rxBuf[_pos + 4] & 8'h0f) * 256 + (rxBuf[_pos + 5] & 8'hff);
@@ -933,7 +940,7 @@ task wait_comm_finished(input [16:0] dev_idx);
$display("error occur");
is_run = 0;
end
if (($realtime - st) >= 5000000.0)
if (($realtime - st) >= 20000000.0)
begin
$display("comm timeout.");
is_run = 0;

23
tb/shinTest/ShinTopSpiTb_clk.v
View File

@@ -12,13 +12,6 @@ module ShinTopSpiTb(
reg [15:0] multiCLK;
reg clock2;
reg [15:0] multiCLK2;
reg clock3;
reg [15:0] multiCLK3;
`include "dev_predef.vh"
`ifdef DEFINE_SLAVE_DEVICE
@@ -361,7 +354,6 @@ ShinTop s_ShinTop_slv3(
initial begin
clock = 0;
clock2 = 0;
reset = 1;
latch0 = 0;
@@ -407,6 +399,8 @@ generate
end
endgenerate
/*
//如果频率差到 80ppm，参数是： 8000640/1000080/8000640 [pass]
//如果频率差到120ppm，参数是： 8000960/1000120/8000960 [pass]
//如果频率差到160ppm，参数是： 8001280/1000160/8001280 [pass]
@@ -466,8 +460,11 @@ generate
end
end
endgenerate
*/
`include "slave_dev_clk.vh"
initial
begin
spidata_file = $fopen("spi_trans_data.txt", "w");
@@ -557,7 +554,7 @@ end
reg isBusy = 0;
reg [11:0] length;
reg [7:0] idx;
reg [16:0] idx;
reg [11:0] transCnt;
reg [11:0] byteCnt;
@@ -630,7 +627,7 @@ end
//mst slv0~slv3的 内部qspi调用即设置
//sidx为0~4；外部spi为5~9，外部qspi为10~15
task spi_trans( input [15:0] saddress, input [7:0] scmd, input [12:0] slength,input [7:0] sidx );
task spi_trans( input [15:0] saddress, input [7:0] scmd, input [12:0] slength,input [16:0] sidx );
begin
txBuf[0] <= saddress[15:8];
txBuf[1] <= saddress[7:0];
@@ -692,13 +689,15 @@ task spi_trans( input [15:0] saddress, input [7:0] scmd, input [12:0] slength,in
if (scmd == 0) begin
addr_type = txBuf[_pos + 1] & 8'h3;
dev = (txBuf[_pos] >> 2) * 256 + ((txBuf[_pos + 1] >> 2) & 8'hff);
dev = (txBuf[_pos] * 256) >> 2;
dev = dev + ((txBuf[_pos + 1] >> 2) & 8'hff);
addr = txBuf[_pos + 2] * 256 + (txBuf[_pos + 3] & 8'hff);
cmd = (txBuf[_pos + 4] >> 4) & 8'h0f;
len = (txBuf[_pos + 4] & 8'h0f) * 256 + (txBuf[_pos + 5] & 8'hff);
end else begin
addr_type = rxBuf[_pos + 1] & 8'h3;
dev = (rxBuf[_pos] >> 2) * 256 + ((rxBuf[_pos + 1] >> 2) & 8'hff);
dev = (txBuf[_pos] * 256) >> 2;
dev = dev + ((txBuf[_pos + 1] >> 2) & 8'hff);
addr = rxBuf[_pos + 2] * 256 + (rxBuf[_pos + 3] & 8'hff);
cmd = (rxBuf[_pos + 4] >> 4) & 8'h0f;
len = (rxBuf[_pos + 4] & 8'h0f) * 256 + (rxBuf[_pos + 5] & 8'hff);

29
tb/shinTest/gen_pkt_clk.py
View File

@@ -2,11 +2,40 @@
#encoding=utf-8
from pyutils import *
from testcase import environment, rwregs, ebmmu, errorPkt, watchdog, broadcast, sync, base, mac
import argparse
if __name__ == '__main__':
parser = argparse.ArgumentParser()
# 可选参数
parser.add_argument("-d1", "--dev1", nargs=2, type=int, default=[0, 0], help="相位(度)、频率偏差ppm")
parser.add_argument("-d2", "--dev2", nargs=2, type=int, default=[0, 0], help="相位(度)、频率偏差ppm")
parser.add_argument("-d3", "--dev3", nargs=2, type=int, default=[0, 0], help="相位(度)、频率偏差ppm")
parser.add_argument("-d4", "--dev4", nargs=2, type=int, default=[0, 0], help="相位(度)、频率偏差ppm")
# 解析参数
args = parser.parse_args()
# 使用参数
dev_clk_info = dict()
if args.dev1 != [0, 0]:
dev_clk_info[1] = args.dev1
if args.dev2 != [0, 0]:
dev_clk_info[2] = args.dev2
if args.dev3 != [0, 0]:
dev_clk_info[3] = args.dev3
if args.dev4 != [0, 0]:
dev_clk_info[4] = args.dev4
environment.set_dev_clk(dev_clk_info)
environment.gen_slv_dev_for_clk(4)
environment.bringup()
rwregs.tc1()
#add_tc_2_runlist(errorPkt.tc1())
#add_tc_2_runlist(errorPkt.tc2())
#add_tc_2_runlist(errorPkt.tc3())

2
tb/shinTest/gen_pkt_many_dev.py
View File

@@ -4,7 +4,7 @@ from pyutils import *
from testcase import environment, rwregs, ebmmu, errorPkt, watchdog, broadcast, sync, base, mac, manydev
if __name__ == '__main__':
environment.gen_slv_dev_num(128)
environment.gen_slv_dev_num(202)
environment.bringup()

10
tb/shinTest/testcase/base.py
View File

@@ -2337,9 +2337,13 @@ def tc28():
+genIFRwDataCode(0, 0x74, False, 4)
+genIFRwDataCode(4, 0x74, False, 4)
+genMessageCode("--读取中断使能")
+genIFRwDataCode(0, 0x70, False, 4)
+genIFRwDataCode(4, 0x70, False, 4)
+genMessageCode("--配置中断")
#+genIFRwDataCode(0, 0x70, False, 4)
#+genIFRwDataCode(4, 0x70, False, 4)
+genIFRwDataCode(0, 0x70, True, 4, [0x03, 0x00, 0x00, 0xf0])
+genIFRwDataCode(4, 0x70, True, 4, [0x00, 0x00, 0x00, 0xf0])
+genIFRwDataCode(0, 0x7c, True, 2, [0x10, 0x80])
+genIFRwDataCode(4, 0x7c, True, 2, [0x10, 0x80])
+genMessageCode("--配置主从站")
+genIFRwDataCode(0, 0x00, True, 1, [0x01, ])

78
tb/shinTest/testcase/environment.py
View File

@@ -1,6 +1,9 @@
from pyutils import *
global_dev_num = 4
global_setting_dev_clk = dict()
def bringup():
@@ -177,7 +180,8 @@ def bringup():
add_tc_2_runlist(gen_file_def)
def __GenDevice(id, TerminateNode = False, diffclk = False):
def __GenDevice(id, TerminateNode = False):
global global_setting_dev_clk
dout_code = "dDat_w[%d]"%(id + 1, )
din_code = "uDat_w[%d]"%(id + 1, )
if TerminateNode:
@@ -186,9 +190,13 @@ def __GenDevice(id, TerminateNode = False, diffclk = False):
clk = "multiCLK[0]"
multiclk = "multiCLK"
if diffclk:
clk = "multiCLK2[0]"
multiclk = "multiCLK2"
try:
v = global_setting_dev_clk[id + 1]
clk = "multiCLK%d[0]"%(id + 1, )
multiclk = "multiCLK%d"%(id + 1, )
except:
pass
code_device = ("\tShinTop s_ShinTop_slv%d(\n"%(id, )
+"\t.clock(%s),\n"%(clk, )
@@ -244,6 +252,12 @@ def __GenDevice(id, TerminateNode = False, diffclk = False):
return code_device
def __gen_slv_dev_predef(num):
global global_setting_dev_clk
code_for_clk = ""
for k in global_setting_dev_clk:
code_for_clk = code_for_clk + "reg [15:0] multiCLK%d;\n"%(k, )
code_predef =("`define DEV_NUM %d //slave num\n"%(num, )
+"`define ALL_DEV_NUM (`DEV_NUM + 1) // slave + master\n"
+"`define SPI_CSN_NUM (`ALL_DEV_NUM * 3)\n"
@@ -289,14 +303,23 @@ def __gen_slv_dev_predef(num):
gen_file_def = "dev_predef"
code = code_predef + code_qspi_mux_init + code_spi_mux_init
code = code_for_clk + code_predef + code_qspi_mux_init + code_spi_mux_init
genPkt.addAfterExc(code)
genPkt.gen("./generated/shin/%s.vh"%(gen_file_def, ), 1)
def get_slv_dev_num():
global global_dev_num
return global_dev_num
def gen_slv_dev_num(num):
global global_dev_num
global_dev_num = num
__gen_slv_dev_predef(num)
genPkt = GenPkt()
@@ -327,9 +350,6 @@ def gen_slv_dev_for_clk(num):
code = ""
for id in range(num - 1):
if id == 1:
code = code + __GenDevice(id, diffclk = True)
else:
code = code + __GenDevice(id)
code = code + __GenDevice(num - 1, True)
@@ -339,6 +359,48 @@ def gen_slv_dev_for_clk(num):
genPkt.gen("./generated/shin/%s.vh"%(gen_file_def, ), 1)
def set_dev_clk(cfg):
global global_setting_dev_clk
global_setting_dev_clk = cfg
code_for_clk = ""
for k in global_setting_dev_clk:
v = global_setting_dev_clk[k]
ph = int(8 * 1000000 * v[0] / 360.0)
period = int(1000000 + v[1])
code_for_clk = code_for_clk + __gen_slv_clk(k, ph, period)
genPkt = GenPkt()
genPkt.clean()
gen_file_def = "slave_dev_clk"
genPkt.addAfterExc(code_for_clk)
genPkt.gen("./generated/shin/%s.vh"%(gen_file_def, ), 1)
def __gen_slv_clk(clk, ph, period):
slv_code =(
""
#"\tinitial begin\n"
#+"\t\tforever begin #%d clock%d <= ~clock%d; end\n"%(period * 8, clk, clk)
#+"\tend\n\n"
+"\tgenerate\n"
+"\tfor( genvar i = 0; i < 16; i = i + 1 ) begin\n"
+"\t\tinitial begin\n"
+ "\t\t\t//相位信息\n"
+ "\t\t\t#%d\n"%(ph)
+ "\t\t\tmultiCLK%d[i] = 0;\n"%(clk, )
+ "\t\t\tfor( integer j = 0; j < i; j = j + 1 ) begin\n"
+ "\t\t\t\t#%d\n"%(period, )
+ "\t\t\t\t;\n"
+ "\t\t\tend\n"
+ "\t\t\tforever begin #%d multiCLK%d[i] <= ~multiCLK%d[i]; end\n"%(period * 8, clk, clk)
+"\t\tend\n"
+"\tend\n"
+"\tendgenerate\n")
return slv_code
def teardown():
#add_tc_2_runlist("")

67
tb/shinTest/testcase/manydev.py
View File

@@ -1,10 +1,11 @@
from pyutils import *
from .environment import *
def tc1():
genPkt = GenPkt()
dev = 128
dev = get_slv_dev_num()
print("DEV:", dev)
gen_file_def = "manydev_tc01"
sm_idx = 0
@@ -73,7 +74,7 @@ def tc1():
+genWriteTransLenCode(gen_file_def_ap, sm_idx)
+genWriteTransPktCode(gen_file_def_ap, sm_idx)
+genTrgTransPktCode(gen_file_def_ap, sm_idx)
+ "#10000000"
#+ "#10000000"
+genReadAckPktCode(gen_file_def_ap, sm_idx)
@@ -120,14 +121,70 @@ def tc1():
genPkt.addAfterExc(genWriteTransLenCode(gen_file_def_ap, sm_idx)
+genWriteTransPktCode(gen_file_def_ap, sm_idx)
+genTrgTransPktCode(gen_file_def_ap, sm_idx)
+ "#10000000"
#+ "#10000000"
+genReadAckPktCode(gen_file_def_ap, sm_idx)
+clear_int_code
)
genPkt.gen("./generated/shin/%s.vh"%(gen_file_def, ), 1, True, gen_file_def_ap)
genPkt.clean()
genPkt.setPktType(0)
gen_file_def_ap = gen_file_def+"_step05"
sm_idx = 0
#for i in range(dev):
# genPkt.addSubPkt(i + 1, 0, 0x1000, 0x0, 2, [0, 0])
genPkt.addSubPkt(0, 0, 0x302, 0xe, 2, [8, 0])
genPkt.addSubPkt(0, 0, 0x800, 0xe, 8, list(range(8)))
read_data_code = ""
for i in range(dev):
read_data_code = read_data_code + genSlvSMReadData(i + 1, 0, 8)
#genPkt.addBeforeExc(prepare_data_code)
genPkt.addAfterExc(genWriteTransLenCode(gen_file_def_ap, sm_idx)
+genWriteTransPktCode(gen_file_def_ap, sm_idx)
+genTrgTransPktCode(gen_file_def_ap, sm_idx)
+genReadAckPktCode(gen_file_def_ap, sm_idx)
+clear_int_code
+read_data_code
)
genPkt.gen("./generated/shin/%s.vh"%(gen_file_def, ), 1, True, gen_file_def_ap)
genPkt.clean()
genPkt.setPktType(0)
gen_file_def_ap = gen_file_def+"_step06"
sm_idx = 0
#for i in range(dev):
# genPkt.addSubPkt(i + 1, 0, 0x1000, 0x0, 2, [0, 0])
genPkt.addSubPkt(0, 0, 0x302, 0xe, 2, [2, 0])
for i in range(dev):
genPkt.addSubPkt(i + 1, 0, 0x0800, 0x1, 2, [i & 0xff, (i + 1) & 0xff])
read_data_code = ""
for i in range(dev):
read_data_code = read_data_code + genSlvSMReadData(i + 1, 0, 2)
#genPkt.addBeforeExc(prepare_data_code)
genPkt.addAfterExc(genWriteTransLenCode(gen_file_def_ap, sm_idx)
+genWriteTransPktCode(gen_file_def_ap, sm_idx)
+genTrgTransPktCode(gen_file_def_ap, sm_idx)
+genReadAckPktCode(gen_file_def_ap, sm_idx)
+clear_int_code
+read_data_code
+genTcEndFrameCode(gen_file_def)
)
genPkt.gen("./generated/shin/%s.vh"%(gen_file_def, ), 1, True, gen_file_def_ap)
return gen_file_def

33
tb/shinTest/testcase/rwregs.py
View File

@@ -1,21 +1,32 @@
from pyutils import *
from .environment import *
import time
import random
def tc1():
random.seed(int(time.time() * 1000))
genPkt = GenPkt()
#-------------------------------------------------------------------------
#>>>>>>嗅探数据包1，正常的嗅探数据包
genPkt.clean()
genPkt.setPktType(1)
gen_file_def = "regtest_tc01"
sm_idx = 0
tc_des = "测试寄存器的读写状态，将系统改为8B10B进行通信\\n"
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 = GenPkt()
genPkt.clean()
dev_num = get_slv_dev_num()
genPkt.addBeforeExc(genTcStartFrameCode(gen_file_def, tc_des))
change_8b10b_code = ""
for i in range(dev_num + 1):
change_8b10b_code = change_8b10b_code + genIFRwDataCode(i, 0x004c, True, 2, [0x1, 0x59])\
+genIFRwDataCode(i, 0x004c, False, 2)
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)
change_8b10b_code
+genTcEndFrameCode(gen_file_def))
genPkt.gen("./generated/shin/%s.vh"%(gen_file_def, ), 1)
return gen_file_def