From e4672915e6214fefb3394951d8e88e185c4b5d8d Mon Sep 17 00:00:00 2001 From: Alex Forencich Date: Wed, 13 Jun 2018 22:43:11 -0700 Subject: [PATCH] Update testbenches to use instances() --- example/ATLYS/fpga/tb/test_fpga_core.py | 2 +- example/DE5-Net/fpga/tb/test_fpga_core.py | 2 +- example/HXT100G/fpga/tb/test_fpga_core.py | 9 +-------- example/HXT100G/fpga_cxpt16/tb/test_fpga_core.py | 9 +-------- example/ML605/fpga_gmii/tb/test_fpga_core.py | 2 +- example/ML605/fpga_rgmii/tb/test_fpga_core.py | 2 +- example/ML605/fpga_sgmii/tb/test_fpga_core.py | 2 +- example/NexysVideo/fpga/tb/test_fpga_core.py | 2 +- example/VCU108/fpga_10g/tb/test_fpga_core.py | 2 +- example/VCU108/fpga_1g/tb/test_fpga_core.py | 2 +- example/VCU118/fpga_1g/tb/test_fpga_core.py | 2 +- tb/arp_ep.py | 4 ++-- tb/eth_ep.py | 4 ++-- tb/gmii_ep.py | 4 ++-- tb/ip_ep.py | 4 ++-- tb/rgmii_ep.py | 4 ++-- tb/test_arp.py | 2 +- tb/test_arp_64.py | 2 +- tb/test_arp_cache.py | 2 +- tb/test_arp_eth_rx.py | 2 +- tb/test_arp_eth_rx_64.py | 2 +- tb/test_arp_eth_tx.py | 2 +- tb/test_arp_eth_tx_64.py | 2 +- tb/test_axis_eth_fcs.py | 2 +- tb/test_axis_eth_fcs_64.py | 2 +- tb/test_axis_eth_fcs_check.py | 2 +- tb/test_axis_eth_fcs_check_64.py | 2 +- tb/test_axis_eth_fcs_insert.py | 2 +- tb/test_axis_eth_fcs_insert_64.py | 2 +- tb/test_axis_eth_fcs_insert_64_pad.py | 2 +- tb/test_axis_eth_fcs_insert_pad.py | 2 +- tb/test_axis_gmii_rx.py | 2 +- tb/test_axis_gmii_tx.py | 2 +- tb/test_eth_arb_mux_4.py | 2 +- tb/test_eth_arb_mux_64_4.py | 2 +- tb/test_eth_axis_rx.py | 2 +- tb/test_eth_axis_rx_64.py | 2 +- tb/test_eth_axis_tx.py | 2 +- tb/test_eth_axis_tx_64.py | 2 +- tb/test_eth_demux_4.py | 2 +- tb/test_eth_demux_64_4.py | 2 +- tb/test_eth_mac_10g.py | 2 +- tb/test_eth_mac_10g_fifo.py | 2 +- tb/test_eth_mac_10g_rx.py | 2 +- tb/test_eth_mac_10g_tx.py | 2 +- tb/test_eth_mac_1g.py | 2 +- tb/test_eth_mac_1g_fifo.py | 2 +- tb/test_eth_mac_1g_gmii.py | 2 +- tb/test_eth_mac_1g_gmii_fifo.py | 2 +- tb/test_eth_mac_1g_rgmii.py | 2 +- tb/test_eth_mac_1g_rgmii_fifo.py | 2 +- tb/test_eth_mac_1g_rx.py | 2 +- tb/test_eth_mac_1g_tx.py | 2 +- tb/test_eth_mux_4.py | 2 +- tb/test_eth_mux_64_4.py | 2 +- tb/test_ip.py | 2 +- tb/test_ip_64.py | 2 +- tb/test_ip_arb_mux_4.py | 2 +- tb/test_ip_arb_mux_64_4.py | 2 +- tb/test_ip_complete.py | 2 +- tb/test_ip_complete_64.py | 2 +- tb/test_ip_demux_4.py | 2 +- tb/test_ip_demux_64_4.py | 2 +- tb/test_ip_eth_rx.py | 2 +- tb/test_ip_eth_rx_64.py | 2 +- tb/test_ip_eth_tx.py | 2 +- tb/test_ip_eth_tx_64.py | 2 +- tb/test_ip_mux_4.py | 2 +- tb/test_ip_mux_64_4.py | 2 +- tb/test_udp.py | 2 +- tb/test_udp_64.py | 2 +- tb/test_udp_arb_mux_4.py | 2 +- tb/test_udp_arb_mux_64_4.py | 2 +- tb/test_udp_checksum_gen.py | 2 +- tb/test_udp_checksum_gen_64.py | 2 +- tb/test_udp_complete.py | 2 +- tb/test_udp_complete_64.py | 2 +- tb/test_udp_demux_4.py | 2 +- tb/test_udp_demux_64_4.py | 2 +- tb/test_udp_ip_rx.py | 2 +- tb/test_udp_ip_rx_64.py | 2 +- tb/test_udp_ip_tx.py | 2 +- tb/test_udp_ip_tx_64.py | 2 +- tb/test_udp_mux_4.py | 2 +- tb/test_udp_mux_64_4.py | 2 +- tb/udp_ep.py | 4 ++-- tb/xgmii_ep.py | 4 ++-- 87 files changed, 94 insertions(+), 108 deletions(-) diff --git a/example/ATLYS/fpga/tb/test_fpga_core.py b/example/ATLYS/fpga/tb/test_fpga_core.py index 7cc6dbb38..9a4eaa413 100755 --- a/example/ATLYS/fpga/tb/test_fpga_core.py +++ b/example/ATLYS/fpga/tb/test_fpga_core.py @@ -301,7 +301,7 @@ def bench(): raise StopSimulation - return dut, gmii_source_logic, gmii_sink_logic, clkgen, rx_clk_gen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/example/DE5-Net/fpga/tb/test_fpga_core.py b/example/DE5-Net/fpga/tb/test_fpga_core.py index c1eb15068..56ded4c0f 100755 --- a/example/DE5-Net/fpga/tb/test_fpga_core.py +++ b/example/DE5-Net/fpga/tb/test_fpga_core.py @@ -293,7 +293,7 @@ def bench(): raise StopSimulation - return dut, sfp_a_source_logic, sfp_a_sink_logic, sfp_b_source_logic, sfp_b_sink_logic, sfp_c_source_logic, sfp_c_sink_logic, sfp_d_source_logic, sfp_d_sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/example/HXT100G/fpga/tb/test_fpga_core.py b/example/HXT100G/fpga/tb/test_fpga_core.py index 21e9b971d..024c6957b 100755 --- a/example/HXT100G/fpga/tb/test_fpga_core.py +++ b/example/HXT100G/fpga/tb/test_fpga_core.py @@ -601,14 +601,7 @@ def bench(): raise StopSimulation - return (dut, clkgen, check, eth_r0_source_logic, eth_r0_sink_logic, eth_r1_source_logic, eth_r1_sink_logic, eth_r2_source_logic, eth_r2_sink_logic, - eth_r3_source_logic, eth_r3_sink_logic, eth_r4_source_logic, eth_r4_sink_logic, eth_r5_source_logic, eth_r5_sink_logic, - eth_r6_source_logic, eth_r6_sink_logic, eth_r7_source_logic, eth_r7_sink_logic, eth_r8_source_logic, eth_r8_sink_logic, - eth_r9_source_logic, eth_r9_sink_logic, eth_r10_source_logic, eth_r10_sink_logic, eth_r11_source_logic, eth_r11_sink_logic, - eth_l0_source_logic, eth_l0_sink_logic, eth_l1_source_logic, eth_l1_sink_logic, eth_l2_source_logic, eth_l2_sink_logic, - eth_l3_source_logic, eth_l3_sink_logic, eth_l4_source_logic, eth_l4_sink_logic, eth_l5_source_logic, eth_l5_sink_logic, - eth_l6_source_logic, eth_l6_sink_logic, eth_l7_source_logic, eth_l7_sink_logic, eth_l8_source_logic, eth_l8_sink_logic, - eth_l9_source_logic, eth_l9_sink_logic, eth_l10_source_logic, eth_l10_sink_logic, eth_l11_source_logic, eth_l11_sink_logic) + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/example/HXT100G/fpga_cxpt16/tb/test_fpga_core.py b/example/HXT100G/fpga_cxpt16/tb/test_fpga_core.py index 98b826015..b2a1cd1a8 100755 --- a/example/HXT100G/fpga_cxpt16/tb/test_fpga_core.py +++ b/example/HXT100G/fpga_cxpt16/tb/test_fpga_core.py @@ -533,14 +533,7 @@ def bench(): raise StopSimulation - return (dut, clkgen, check, eth_r0_source_logic, eth_r0_sink_logic, eth_r1_source_logic, eth_r1_sink_logic, eth_r2_source_logic, eth_r2_sink_logic, - eth_r3_source_logic, eth_r3_sink_logic, eth_r4_source_logic, eth_r4_sink_logic, eth_r5_source_logic, eth_r5_sink_logic, - eth_r6_source_logic, eth_r6_sink_logic, eth_r7_source_logic, eth_r7_sink_logic, eth_r8_source_logic, eth_r8_sink_logic, - eth_r9_source_logic, eth_r9_sink_logic, eth_r10_source_logic, eth_r10_sink_logic, eth_r11_source_logic, eth_r11_sink_logic, - eth_l0_source_logic, eth_l0_sink_logic, eth_l1_source_logic, eth_l1_sink_logic, eth_l2_source_logic, eth_l2_sink_logic, - eth_l3_source_logic, eth_l3_sink_logic, eth_l4_source_logic, eth_l4_sink_logic, eth_l5_source_logic, eth_l5_sink_logic, - eth_l6_source_logic, eth_l6_sink_logic, eth_l7_source_logic, eth_l7_sink_logic, eth_l8_source_logic, eth_l8_sink_logic, - eth_l9_source_logic, eth_l9_sink_logic, eth_l10_source_logic, eth_l10_sink_logic, eth_l11_source_logic, eth_l11_sink_logic) + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/example/ML605/fpga_gmii/tb/test_fpga_core.py b/example/ML605/fpga_gmii/tb/test_fpga_core.py index cfc769658..b4c0cf27b 100755 --- a/example/ML605/fpga_gmii/tb/test_fpga_core.py +++ b/example/ML605/fpga_gmii/tb/test_fpga_core.py @@ -320,7 +320,7 @@ def bench(): raise StopSimulation - return dut, gmii_source_logic, gmii_sink_logic, clkgen, rx_clk_gen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/example/ML605/fpga_rgmii/tb/test_fpga_core.py b/example/ML605/fpga_rgmii/tb/test_fpga_core.py index 544dc88e6..4847fe10e 100755 --- a/example/ML605/fpga_rgmii/tb/test_fpga_core.py +++ b/example/ML605/fpga_rgmii/tb/test_fpga_core.py @@ -320,7 +320,7 @@ def bench(): raise StopSimulation - return dut, rgmii_source_logic, rgmii_sink_logic, clkgen, clkgen2, rx_clk_gen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/example/ML605/fpga_sgmii/tb/test_fpga_core.py b/example/ML605/fpga_sgmii/tb/test_fpga_core.py index 16c4495ec..32db62f37 100755 --- a/example/ML605/fpga_sgmii/tb/test_fpga_core.py +++ b/example/ML605/fpga_sgmii/tb/test_fpga_core.py @@ -317,7 +317,7 @@ def bench(): raise StopSimulation - return dut, gmii_source_logic, gmii_sink_logic, clkgen, clk_enable_gen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/example/NexysVideo/fpga/tb/test_fpga_core.py b/example/NexysVideo/fpga/tb/test_fpga_core.py index b0ab838c9..b42e78d2f 100755 --- a/example/NexysVideo/fpga/tb/test_fpga_core.py +++ b/example/NexysVideo/fpga/tb/test_fpga_core.py @@ -305,7 +305,7 @@ def bench(): raise StopSimulation - return dut, rgmii_source_logic, rgmii_sink_logic, clkgen, clkgen2, rx_clk_gen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/example/VCU108/fpga_10g/tb/test_fpga_core.py b/example/VCU108/fpga_10g/tb/test_fpga_core.py index 061c65f3f..f16c8cb44 100755 --- a/example/VCU108/fpga_10g/tb/test_fpga_core.py +++ b/example/VCU108/fpga_10g/tb/test_fpga_core.py @@ -511,7 +511,7 @@ def bench(): raise StopSimulation - return dut, qsfp_1_source_logic, qsfp_1_sink_logic, qsfp_2_source_logic, qsfp_2_sink_logic, qsfp_3_source_logic, qsfp_3_sink_logic, qsfp_4_source_logic, qsfp_4_sink_logic, gmii_source_logic, gmii_sink_logic, clkgen, clk_enable_gen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/example/VCU108/fpga_1g/tb/test_fpga_core.py b/example/VCU108/fpga_1g/tb/test_fpga_core.py index 0302962b2..91a778681 100755 --- a/example/VCU108/fpga_1g/tb/test_fpga_core.py +++ b/example/VCU108/fpga_1g/tb/test_fpga_core.py @@ -304,7 +304,7 @@ def bench(): raise StopSimulation - return dut, gmii_source_logic, gmii_sink_logic, clkgen, clk_enable_gen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/example/VCU118/fpga_1g/tb/test_fpga_core.py b/example/VCU118/fpga_1g/tb/test_fpga_core.py index 0302962b2..91a778681 100755 --- a/example/VCU118/fpga_1g/tb/test_fpga_core.py +++ b/example/VCU118/fpga_1g/tb/test_fpga_core.py @@ -304,7 +304,7 @@ def bench(): raise StopSimulation - return dut, gmii_source_logic, gmii_sink_logic, clkgen, clk_enable_gen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/arp_ep.py b/tb/arp_ep.py index 9f07516bf..9e1eb576d 100644 --- a/tb/arp_ep.py +++ b/tb/arp_ep.py @@ -236,7 +236,7 @@ class ARPFrameSource(): frame_valid_int.next = True - return logic, pause_logic + return instances() class ARPFrameSink(): @@ -316,5 +316,5 @@ class ARPFrameSink(): if name is not None: print("[%s] Got frame %s" % (name, repr(frame))) - return logic, pause_logic + return instances() diff --git a/tb/eth_ep.py b/tb/eth_ep.py index 0949454d7..893989498 100644 --- a/tb/eth_ep.py +++ b/tb/eth_ep.py @@ -204,7 +204,7 @@ class EthFrameSource(): eth_hdr_valid_int.next = True - return logic, pause_logic, eth_payload_source + return instances() class EthFrameSink(): @@ -295,5 +295,5 @@ class EthFrameSink(): if name is not None: print("[%s] Got frame %s" % (name, repr(frame))) - return logic, pause_logic, eth_payload_sink + return instances() diff --git a/tb/gmii_ep.py b/tb/gmii_ep.py index fb53b2ba1..f7beca920 100644 --- a/tb/gmii_ep.py +++ b/tb/gmii_ep.py @@ -172,7 +172,7 @@ class GMIISource(object): tx_er.next = 0 tx_en.next = 0 - return logic + return instances() class GMIISink(object): @@ -261,5 +261,5 @@ class GMIISink(object): d = [] er = [] - return logic + return instances() diff --git a/tb/ip_ep.py b/tb/ip_ep.py index 1f8c41387..26937a9d5 100644 --- a/tb/ip_ep.py +++ b/tb/ip_ep.py @@ -356,7 +356,7 @@ class IPFrameSource(): self.header_queue.append(frame) self.payload_source.send(frame.payload) - return logic, pause_logic, ip_payload_source + return instances() class IPFrameSink(): @@ -476,5 +476,5 @@ class IPFrameSink(): if len(self.header_queue) == 0: assert self.payload_sink.empty() - return logic, pause_logic, ip_payload_sink + return instances() diff --git a/tb/rgmii_ep.py b/tb/rgmii_ep.py index 3a46ba0cf..705b098c0 100644 --- a/tb/rgmii_ep.py +++ b/tb/rgmii_ep.py @@ -63,7 +63,7 @@ class RGMIISource(gmii_ep.GMIISource): gmii_tx_en_reg.next = gmii_tx_en gmii_tx_er_reg.next = gmii_tx_er - return gmii_source, logic + return instances() class RGMIISink(gmii_ep.GMIISink): @@ -102,5 +102,5 @@ class RGMIISink(gmii_ep.GMIISink): dat |= int(rxd.val) << 4 ctl2 = int(rx_ctl.val) - return gmii_sink, logic + return instances() diff --git a/tb/test_arp.py b/tb/test_arp.py index f7d86a53b..465bfe637 100755 --- a/tb/test_arp.py +++ b/tb/test_arp.py @@ -435,7 +435,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_arp_64.py b/tb/test_arp_64.py index 2f6c763d1..3357ee134 100755 --- a/tb/test_arp_64.py +++ b/tb/test_arp_64.py @@ -441,7 +441,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_arp_cache.py b/tb/test_arp_cache.py index a956d9b09..af268d44e 100755 --- a/tb/test_arp_cache.py +++ b/tb/test_arp_cache.py @@ -504,7 +504,7 @@ def bench(): raise StopSimulation - return dut, clkgen, check + return instances() def test_bench(): os.chdir(os.path.dirname(os.path.abspath(__file__))) diff --git a/tb/test_arp_eth_rx.py b/tb/test_arp_eth_rx.py index 64cc9bf1f..5641166c1 100755 --- a/tb/test_arp_eth_rx.py +++ b/tb/test_arp_eth_rx.py @@ -537,7 +537,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_arp_eth_rx_64.py b/tb/test_arp_eth_rx_64.py index a15b2eef4..97bc0ea0d 100755 --- a/tb/test_arp_eth_rx_64.py +++ b/tb/test_arp_eth_rx_64.py @@ -540,7 +540,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_arp_eth_tx.py b/tb/test_arp_eth_tx.py index 27ad7c2fe..e8751f946 100755 --- a/tb/test_arp_eth_tx.py +++ b/tb/test_arp_eth_tx.py @@ -357,7 +357,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_arp_eth_tx_64.py b/tb/test_arp_eth_tx_64.py index 47e34e744..c8c9a6926 100755 --- a/tb/test_arp_eth_tx_64.py +++ b/tb/test_arp_eth_tx_64.py @@ -360,7 +360,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_axis_eth_fcs.py b/tb/test_axis_eth_fcs.py index 4952c827f..906a3fb49 100755 --- a/tb/test_axis_eth_fcs.py +++ b/tb/test_axis_eth_fcs.py @@ -145,7 +145,7 @@ def bench(): raise StopSimulation - return dut, source_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_axis_eth_fcs_64.py b/tb/test_axis_eth_fcs_64.py index 8da4ae571..c89e5c9c9 100755 --- a/tb/test_axis_eth_fcs_64.py +++ b/tb/test_axis_eth_fcs_64.py @@ -148,7 +148,7 @@ def bench(): raise StopSimulation - return dut, source_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_axis_eth_fcs_check.py b/tb/test_axis_eth_fcs_check.py index 8baec66e3..a45f05576 100755 --- a/tb/test_axis_eth_fcs_check.py +++ b/tb/test_axis_eth_fcs_check.py @@ -401,7 +401,7 @@ def bench(): raise StopSimulation - return dut, monitor, source_logic, sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_axis_eth_fcs_check_64.py b/tb/test_axis_eth_fcs_check_64.py index c8fd9a377..9a0e684c6 100755 --- a/tb/test_axis_eth_fcs_check_64.py +++ b/tb/test_axis_eth_fcs_check_64.py @@ -407,7 +407,7 @@ def bench(): raise StopSimulation - return dut, monitor, source_logic, sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_axis_eth_fcs_insert.py b/tb/test_axis_eth_fcs_insert.py index 7224cd89f..139c14144 100755 --- a/tb/test_axis_eth_fcs_insert.py +++ b/tb/test_axis_eth_fcs_insert.py @@ -368,7 +368,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_axis_eth_fcs_insert_64.py b/tb/test_axis_eth_fcs_insert_64.py index eb0983b06..69abd9d89 100755 --- a/tb/test_axis_eth_fcs_insert_64.py +++ b/tb/test_axis_eth_fcs_insert_64.py @@ -374,7 +374,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_axis_eth_fcs_insert_64_pad.py b/tb/test_axis_eth_fcs_insert_64_pad.py index 4d4ea070f..84ce34065 100755 --- a/tb/test_axis_eth_fcs_insert_64_pad.py +++ b/tb/test_axis_eth_fcs_insert_64_pad.py @@ -375,7 +375,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_axis_eth_fcs_insert_pad.py b/tb/test_axis_eth_fcs_insert_pad.py index e9d877a12..aa2123e6e 100755 --- a/tb/test_axis_eth_fcs_insert_pad.py +++ b/tb/test_axis_eth_fcs_insert_pad.py @@ -369,7 +369,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_axis_gmii_rx.py b/tb/test_axis_gmii_rx.py index 71e743d0c..a94e57df6 100755 --- a/tb/test_axis_gmii_rx.py +++ b/tb/test_axis_gmii_rx.py @@ -419,7 +419,7 @@ def bench(): raise StopSimulation - return dut, monitor, source_logic, sink_logic, clkgen, clk_enable_gen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_axis_gmii_tx.py b/tb/test_axis_gmii_tx.py index 895095252..dc3c064f7 100755 --- a/tb/test_axis_gmii_tx.py +++ b/tb/test_axis_gmii_tx.py @@ -371,7 +371,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, clk_enable_gen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_eth_arb_mux_4.py b/tb/test_eth_arb_mux_4.py index 3a1788e3d..f8bf12aa9 100755 --- a/tb/test_eth_arb_mux_4.py +++ b/tb/test_eth_arb_mux_4.py @@ -554,7 +554,7 @@ def bench(): raise StopSimulation - return dut, source_0_logic, source_1_logic, source_2_logic, source_3_logic, sink_logic, clkgen, check + return instances() def test_bench(): os.chdir(os.path.dirname(os.path.abspath(__file__))) diff --git a/tb/test_eth_arb_mux_64_4.py b/tb/test_eth_arb_mux_64_4.py index f91254821..ded2000ae 100755 --- a/tb/test_eth_arb_mux_64_4.py +++ b/tb/test_eth_arb_mux_64_4.py @@ -569,7 +569,7 @@ def bench(): raise StopSimulation - return dut, source_0_logic, source_1_logic, source_2_logic, source_3_logic, sink_logic, clkgen, check + return instances() def test_bench(): os.chdir(os.path.dirname(os.path.abspath(__file__))) diff --git a/tb/test_eth_axis_rx.py b/tb/test_eth_axis_rx.py index 1901478cc..a6af9d50e 100755 --- a/tb/test_eth_axis_rx.py +++ b/tb/test_eth_axis_rx.py @@ -346,7 +346,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, monitor, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_eth_axis_rx_64.py b/tb/test_eth_axis_rx_64.py index b1fae272b..5eccee574 100755 --- a/tb/test_eth_axis_rx_64.py +++ b/tb/test_eth_axis_rx_64.py @@ -352,7 +352,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, monitor, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_eth_axis_tx.py b/tb/test_eth_axis_tx.py index d19eb90a1..254f7ef1f 100755 --- a/tb/test_eth_axis_tx.py +++ b/tb/test_eth_axis_tx.py @@ -299,7 +299,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_eth_axis_tx_64.py b/tb/test_eth_axis_tx_64.py index 70e1ed769..332c626d8 100755 --- a/tb/test_eth_axis_tx_64.py +++ b/tb/test_eth_axis_tx_64.py @@ -305,7 +305,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_eth_demux_4.py b/tb/test_eth_demux_4.py index 905b58993..36915abbd 100755 --- a/tb/test_eth_demux_4.py +++ b/tb/test_eth_demux_4.py @@ -508,7 +508,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_0_logic, sink_1_logic, sink_2_logic, sink_3_logic, clkgen, check + return instances() def test_bench(): os.chdir(os.path.dirname(os.path.abspath(__file__))) diff --git a/tb/test_eth_demux_64_4.py b/tb/test_eth_demux_64_4.py index 56ad331af..19f446f1c 100755 --- a/tb/test_eth_demux_64_4.py +++ b/tb/test_eth_demux_64_4.py @@ -523,7 +523,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_0_logic, sink_1_logic, sink_2_logic, sink_3_logic, clkgen, check + return instances() def test_bench(): os.chdir(os.path.dirname(os.path.abspath(__file__))) diff --git a/tb/test_eth_mac_10g.py b/tb/test_eth_mac_10g.py index 42f8510a6..bda37312c 100755 --- a/tb/test_eth_mac_10g.py +++ b/tb/test_eth_mac_10g.py @@ -275,7 +275,7 @@ def bench(): raise StopSimulation - return dut, axis_source_logic, axis_sink_logic, xgmii_source_logic, xgmii_sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_eth_mac_10g_fifo.py b/tb/test_eth_mac_10g_fifo.py index 3ff39da69..0194e818d 100755 --- a/tb/test_eth_mac_10g_fifo.py +++ b/tb/test_eth_mac_10g_fifo.py @@ -313,7 +313,7 @@ def bench(): raise StopSimulation - return dut, axis_source_logic, axis_sink_logic, xgmii_source_logic, xgmii_sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_eth_mac_10g_rx.py b/tb/test_eth_mac_10g_rx.py index 15a173cff..290fe5d2e 100755 --- a/tb/test_eth_mac_10g_rx.py +++ b/tb/test_eth_mac_10g_rx.py @@ -399,7 +399,7 @@ def bench(): raise StopSimulation - return dut, monitor, source_logic, sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_eth_mac_10g_tx.py b/tb/test_eth_mac_10g_tx.py index 665a10a79..06c35d61a 100755 --- a/tb/test_eth_mac_10g_tx.py +++ b/tb/test_eth_mac_10g_tx.py @@ -345,7 +345,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_eth_mac_1g.py b/tb/test_eth_mac_1g.py index 06cf5fe62..8ec119549 100755 --- a/tb/test_eth_mac_1g.py +++ b/tb/test_eth_mac_1g.py @@ -327,7 +327,7 @@ def bench(): raise StopSimulation - return dut, monitor, axis_source_logic, axis_sink_logic, gmii_source_logic, gmii_sink_logic, clkgen, clk_enable_gen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_eth_mac_1g_fifo.py b/tb/test_eth_mac_1g_fifo.py index b324bf018..2681fde7d 100755 --- a/tb/test_eth_mac_1g_fifo.py +++ b/tb/test_eth_mac_1g_fifo.py @@ -358,7 +358,7 @@ def bench(): raise StopSimulation - return dut, monitor, axis_source_logic, axis_sink_logic, gmii_source_logic, gmii_sink_logic, clkgen, clk_enable_gen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_eth_mac_1g_gmii.py b/tb/test_eth_mac_1g_gmii.py index 088e689c1..294cd9ba2 100755 --- a/tb/test_eth_mac_1g_gmii.py +++ b/tb/test_eth_mac_1g_gmii.py @@ -331,7 +331,7 @@ def bench(): raise StopSimulation - return dut, monitor, axis_source_logic, axis_sink_logic, gmii_source_logic, gmii_sink_logic, clkgen, rx_clk_gen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_eth_mac_1g_gmii_fifo.py b/tb/test_eth_mac_1g_gmii_fifo.py index 903d75396..8dda57731 100755 --- a/tb/test_eth_mac_1g_gmii_fifo.py +++ b/tb/test_eth_mac_1g_gmii_fifo.py @@ -355,7 +355,7 @@ def bench(): raise StopSimulation - return dut, monitor, axis_source_logic, axis_sink_logic, gmii_source_logic, gmii_sink_logic, clkgen, rx_clk_gen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_eth_mac_1g_rgmii.py b/tb/test_eth_mac_1g_rgmii.py index c7fd94f02..e0060c951 100755 --- a/tb/test_eth_mac_1g_rgmii.py +++ b/tb/test_eth_mac_1g_rgmii.py @@ -333,7 +333,7 @@ def bench(): raise StopSimulation - return dut, monitor, axis_source_logic, axis_sink_logic, rgmii_source_logic, rgmii_sink_logic, clkgen, clkgen2, rx_clk_gen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_eth_mac_1g_rgmii_fifo.py b/tb/test_eth_mac_1g_rgmii_fifo.py index 01d9ec447..111c22f37 100755 --- a/tb/test_eth_mac_1g_rgmii_fifo.py +++ b/tb/test_eth_mac_1g_rgmii_fifo.py @@ -356,7 +356,7 @@ def bench(): raise StopSimulation - return dut, monitor, axis_source_logic, axis_sink_logic, rgmii_source_logic, rgmii_sink_logic, clkgen, clkgen2, rx_clk_gen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_eth_mac_1g_rx.py b/tb/test_eth_mac_1g_rx.py index abf1c088d..cfd1c1a0a 100755 --- a/tb/test_eth_mac_1g_rx.py +++ b/tb/test_eth_mac_1g_rx.py @@ -366,7 +366,7 @@ def bench(): raise StopSimulation - return dut, monitor, source_logic, sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_eth_mac_1g_tx.py b/tb/test_eth_mac_1g_tx.py index 5bda44da1..62c3f111d 100755 --- a/tb/test_eth_mac_1g_tx.py +++ b/tb/test_eth_mac_1g_tx.py @@ -316,7 +316,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_eth_mux_4.py b/tb/test_eth_mux_4.py index c8adc4b90..d3dd3cfc2 100755 --- a/tb/test_eth_mux_4.py +++ b/tb/test_eth_mux_4.py @@ -515,7 +515,7 @@ def bench(): raise StopSimulation - return dut, source_0_logic, source_1_logic, source_2_logic, source_3_logic, sink_logic, clkgen, check + return instances() def test_bench(): os.chdir(os.path.dirname(os.path.abspath(__file__))) diff --git a/tb/test_eth_mux_64_4.py b/tb/test_eth_mux_64_4.py index 61b9860a9..8d0128518 100755 --- a/tb/test_eth_mux_64_4.py +++ b/tb/test_eth_mux_64_4.py @@ -530,7 +530,7 @@ def bench(): raise StopSimulation - return dut, source_0_logic, source_1_logic, source_2_logic, source_3_logic, sink_logic, clkgen, check + return instances() def test_bench(): os.chdir(os.path.dirname(os.path.abspath(__file__))) diff --git a/tb/test_ip.py b/tb/test_ip.py index 2bc39b5c8..fcfdd26f1 100755 --- a/tb/test_ip.py +++ b/tb/test_ip.py @@ -524,7 +524,7 @@ def bench(): raise StopSimulation - return dut, eth_source_logic, eth_sink_logic, ip_source_logic, ip_sink_logic, clkgen, arp_emu, monitor, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_ip_64.py b/tb/test_ip_64.py index 450004847..a1e5299c0 100755 --- a/tb/test_ip_64.py +++ b/tb/test_ip_64.py @@ -536,7 +536,7 @@ def bench(): raise StopSimulation - return dut, eth_source_logic, eth_sink_logic, ip_source_logic, ip_sink_logic, clkgen, arp_emu, monitor, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_ip_arb_mux_4.py b/tb/test_ip_arb_mux_4.py index 8418ad7e0..54d03d09f 100755 --- a/tb/test_ip_arb_mux_4.py +++ b/tb/test_ip_arb_mux_4.py @@ -917,7 +917,7 @@ def bench(): raise StopSimulation - return dut, source_0_logic, source_1_logic, source_2_logic, source_3_logic, sink_logic, clkgen, check + return instances() def test_bench(): os.chdir(os.path.dirname(os.path.abspath(__file__))) diff --git a/tb/test_ip_arb_mux_64_4.py b/tb/test_ip_arb_mux_64_4.py index b1ca7e6da..ea0746139 100755 --- a/tb/test_ip_arb_mux_64_4.py +++ b/tb/test_ip_arb_mux_64_4.py @@ -932,7 +932,7 @@ def bench(): raise StopSimulation - return dut, source_0_logic, source_1_logic, source_2_logic, source_3_logic, sink_logic, clkgen, check + return instances() def test_bench(): os.chdir(os.path.dirname(os.path.abspath(__file__))) diff --git a/tb/test_ip_complete.py b/tb/test_ip_complete.py index 12a54e554..1a17adeb6 100755 --- a/tb/test_ip_complete.py +++ b/tb/test_ip_complete.py @@ -572,7 +572,7 @@ def bench(): raise StopSimulation - return dut, eth_source_logic, eth_sink_logic, ip_source_logic, ip_sink_logic, clkgen, monitor, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_ip_complete_64.py b/tb/test_ip_complete_64.py index e2164bd40..0923d7719 100755 --- a/tb/test_ip_complete_64.py +++ b/tb/test_ip_complete_64.py @@ -584,7 +584,7 @@ def bench(): raise StopSimulation - return dut, eth_source_logic, eth_sink_logic, ip_source_logic, ip_sink_logic, clkgen, monitor, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_ip_demux_4.py b/tb/test_ip_demux_4.py index 4016c13f7..d3efa6c76 100755 --- a/tb/test_ip_demux_4.py +++ b/tb/test_ip_demux_4.py @@ -843,7 +843,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_0_logic, sink_1_logic, sink_2_logic, sink_3_logic, clkgen, check + return instances() def test_bench(): os.chdir(os.path.dirname(os.path.abspath(__file__))) diff --git a/tb/test_ip_demux_64_4.py b/tb/test_ip_demux_64_4.py index 051c833d1..7dbed7897 100755 --- a/tb/test_ip_demux_64_4.py +++ b/tb/test_ip_demux_64_4.py @@ -858,7 +858,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_0_logic, sink_1_logic, sink_2_logic, sink_3_logic, clkgen, check + return instances() def test_bench(): os.chdir(os.path.dirname(os.path.abspath(__file__))) diff --git a/tb/test_ip_eth_rx.py b/tb/test_ip_eth_rx.py index 71d9169c1..9cdbed496 100755 --- a/tb/test_ip_eth_rx.py +++ b/tb/test_ip_eth_rx.py @@ -1048,7 +1048,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, monitor, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_ip_eth_rx_64.py b/tb/test_ip_eth_rx_64.py index 3561148f8..941af90a7 100755 --- a/tb/test_ip_eth_rx_64.py +++ b/tb/test_ip_eth_rx_64.py @@ -1054,7 +1054,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, monitor, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_ip_eth_tx.py b/tb/test_ip_eth_tx.py index fe5836451..64f5012a5 100755 --- a/tb/test_ip_eth_tx.py +++ b/tb/test_ip_eth_tx.py @@ -849,7 +849,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, monitor, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_ip_eth_tx_64.py b/tb/test_ip_eth_tx_64.py index 3cf9a8030..664a0b481 100755 --- a/tb/test_ip_eth_tx_64.py +++ b/tb/test_ip_eth_tx_64.py @@ -855,7 +855,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, monitor, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_ip_mux_4.py b/tb/test_ip_mux_4.py index bea4aa1cf..d0feab038 100755 --- a/tb/test_ip_mux_4.py +++ b/tb/test_ip_mux_4.py @@ -850,7 +850,7 @@ def bench(): raise StopSimulation - return dut, source_0_logic, source_1_logic, source_2_logic, source_3_logic, sink_logic, clkgen, check + return instances() def test_bench(): os.chdir(os.path.dirname(os.path.abspath(__file__))) diff --git a/tb/test_ip_mux_64_4.py b/tb/test_ip_mux_64_4.py index 5cd32314a..c8509a690 100755 --- a/tb/test_ip_mux_64_4.py +++ b/tb/test_ip_mux_64_4.py @@ -865,7 +865,7 @@ def bench(): raise StopSimulation - return dut, source_0_logic, source_1_logic, source_2_logic, source_3_logic, sink_logic, clkgen, check + return instances() def test_bench(): os.chdir(os.path.dirname(os.path.abspath(__file__))) diff --git a/tb/test_udp.py b/tb/test_udp.py index 584ff07b1..a6e395c5d 100755 --- a/tb/test_udp.py +++ b/tb/test_udp.py @@ -556,7 +556,7 @@ def bench(): raise StopSimulation - return dut, ip_source_logic, ip_sink_logic, udp_source_logic, udp_sink_logic, clkgen, monitor, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_udp_64.py b/tb/test_udp_64.py index e9fe9b25d..f8d4e75d9 100755 --- a/tb/test_udp_64.py +++ b/tb/test_udp_64.py @@ -568,7 +568,7 @@ def bench(): raise StopSimulation - return dut, ip_source_logic, ip_sink_logic, udp_source_logic, udp_sink_logic, clkgen, monitor, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_udp_arb_mux_4.py b/tb/test_udp_arb_mux_4.py index 96ed5176e..4792317ed 100755 --- a/tb/test_udp_arb_mux_4.py +++ b/tb/test_udp_arb_mux_4.py @@ -1025,7 +1025,7 @@ def bench(): raise StopSimulation - return dut, source_0_logic, source_1_logic, source_2_logic, source_3_logic, sink_logic, clkgen, check + return instances() def test_bench(): os.chdir(os.path.dirname(os.path.abspath(__file__))) diff --git a/tb/test_udp_arb_mux_64_4.py b/tb/test_udp_arb_mux_64_4.py index b090e0e84..bf9c9dbf9 100755 --- a/tb/test_udp_arb_mux_64_4.py +++ b/tb/test_udp_arb_mux_64_4.py @@ -1040,7 +1040,7 @@ def bench(): raise StopSimulation - return dut, source_0_logic, source_1_logic, source_2_logic, source_3_logic, sink_logic, clkgen, check + return instances() def test_bench(): os.chdir(os.path.dirname(os.path.abspath(__file__))) diff --git a/tb/test_udp_checksum_gen.py b/tb/test_udp_checksum_gen.py index 3c30d7584..36472b104 100755 --- a/tb/test_udp_checksum_gen.py +++ b/tb/test_udp_checksum_gen.py @@ -493,7 +493,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_udp_checksum_gen_64.py b/tb/test_udp_checksum_gen_64.py index 0fc7a62c2..b38633dfb 100755 --- a/tb/test_udp_checksum_gen_64.py +++ b/tb/test_udp_checksum_gen_64.py @@ -499,7 +499,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_udp_complete.py b/tb/test_udp_complete.py index c4ccad286..d5e880d77 100755 --- a/tb/test_udp_complete.py +++ b/tb/test_udp_complete.py @@ -853,7 +853,7 @@ def bench(): raise StopSimulation - return dut, eth_source_logic, eth_sink_logic, ip_source_logic, ip_sink_logic, udp_source_logic, udp_sink_logic, clkgen, monitor, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_udp_complete_64.py b/tb/test_udp_complete_64.py index 9da8c1b04..1c01361ca 100755 --- a/tb/test_udp_complete_64.py +++ b/tb/test_udp_complete_64.py @@ -871,7 +871,7 @@ def bench(): raise StopSimulation - return dut, eth_source_logic, eth_sink_logic, ip_source_logic, ip_sink_logic, udp_source_logic, udp_sink_logic, clkgen, monitor, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_udp_demux_4.py b/tb/test_udp_demux_4.py index 6a0a36eca..379a60d66 100755 --- a/tb/test_udp_demux_4.py +++ b/tb/test_udp_demux_4.py @@ -943,7 +943,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_0_logic, sink_1_logic, sink_2_logic, sink_3_logic, clkgen, check + return instances() def test_bench(): os.chdir(os.path.dirname(os.path.abspath(__file__))) diff --git a/tb/test_udp_demux_64_4.py b/tb/test_udp_demux_64_4.py index 0060f455a..4320d5505 100755 --- a/tb/test_udp_demux_64_4.py +++ b/tb/test_udp_demux_64_4.py @@ -958,7 +958,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_0_logic, sink_1_logic, sink_2_logic, sink_3_logic, clkgen, check + return instances() def test_bench(): os.chdir(os.path.dirname(os.path.abspath(__file__))) diff --git a/tb/test_udp_ip_rx.py b/tb/test_udp_ip_rx.py index cbe490c35..f2a7f2066 100755 --- a/tb/test_udp_ip_rx.py +++ b/tb/test_udp_ip_rx.py @@ -1034,7 +1034,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, monitor, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_udp_ip_rx_64.py b/tb/test_udp_ip_rx_64.py index 08144b687..dacc540c6 100755 --- a/tb/test_udp_ip_rx_64.py +++ b/tb/test_udp_ip_rx_64.py @@ -1040,7 +1040,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, monitor, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_udp_ip_tx.py b/tb/test_udp_ip_tx.py index a5bca5afd..c14b6e99f 100755 --- a/tb/test_udp_ip_tx.py +++ b/tb/test_udp_ip_tx.py @@ -981,7 +981,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, monitor, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_udp_ip_tx_64.py b/tb/test_udp_ip_tx_64.py index f1a7a7012..b6e427cce 100755 --- a/tb/test_udp_ip_tx_64.py +++ b/tb/test_udp_ip_tx_64.py @@ -987,7 +987,7 @@ def bench(): raise StopSimulation - return dut, source_logic, sink_logic, clkgen, monitor, check + return instances() def test_bench(): sim = Simulation(bench()) diff --git a/tb/test_udp_mux_4.py b/tb/test_udp_mux_4.py index 244da968e..d65979163 100755 --- a/tb/test_udp_mux_4.py +++ b/tb/test_udp_mux_4.py @@ -950,7 +950,7 @@ def bench(): raise StopSimulation - return dut, source_0_logic, source_1_logic, source_2_logic, source_3_logic, sink_logic, clkgen, check + return instances() def test_bench(): os.chdir(os.path.dirname(os.path.abspath(__file__))) diff --git a/tb/test_udp_mux_64_4.py b/tb/test_udp_mux_64_4.py index c1d0b4320..cff25d07e 100755 --- a/tb/test_udp_mux_64_4.py +++ b/tb/test_udp_mux_64_4.py @@ -965,7 +965,7 @@ def bench(): raise StopSimulation - return dut, source_0_logic, source_1_logic, source_2_logic, source_3_logic, sink_logic, clkgen, check + return instances() def test_bench(): os.chdir(os.path.dirname(os.path.abspath(__file__))) diff --git a/tb/udp_ep.py b/tb/udp_ep.py index 7d2b87d38..401e11317 100644 --- a/tb/udp_ep.py +++ b/tb/udp_ep.py @@ -449,7 +449,7 @@ class UDPFrameSource(): self.header_queue.append(frame) self.payload_source.send(frame.payload) - return logic, pause_logic, udp_payload_source + return instances() class UDPFrameSink(): @@ -578,5 +578,5 @@ class UDPFrameSink(): if len(self.header_queue) == 0: assert self.payload_sink.empty() - return logic, pause_logic, udp_payload_sink + return instances() diff --git a/tb/xgmii_ep.py b/tb/xgmii_ep.py index adf3f0a12..ca657b158 100644 --- a/tb/xgmii_ep.py +++ b/tb/xgmii_ep.py @@ -225,7 +225,7 @@ class XGMIISource(object): txd.next = 0x0707070707070707 if bw == 8 else 0x07070707 txc.next = 0xff if bw == 8 else 0xf - return logic + return instances() class XGMIISink(object): @@ -307,5 +307,5 @@ class XGMIISink(object): d.append((int(rxd) >> (8*i)) & 0xff) c.append((int(rxc) >> i) & 1) - return logic + return instances()