From d9da8fe7db29b9b5f0ac28504225734a8d2f9d01 Mon Sep 17 00:00:00 2001 From: bacon Date: Sat, 6 Sep 2025 15:20:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=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/testcase/base.py | 95 ----------------------------- tb/shinTest/testcase/environment.py | 8 --- 2 files changed, 103 deletions(-) diff --git a/tb/shinTest/testcase/base.py b/tb/shinTest/testcase/base.py index defeeb7..04ff389 100644 --- a/tb/shinTest/testcase/base.py +++ b/tb/shinTest/testcase/base.py @@ -1946,21 +1946,6 @@ def tc26(): return gen_file_def -<<<<<<< HEAD -def tc29(): - genPkt = GenPkt() - - - gen_file_def = "base_tc29" - sm_idx = 0 - tc_des = ("读，单次通讯2048个字节。每个子包包含数据128个字节，最多15个子包。 \\n" - +"(128 + 8) * 15 + 4(HEAD) + 4(CRC) = 2048\\n" - +"可以通过屏蔽子包的方式，增大或者缩小发送的数据量。最大的数据量不超过2048个字节。" - ) - - #------------------------------------------------------------------------- - #>>>>>>普通数据包 sm2，广播读 -======= def tc27(): genPkt = GenPkt() @@ -1971,35 +1956,10 @@ def tc27(): #------------------------------------------------------------------------- #>>>>>>普通数据包 sm1，2个读 ->>>>>>> mp_eb_dev genPkt.clean() genPkt.setPktType(0) #subPkt参数：索引、索引类型、地址、命令、长度、数据 -<<<<<<< HEAD - genPkt.addSubPkt(0x01, 0, 0x180, 0x0, 128, None) - genPkt.addSubPkt(0x02, 0, 0x180, 0x0, 128, None) - genPkt.addSubPkt(0x03, 0, 0x180, 0x0, 128, None) - genPkt.addSubPkt(0x04, 0, 0x180, 0x0, 128, None) - - genPkt.addSubPkt(0x01, 0, 0x180, 0x0, 128, None) - genPkt.addSubPkt(0x02, 0, 0x180, 0x0, 128, None) - genPkt.addSubPkt(0x03, 0, 0x180, 0x0, 128, None) - genPkt.addSubPkt(0x04, 0, 0x180, 0x0, 128, None) - - genPkt.addSubPkt(0x01, 0, 0x180, 0x0, 128, None) - genPkt.addSubPkt(0x02, 0, 0x180, 0x0, 128, None) - genPkt.addSubPkt(0x03, 0, 0x180, 0x0, 128, None) - genPkt.addSubPkt(0x04, 0, 0x180, 0x0, 128, None) - - genPkt.addSubPkt(0x01, 0, 0x180, 0x0, 128, None) - genPkt.addSubPkt(0x02, 0, 0x180, 0x0, 128, None) - genPkt.addSubPkt(0x03, 0, 0x180, 0x0, 128, None) - - sm_idx = 2 - - genPkt.addBeforeExc(genTcStartFrameCode(gen_file_def, tc_des)) -======= genPkt.addSubPkt(0x01, 0, 0x302, 0x1, 2, [0x00, 0x03]) genPkt.addSubPkt(0x02, 0, 0x302, 0x1, 2, [0x00, 0x01]) genPkt.addSubPkt(0x03, 0, 0x302, 0x1, 2, [0x00, 0x01]) @@ -2011,14 +1971,11 @@ def tc27(): +genMessageCode("--清除中断") +genIFRwDataCode(0, 0x78, True, 4, [0xff, 0xff, 0xff, 0xff]) ) ->>>>>>> mp_eb_dev 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) -<<<<<<< HEAD -======= +genMessageCode("--清除中断") +genIFRwDataCode(0, 0x78, True, 4, [0xff, 0xff, 0xff, 0xff]) ) @@ -2196,7 +2153,6 @@ def tc28(): #+genWriteTransPktCode(gen_file_def, sm_idx) #+genTrgTransPktCode(gen_file_def, sm_idx) #+genReadAckPktCode(gen_file_def, sm_idx) ->>>>>>> mp_eb_dev +genMessageCode("--读取中断") +genIFRwDataCode(0, 0x74, False, 4) @@ -2219,22 +2175,6 @@ def tc28(): +genIFRwDataCode(3, 0x74, False, 4) +genIFRwDataCode(4, 0x74, False, 4) -<<<<<<< HEAD - +genTcEndFrameCode(gen_file_def)) - genPkt.gen("./generated/shin/%s.vh"%(gen_file_def, ), 1) - - return gen_file_def - - -def tc30(): - genPkt = GenPkt() - - - gen_file_def = "base_tc30" - sm_idx = 0 - tc_des = ("写，单次通讯2048个字节。每个子包包含数据502个字节，最多4个子包。 \\n" - +"(502 + 8) * 4 + 4(HEAD) + 4(CRC) = 2048\\n" -======= #+genTcEndFrameCode(gen_file_def) ) genPkt.gen("./generated/shin/%s.vh"%(gen_file_def, ), 1) @@ -2511,7 +2451,6 @@ def tc29(): sm_idx = 0 tc_des = ("读，单次通讯2048个字节。每个子包包含数据128个字节，最多15个子包。 \\n" +"(128 + 8) * 15 + 4(HEAD) + 4(CRC) = 2048\\n" ->>>>>>> mp_eb_dev +"可以通过屏蔽子包的方式，增大或者缩小发送的数据量。最大的数据量不超过2048个字节。" ) @@ -2519,26 +2458,6 @@ def tc29(): #>>>>>>普通数据包 sm2，广播读 genPkt.clean() genPkt.setPktType(0) -<<<<<<< HEAD - data_len = 502 - data_len_wr = [(data_len & 0xff), ((data_len >> 8) & 0xff)] - #genPkt.addSubPkt(0x00, 0, 0x302, 0xe, 2, data_len_wr) #500 - #subPkt参数：索引、索引类型、地址、命令、长度、数据 - genPkt.addSubPkt(0x01, 0, 0x800, 0x1, data_len, list(range(256)) + list(range(256))) - genPkt.addSubPkt(0x02, 0, 0x800, 0x1, data_len, list(range(256)) + list(range(256))) - genPkt.addSubPkt(0x03, 0, 0x800, 0x1, data_len, list(range(256)) + list(range(256))) - genPkt.addSubPkt(0x04, 0, 0x800, 0x1, data_len, list(range(256)) + list(range(256))) - - sm_idx = 2 - - - genPkt.addBeforeExc(genTcStartFrameCode(gen_file_def, tc_des) - +genIFRwDataCode(1, 0x0302, True, 2, data_len_wr) - +genIFRwDataCode(2, 0x0302, True, 2, data_len_wr) - +genIFRwDataCode(3, 0x0302, True, 2, data_len_wr) - +genIFRwDataCode(4, 0x0302, True, 2, data_len_wr) - ) -======= #subPkt参数：索引、索引类型、地址、命令、长度、数据 genPkt.addSubPkt(0x01, 0, 0x180, 0x0, 128, None) @@ -2566,7 +2485,6 @@ def tc29(): +genMessageCode("--清除中断") +genIFRwDataCode(0, 0x78, True, 4, [0xff, 0xff, 0xff, 0xff]) ) ->>>>>>> mp_eb_dev genPkt.addAfterExc(genWriteTransLenCode(gen_file_def, sm_idx) +genWriteTransPktCode(gen_file_def, sm_idx) @@ -2594,20 +2512,7 @@ def tc29(): +genIFRwDataCode(3, 0x74, False, 4) +genIFRwDataCode(4, 0x74, False, 4) -<<<<<<< HEAD - +genMessageCode("--读取数据") - +genIFRwDataCode(1, 0x800, False, data_len) - +genIFRwDataCode(2, 0x800, False, data_len) - +genIFRwDataCode(3, 0x800, False, data_len) - +genIFRwDataCode(4, 0x800, False, data_len) - +genTcEndFrameCode(gen_file_def)) genPkt.gen("./generated/shin/%s.vh"%(gen_file_def, ), 1) return gen_file_def -======= - +genTcEndFrameCode(gen_file_def)) - genPkt.gen("./generated/shin/%s.vh"%(gen_file_def, ), 1) - - return gen_file_def ->>>>>>> mp_eb_dev diff --git a/tb/shinTest/testcase/environment.py b/tb/shinTest/testcase/environment.py index 07b2e2d..bdf4d14 100644 --- a/tb/shinTest/testcase/environment.py +++ b/tb/shinTest/testcase/environment.py @@ -184,23 +184,15 @@ def __GenDevice(id, TerminateNode = False, diffclk = False): dout_code = "" din_code = "1'b0" - - #clk = "clock" clk = "multiCLK[0]" multiclk = "multiCLK" if diffclk: - #clk = "clock2" clk = "multiCLK2[0]" multiclk = "multiCLK2" code_device = ("\tShinTop s_ShinTop_slv%d(\n"%(id, ) -<<<<<<< HEAD - +"\t.clock(%s),\n"%(clk, ) - +"\t.reset(reset | isSoftReset[%d]),\n\n"%(id + 1,) -======= +"\t.clock(clock),\n" +"\t.reset(reset | isSoftReset_reg[%d]),\n\n"%(id + 1,) ->>>>>>> mp_eb_dev +"\t.io_multiCLK_0(%s[0]),\n"%(multiclk, ) +"\t.io_multiCLK_1(%s[1]),\n"%(multiclk, )