From 99550968e7b372a88e30dcb4f133fe2c0aaa1408 Mon Sep 17 00:00:00 2001
From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Tue, 17 Jan 2017 15:18:10 +0100
Subject: [PATCH] test: move BISTDriver to common and use it in test_bist_async

---
 test/common.py          | 23 ++++++++++++++++++++++
 test/test_bist.py       | 23 ----------------------
 test/test_bist_async.py | 42 ++++++++++++++---------------------------
 3 files changed, 37 insertions(+), 51 deletions(-)

diff --git a/test/common.py b/test/common.py
index e8f0f2d..99da715 100644
--- a/test/common.py
+++ b/test/common.py
@@ -72,3 +72,26 @@ class DRAMMemory:
                     yield
                     yield dram_port.cmd.ready.eq(0)
             yield
+
+
+class BISTDriver:
+    def __init__(self, module):
+        self.module = module
+
+    def reset(self):
+        yield self.module.reset.eq(1)
+        yield
+        yield self.module.reset.eq(0)
+        yield
+
+    def run(self, base, length):
+        yield self.module.base.eq(base)
+        yield self.module.length.eq(length)
+        yield self.module.start.eq(1)
+        yield
+        yield self.module.start.eq(0)
+        yield
+        while((yield self.module.done) == 0):
+            yield
+        if hasattr(self.module, "errors"):
+            self.errors = (yield self.module.errors)
diff --git a/test/test_bist.py b/test/test_bist.py
index a9574d9..d8f8ee7 100755
--- a/test/test_bist.py
+++ b/test/test_bist.py
@@ -20,29 +20,6 @@ class DUT(Module):
         self.submodules.checker = _LiteDRAMBISTChecker(self.read_port, True)
 
 
-class BISTDriver:
-    def __init__(self, module):
-        self.module = module
-
-    def reset(self):
-        yield self.module.reset.eq(1)
-        yield
-        yield self.module.reset.eq(0)
-        yield
-
-    def run(self, base, length):
-        yield self.module.base.eq(base)
-        yield self.module.length.eq(length)
-        yield self.module.start.eq(1)
-        yield
-        yield self.module.start.eq(0)
-        yield
-        while((yield self.module.done) == 0):
-            yield
-        if hasattr(self.module, "errors"):
-            self.errors = (yield self.module.errors)
-
-
 def main_generator(dut, mem):
     generator = BISTDriver(dut.generator)
     checker = BISTDriver(dut.checker)
diff --git a/test/test_bist_async.py b/test/test_bist_async.py
index e58cafa..3df3f53 100755
--- a/test/test_bist_async.py
+++ b/test/test_bist_async.py
@@ -8,8 +8,8 @@ from litedram.common import PhySettings, LiteDRAMPort
 from litedram.core import *
 from litedram.modules import SDRAMModule
 from litedram.frontend.crossbar import LiteDRAMCrossbar
-from litedram.frontend.bist import LiteDRAMBISTGenerator
-from litedram.frontend.bist import LiteDRAMBISTChecker
+from litedram.frontend.bist import _LiteDRAMBISTGenerator
+from litedram.frontend.bist import _LiteDRAMBISTChecker
 from litedram.frontend.adaptation import LiteDRAMPortCDC
 
 from litedram.phy.model import SDRAMPHYModel
@@ -66,39 +66,25 @@ class TB(Module):
         read_user_port = self.crossbar.get_port("read", cd="read")
 
         # generator / checker
-        self.submodules.generator = LiteDRAMBISTGenerator(write_user_port)
-        self.submodules.checker = LiteDRAMBISTChecker(read_user_port)
+        self.submodules.generator = _LiteDRAMBISTGenerator(write_user_port, True)
+        self.submodules.checker = _LiteDRAMBISTChecker(read_user_port, True)
 
 
 def main_generator(dut):
-    for i in range(100):
-        yield
+    generator = BISTDriver(dut.generator)
+    checker = BISTDriver(dut.checker)
 
-    # init
-    yield from reset_bist_module(dut.generator)
-    yield from reset_bist_module(dut.checker)
+    for i in range(16):
+    	yield
 
     # write
-    yield dut.generator.base.storage.eq(16)
-    yield dut.generator.length.storage.eq(16)
-    for i in range(32):
-        yield
-    yield from toggle_re(dut.generator.start)
-    for i in range(32):
-        yield
-    while((yield dut.generator.done.status) == 0):
-        yield
+    yield from generator.reset()
+    yield from generator.run(16, 16)
 
-    # read
-    yield dut.checker.base.storage.eq(16)
-    yield dut.checker.length.storage.eq(16)
-    for i in range(32):
-        yield
-    yield from toggle_re(dut.generator.start)
-    for i in range(32):
-        yield
-    while((yield dut.checker.done.status) == 0):
-        yield
+    # read (no errors)
+    yield from checker.reset()
+    yield from checker.run(16, 16)
+    assert checker.errors == 0
 
 
 class TestBISTAsync(unittest.TestCase):