Update testbenches to use instances()

Author: alexforencich

tb/i2c.py

@@ -279,8 +279,7 @@ def logic():
                     # send stop
                     yield send_stop()
 
-
-        return logic
+        return instances()
 
 
 class I2CMem(object):
@@ -506,7 +505,6 @@ def logic():
                             # no match, wait for start
                             break
 
-
-        return logic
+        return instances()
 
 

tb/test_i2c_init.py

@@ -253,7 +253,7 @@ def check():
 
         raise StopSimulation
 
-    return dut, cmd_sink_logic, data_sink_logic, clkgen, check
+    return instances()
 
 def test_bench():
     sim = Simulation(bench())

tb/test_i2c_master.py

@@ -432,7 +432,7 @@ def check():
 
         raise StopSimulation
 
-    return dut, cmd_source_logic, data_source_logic, data_sink_logic, i2c_mem_logic1, i2c_mem_logic2, bus, clkgen, check
+    return instances()
 
 def test_bench():
     sim = Simulation(bench())

tb/test_i2c_master_wbs_16.py

@@ -371,7 +371,7 @@ def check():
 
         raise StopSimulation
 
-    return dut, wbm_logic, i2c_mem_logic1, i2c_mem_logic2, bus, clkgen, check
+    return instances()
 
 def test_bench():
     sim = Simulation(bench())

tb/test_i2c_master_wbs_8.py

@@ -369,7 +369,7 @@ def check():
 
         raise StopSimulation
 
-    return dut, wbm_logic, i2c_mem_logic1, i2c_mem_logic2, bus, clkgen, check
+    return instances()
 
 def test_bench():
     sim = Simulation(bench())