Hardware
/
litedram
mirror of https://github.com/enjoy-digital/litedram.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: update BIST generator and checker tests

This commit is contained in:
Jędrzej Boczar 2020-02-11 14:24:02 +01:00
parent 409b9922ea
commit 45633e55b5
2 changed files with 83 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
litedram/frontend/bist.py
View File

@ -298,15 +298,27 @@ class LiteDRAMBISTGenerator(Module, AutoCSR):
done : out done : out
The module has completed writing the pattern. The module has completed writing the pattern.
run : in
Continue generation of new write commands.
ready : out
Enabled for one cycle after write command has been sent.
base : in base : in
DRAM address to start from. DRAM address to start from.
end : in
Max DRAM address.
length : in length : in
Number of DRAM words to write. Number of DRAM words to write.
random : in random_data : in
Enable random data (LFSR) Enable random data (LFSR)
random_addr : in
Enable random address (LFSR). Wrapped to (end - base), so may not be unique.
ticks : out ticks : out
Duration of the generation. Duration of the generation.
""" """
@ -315,9 +327,13 @@ class LiteDRAMBISTGenerator(Module, AutoCSR):
self.reset = CSR() self.reset = CSR()
self.start = CSR() self.start = CSR()
self.done = CSRStatus() self.done = CSRStatus()
self.run = CSRStorage()
self.ready = CSRStatus()
self.base = CSRStorage(awidth) self.base = CSRStorage(awidth)
self.end = CSRStorage(awidth)
self.length = CSRStorage(awidth) self.length = CSRStorage(awidth)
self.random = CSRStorage() self.random_data = CSRStorage()
self.random_addr = CSRStorage()
self.ticks = CSRStatus(32) self.ticks = CSRStatus(32)
# # # # # #
@ -347,18 +363,36 @@ class LiteDRAMBISTGenerator(Module, AutoCSR):
self.done.status.eq(done_sync.o) self.done.status.eq(done_sync.o)
] ]
run_sync = BusSynchronizer(1, clock_domain, "sys")
ready_sync = BusSynchronizer(1, clock_domain, "sys")
self.submodules += run_sync, ready_sync
self.comb += [
run_sync.i.eq(self.run.storage),
core.run.eq(run_sync.o),
ready_sync.i.eq(core.ready),
self.ready.status.eq(ready_sync.o),
]
base_sync = BusSynchronizer(awidth, "sys", clock_domain) base_sync = BusSynchronizer(awidth, "sys", clock_domain)
end_sync = BusSynchronizer(awidth, "sys", clock_domain)
length_sync = BusSynchronizer(awidth, "sys", clock_domain) length_sync = BusSynchronizer(awidth, "sys", clock_domain)
self.submodules += base_sync, length_sync self.submodules += base_sync, end_sync, length_sync
self.comb += [ self.comb += [
base_sync.i.eq(self.base.storage), base_sync.i.eq(self.base.storage),
core.base.eq(base_sync.o), core.base.eq(base_sync.o),
end_sync.i.eq(self.end.storage),
core.end.eq(end_sync.o),
length_sync.i.eq(self.length.storage), length_sync.i.eq(self.length.storage),
core.length.eq(length_sync.o) core.length.eq(length_sync.o)
] ]
self.specials += MultiReg(self.random.storage, core.random, clock_domain) self.specials += [
MultiReg(self.random_data.storage, core.random_data, clock_domain),
MultiReg(self.random_addr.storage, core.random_addr, clock_domain),
]
ticks_sync = BusSynchronizer(32, clock_domain, "sys") ticks_sync = BusSynchronizer(32, clock_domain, "sys")
self.submodules += ticks_sync self.submodules += ticks_sync
@ -371,9 +405,13 @@ class LiteDRAMBISTGenerator(Module, AutoCSR):
core.reset.eq(self.reset.re), core.reset.eq(self.reset.re),
core.start.eq(self.start.re), core.start.eq(self.start.re),
self.done.status.eq(core.done), self.done.status.eq(core.done),
core.run.eq(self.run.storage),
self.ready.status.eq(core.ready),
core.base.eq(self.base.storage), core.base.eq(self.base.storage),
core.end.eq(self.end.storage),
core.length.eq(self.length.storage), core.length.eq(self.length.storage),
core.random.eq(self.random.storage), core.random_data.eq(self.random_data.storage),
core.random_addr.eq(self.random_addr.storage),
self.ticks.status.eq(core.ticks) self.ticks.status.eq(core.ticks)
] ]
@ -612,13 +650,22 @@ class LiteDRAMBISTChecker(Module, AutoCSR):
done : out done : out
The module has completed checking The module has completed checking
run : in
Continue reading of subsequent locations.
ready : out
Enabled for one cycle after read command has been sent.
base : in base : in
DRAM address to start from. DRAM address to start from.
end : in
Max DRAM address.
length : in length : in
Number of DRAM words to check. Number of DRAM words to check.
random : in random_data : in
Enable random data (LFSR) Enable random data (LFSR)
random_addr : in
Enable random address (LFSR). Wrapped to (end - base), so may not be unique.
ticks: out ticks: out
Duration of the check. Duration of the check.
@ -631,9 +678,13 @@ class LiteDRAMBISTChecker(Module, AutoCSR):
self.reset = CSR() self.reset = CSR()
self.start = CSR() self.start = CSR()
self.done = CSRStatus() self.done = CSRStatus()
self.run = CSRStorage()
self.ready = CSRStatus()
self.base = CSRStorage(awidth) self.base = CSRStorage(awidth)
self.end = CSRStorage(awidth)
self.length = CSRStorage(awidth) self.length = CSRStorage(awidth)
self.random = CSRStorage() self.random_data = CSRStorage()
self.random_addr = CSRStorage()
self.ticks = CSRStatus(32) self.ticks = CSRStatus(32)
self.errors = CSRStatus(32) self.errors = CSRStatus(32)
@ -664,18 +715,36 @@ class LiteDRAMBISTChecker(Module, AutoCSR):
self.done.status.eq(done_sync.o) self.done.status.eq(done_sync.o)
] ]
run_sync = BusSynchronizer(1, clock_domain, "sys")
ready_sync = BusSynchronizer(1, clock_domain, "sys")
self.submodules += run_sync, ready_sync
self.comb += [
run_sync.i.eq(self.run.storage),
core.run.eq(run_sync.o),
ready_sync.i.eq(core.ready),
self.ready.status.eq(ready_sync.o),
]
base_sync = BusSynchronizer(awidth, "sys", clock_domain) base_sync = BusSynchronizer(awidth, "sys", clock_domain)
end_sync = BusSynchronizer(awidth, "sys", clock_domain)
length_sync = BusSynchronizer(awidth, "sys", clock_domain) length_sync = BusSynchronizer(awidth, "sys", clock_domain)
self.submodules += base_sync, length_sync self.submodules += base_sync, end_sync, length_sync
self.comb += [ self.comb += [
base_sync.i.eq(self.base.storage), base_sync.i.eq(self.base.storage),
core.base.eq(base_sync.o), core.base.eq(base_sync.o),
end_sync.i.eq(self.end.storage),
core.end.eq(end_sync.o),
length_sync.i.eq(self.length.storage), length_sync.i.eq(self.length.storage),
core.length.eq(length_sync.o) core.length.eq(length_sync.o)
] ]
self.specials += MultiReg(self.random.storage, core.random, clock_domain) self.specials += [
MultiReg(self.random_data.storage, core.random_data, clock_domain),
MultiReg(self.random_addr.storage, core.random_addr, clock_domain),
]
ticks_sync = BusSynchronizer(32, clock_domain, "sys") ticks_sync = BusSynchronizer(32, clock_domain, "sys")
self.submodules += ticks_sync self.submodules += ticks_sync
@ -695,7 +764,10 @@ class LiteDRAMBISTChecker(Module, AutoCSR):
core.reset.eq(self.reset.re), core.reset.eq(self.reset.re),
core.start.eq(self.start.re), core.start.eq(self.start.re),
self.done.status.eq(core.done), self.done.status.eq(core.done),
core.run.eq(self.run.storage),
self.ready.status.eq(core.ready),
core.base.eq(self.base.storage), core.base.eq(self.base.storage),
core.end.eq(self.end.storage),
core.length.eq(self.length.storage), core.length.eq(self.length.storage),
core.random.eq(self.random.storage), core.random.eq(self.random.storage),
self.ticks.status.eq(core.ticks), self.ticks.status.eq(core.ticks),

2
test/test_bist.py
View File

@ -31,7 +31,9 @@ class GenCheckDriver:
def run(self, base, length): def run(self, base, length):
yield self.module.base.eq(base) yield self.module.base.eq(base)
yield self.module.end.eq(base + 0x100000)
yield self.module.length.eq(length) yield self.module.length.eq(length)
yield self.module.run.eq(1)
yield self.module.start.eq(1) yield self.module.start.eq(1)
yield yield
yield self.module.start.eq(0) yield self.module.start.eq(0)