Update testbenches to use instances()

tb/axis_ep.py

@@ -366,7 +366,7 @@ class AXIStreamSource(object):
                             tvalid_int.next = True
                             tlast.next = len(data) == 0
 
-        return logic, pause_logic
+        return instances()
 
 
 class AXIStreamSink(object):
@@ -508,5 +508,5 @@ class AXIStreamSink(object):
                             user = []
                             first = True
 
-        return logic, pause_logic
+        return instances()
 

tb/ll_ep.py

@@ -93,7 +93,7 @@ class LocalLinkSource(object):
                             sof_out_n.next = False
                             eof_out_n.next = len(frame) != 0
 
-        return logic, pause_logic
+        return instances()
 
 
 class LocalLinkSink(object):
@@ -158,5 +158,5 @@ class LocalLinkSink(object):
                                 print("[%s] Got frame %s" % (name, repr(frame)))
                             frame = []
 
-        return logic, pause_logic
+        return instances()
 

tb/test_arbiter.py

@@ -163,7 +163,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_arbiter_rr.py

@@ -223,7 +223,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_adapter_64_8.py

@@ -311,7 +311,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_adapter_8_64.py

@@ -311,7 +311,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_arb_mux_4.py

@@ -564,7 +564,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__)))

tb/test_axis_arb_mux_4_64.py

@@ -564,7 +564,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__)))

tb/test_axis_async_fifo.py

@@ -488,7 +488,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, input_clkgen, output_clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_async_fifo_64.py

@@ -488,7 +488,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, input_clkgen, output_clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_async_frame_fifo.py

@@ -659,7 +659,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, monitor_1, monitor_2, source_logic, sink_logic, input_clkgen, output_clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_async_frame_fifo_64.py

@@ -659,7 +659,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, monitor_1, monitor_2, source_logic, sink_logic, input_clkgen, output_clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_cobs_decode.py

@@ -446,7 +446,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     sim = Simulation(bench())

tb/test_axis_cobs_encode.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())

tb/test_axis_cobs_encode_zero_frame.py

@@ -346,7 +346,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     sim = Simulation(bench())

tb/test_axis_crosspoint_4x4.py

@@ -474,7 +474,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_0_logic, source_1_logic, source_2_logic, source_3_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__)))

tb/test_axis_crosspoint_4x4_64.py

@@ -474,7 +474,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_0_logic, source_1_logic, source_2_logic, source_3_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__)))

tb/test_axis_demux_4.py

@@ -519,7 +519,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__)))

tb/test_axis_demux_4_64.py

@@ -519,7 +519,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__)))

tb/test_axis_fifo.py

@@ -477,7 +477,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_fifo_64.py

@@ -477,7 +477,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_frame_fifo.py

@@ -581,7 +581,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, monitor, source_logic, sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_frame_fifo_64.py

@@ -581,7 +581,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, monitor, source_logic, sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_frame_join_4.py

@@ -465,7 +465,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__)))

tb/test_axis_frame_length_adjust_64.py

@@ -372,7 +372,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, status_sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_frame_length_adjust_8.py

@@ -372,7 +372,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, status_sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_frame_length_adjust_fifo.py

@@ -364,7 +364,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, hdr_sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_frame_length_adjust_fifo_64.py

@@ -364,7 +364,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, hdr_sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_ll_bridge.py

@@ -193,7 +193,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_mux_4.py

@@ -519,7 +519,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__)))

tb/test_axis_mux_4_64.py

@@ -519,7 +519,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__)))

tb/test_axis_rate_limit.py

@@ -547,7 +547,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, clkgen, monitor, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_rate_limit_64.py

@@ -547,7 +547,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, clkgen, monitor, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_register.py

@@ -415,7 +415,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_register_64.py

@@ -415,7 +415,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_srl_fifo.py

@@ -479,7 +479,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_srl_fifo_64.py

@@ -479,7 +479,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_srl_register.py

@@ -415,7 +415,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_srl_register_64.py

@@ -415,7 +415,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_stat_counter.py

@@ -765,7 +765,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, monitor_sink_logic, sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_switch_4x4.py

@@ -603,7 +603,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_0_logic, source_1_logic, source_2_logic, source_3_logic, sink_0_logic, sink_1_logic, sink_2_logic, sink_3_logic, clkgen, check
+    return instances()
 
 def test_bench():
     sim = Simulation(bench())

tb/test_axis_switch_4x4_64.py

@@ -603,7 +603,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_0_logic, source_1_logic, source_2_logic, source_3_logic, sink_0_logic, sink_1_logic, sink_2_logic, sink_3_logic, clkgen, check
+    return instances()
 
 def test_bench():
     sim = Simulation(bench())

tb/test_axis_tap.py

@@ -444,7 +444,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_axis_tap_64.py

@@ -444,7 +444,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_ll_axis_bridge.py

@@ -193,7 +193,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, source_logic, sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))

tb/test_priority_encoder.py

@@ -121,7 +121,7 @@ def bench():
 
         raise StopSimulation
 
-    return dut, clkgen, check
+    return instances()
 
 def test_bench():
     os.chdir(os.path.dirname(os.path.abspath(__file__)))