test/fifo: convert to new API

diff --git a/migen/test/test_fifo.py b/migen/test/test_fifo.py
index f0c1b105c4f5c0b6574b5d1ecf174920c2bf4521..1d5e8fda21f2038b1d1c6819ddec6b681217d45d 100644 (file)
--- a/migen/test/test_fifo.py
+++ b/migen/test/test_fifo.py
@@ -1,13 +1,14 @@
 import unittest
+from itertools import count
 
 from migen import *
 from migen.genlib.fifo import SyncFIFO
 
-from migen.test.support import SimCase, SimBench
+from migen.test.support import SimCase
 
 
 class SyncFIFOCase(SimCase, unittest.TestCase):
-    class TestBench(SimBench):
+    class TestBench(Module):
         def __init__(self):
             self.submodules.dut = SyncFIFO([("a", 32), ("b", 32)], 2)
 
@@ -24,31 +25,35 @@ class SyncFIFOCase(SimCase, unittest.TestCase):
 
     def test_run_sequence(self):
         seq = list(range(20))
-        def cb(tb, tbp):
-            # fire re and we at "random"
-            tbp.dut.we = tbp.simulator.cycle_counter % 2 == 0
-            tbp.dut.re = tbp.simulator.cycle_counter % 3 == 0
-            # the output if valid must be correct
-            if tbp.dut.readable and tbp.dut.re:
-                try:
-                    i = seq.pop(0)
-                except IndexError:
-                    raise StopSimulation
-                self.assertEqual(tbp.dut.dout.a, i)
-                self.assertEqual(tbp.dut.dout.b, i*2)
-        self.run_with(cb)
+        def gen():
+            for cycle in count():
+                # fire re and we at "random"
+                yield self.tb.dut.we, cycle % 2 == 0
+                yield self.tb.dut.re, cycle % 3 == 0
+                # the output if valid must be correct
+                if (yield self.tb.dut.readable) and (yield self.tb.dut.re):
+                    try:
+                        i = seq.pop(0)
+                    except IndexError:
+                        break
+                    self.assertEqual((yield self.tb.dut.dout.a), i)
+                    self.assertEqual((yield self.tb.dut.dout.b), i*2)
+                yield
+        self.run_with(gen())
 
     def test_replace(self):
         seq = [x for x in range(20) if x % 5]
-        def cb(tb, tbp):
-            tbp.dut.we = tbp.simulator.cycle_counter % 2 == 0
-            tbp.dut.re = tbp.simulator.cycle_counter % 3 == 0
-            tbp.dut.replace = tbp.dut.din.a % 5 == 1
-            if tbp.dut.readable and tbp.dut.re:
-                try:
-                    i = seq.pop(0)
-                except IndexError:
-                    raise StopSimulation
-                self.assertEqual(tbp.dut.dout.a, i)
-                self.assertEqual(tbp.dut.dout.b, i*2)
-        self.run_with(cb)
+        def gen():
+            for cycle in count():
+                yield self.tb.dut.we, cycle % 2 == 0
+                yield self.tb.dut.re, cycle % 7 == 0
+                yield self.tb.dut.replace, (yield self.tb.dut.din.a) % 5 == 1
+                if (yield self.tb.dut.readable) and (yield self.tb.dut.re):
+                    try:
+                        i = seq.pop(0)
+                    except IndexError:
+                        break
+                    self.assertEqual((yield self.tb.dut.dout.a), i)
+                    self.assertEqual((yield self.tb.dut.dout.b), i*2)
+                yield
+        self.run_with(gen())