From a95c6883cc5571ac913465450eec796810350348 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Thu, 29 Oct 2020 18:58:37 +0100 Subject: [PATCH] bench/targets: uniformize. --- bench/arty.py | 14 +++++++++++--- bench/kc705.py | 19 ++++++++++++++----- bench/kcu105.py | 19 ++++++++++++++----- 3 files changed, 39 insertions(+), 13 deletions(-) diff --git a/bench/arty.py b/bench/arty.py index 73c91e4..577d8b4 100755 --- a/bench/arty.py +++ b/bench/arty.py @@ -61,12 +61,12 @@ class _CRG(Module, AutoCSR): # Bench SoC ---------------------------------------------------------------------------------------- class BenchSoC(SoCCore): - def __init__(self, uart="crossover", sys_clk_freq=int(125e6)): + def __init__(self, uart="crossover", sys_clk_freq=int(125e6), with_bist=False): platform = arty.Platform() # SoCCore ---------------------------------------------------------------------------------- SoCCore.__init__(self, platform, clk_freq=sys_clk_freq, - integrated_rom_size = 0x8000, + integrated_rom_size = 0x10000, integrated_rom_mode = "rw", csr_data_width = 32, uart_name = uart) @@ -87,6 +87,13 @@ class BenchSoC(SoCCore): origin = self.mem_map["main_ram"] ) + # BIST ------------------------------------------------------------------------------------- + from litedram.frontend.bist import LiteDRAMBISTGenerator, LiteDRAMBISTChecker + self.submodules.sdram_generator = LiteDRAMBISTGenerator(self.sdram.crossbar.get_port()) + self.add_csr("sdram_generator") + self.submodules.sdram_checker = LiteDRAMBISTChecker(self.sdram.crossbar.get_port()) + self.add_csr("sdram_checker") + # UARTBone --------------------------------------------------------------------------------- if uart != "serial": self.add_uartbone(name="serial", clk_freq=100e6, baudrate=115200, cd="uart") @@ -112,13 +119,14 @@ def main(): parser = argparse.ArgumentParser(description="LiteDRAM Bench on Arty A7") parser.add_argument("--uart", default="crossover", help="Selected UART: crossover (default) or serial") parser.add_argument("--build", action="store_true", help="Build bitstream") + parser.add_argument("--with-bist", action="store_true", help="Add BIST Generator/Checker") parser.add_argument("--load", action="store_true", help="Load bitstream") parser.add_argument("--load-bios", action="store_true", help="Load BIOS") parser.add_argument("--set-sys-clk", default=None, help="Set sys_clk") parser.add_argument("--test", action="store_true", help="Run Full Bench") args = parser.parse_args() - soc = BenchSoC(uart=args.uart) + soc = BenchSoC(uart=args.uart, with_bist=args.with_bist) builder = Builder(soc, csr_csv="csr.csv") builder.build(run=args.build) diff --git a/bench/kc705.py b/bench/kc705.py index 5394d8a..4214d61 100755 --- a/bench/kc705.py +++ b/bench/kc705.py @@ -59,15 +59,15 @@ class _CRG(Module, AutoCSR): # Bench SoC ---------------------------------------------------------------------------------------- class BenchSoC(SoCCore): - def __init__(self, uart="crossover", sys_clk_freq=int(125e6)): + def __init__(self, uart="crossover", sys_clk_freq=int(125e6), with_bist=False): platform = kc705.Platform() # SoCCore ---------------------------------------------------------------------------------- SoCCore.__init__(self, platform, clk_freq=sys_clk_freq, - integrated_rom_size = 0x8000, + integrated_rom_size = 0x10000, integrated_rom_mode = "rw", csr_data_width = 32, - uart_name = "crossover") + uart_name = uart) # CRG -------------------------------------------------------------------------------------- self.submodules.crg = _CRG(platform, sys_clk_freq) @@ -85,8 +85,16 @@ class BenchSoC(SoCCore): origin = self.mem_map["main_ram"] ) + # BIST ------------------------------------------------------------------------------------- + from litedram.frontend.bist import LiteDRAMBISTGenerator, LiteDRAMBISTChecker + self.submodules.sdram_generator = LiteDRAMBISTGenerator(self.sdram.crossbar.get_port()) + self.add_csr("sdram_generator") + self.submodules.sdram_checker = LiteDRAMBISTChecker(self.sdram.crossbar.get_port()) + self.add_csr("sdram_checker") + # UARTBone --------------------------------------------------------------------------------- - self.add_uartbone(name="serial", clk_freq=100e6, baudrate=115200, cd="uart") + if uart != "serial": + self.add_uartbone(name="serial", clk_freq=100e6, baudrate=115200, cd="uart") # Etherbone -------------------------------------------------------------------------------- self.submodules.ethphy = LiteEthPHY( @@ -109,13 +117,14 @@ def main(): parser = argparse.ArgumentParser(description="LiteDRAM Bench on KC705") parser.add_argument("--uart", default="crossover", help="Selected UART: crossover (default) or serial") parser.add_argument("--build", action="store_true", help="Build bitstream") + parser.add_argument("--with-bist", action="store_true", help="Add BIST Generator/Checker") parser.add_argument("--load", action="store_true", help="Load bitstream") parser.add_argument("--load-bios", action="store_true", help="Load BIOS") parser.add_argument("--set-sys-clk", default=None, help="Set sys_clk") parser.add_argument("--test", action="store_true", help="Run Full Bench") args = parser.parse_args() - soc = BenchSoC() + soc = BenchSoC(uart=args.uart, with_bist=args.with_bist) builder = Builder(soc, csr_csv="csr.csv") builder.build(run=args.build) diff --git a/bench/kcu105.py b/bench/kcu105.py index 7867e79..d6640c3 100755 --- a/bench/kcu105.py +++ b/bench/kcu105.py @@ -14,10 +14,10 @@ from migen import * from litex.boards.platforms import kcu105 from litex.soc.cores.clock import * +from litex.soc.interconnect.csr import * from litex.soc.integration.soc_core import * from litex.soc.integration.soc_sdram import * from litex.soc.integration.builder import * -from litex.soc.cores.led import LedChaser from litedram.modules import EDY4016A from litedram.phy import usddrphy @@ -71,12 +71,12 @@ class _CRG(Module, AutoCSR): # Bench SoC ---------------------------------------------------------------------------------------- class BenchSoC(SoCCore): - def __init__(self, uart="crossover", sys_clk_freq=int(125e6)): + def __init__(self, uart="crossover", sys_clk_freq=int(125e6), with_bist=False): platform = kcu105.Platform() # SoCCore ---------------------------------------------------------------------------------- - SoCCore.__init__(self, platform, sys_clk_freq, - integrated_rom_size = 0x8000, + SoCCore.__init__(self, platform, clk_freq=sys_clk_freq, + integrated_rom_size = 0x10000, integrated_rom_mode = "rw", csr_data_width = 32, uart_name = uart) @@ -98,6 +98,13 @@ class BenchSoC(SoCCore): size = 0x40000000, ) + # BIST ------------------------------------------------------------------------------------- + from litedram.frontend.bist import LiteDRAMBISTGenerator, LiteDRAMBISTChecker + self.submodules.sdram_generator = LiteDRAMBISTGenerator(self.sdram.crossbar.get_port()) + self.add_csr("sdram_generator") + self.submodules.sdram_checker = LiteDRAMBISTChecker(self.sdram.crossbar.get_port()) + self.add_csr("sdram_checker") + # UARTBone --------------------------------------------------------------------------------- if uart != "serial": self.add_uartbone(name="serial", clk_freq=100e6, baudrate=115200, cd="uart") @@ -112,6 +119,7 @@ class BenchSoC(SoCCore): self.add_etherbone(phy=self.ethphy) # Leds ------------------------------------------------------------------------------------- + from litex.soc.cores.led import LedChaser self.submodules.leds = LedChaser( pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) @@ -123,13 +131,14 @@ def main(): parser = argparse.ArgumentParser(description="LiteDRAM Bench on KCU105") parser.add_argument("--uart", default="crossover", help="Selected UART: crossover (default) or serial") parser.add_argument("--build", action="store_true", help="Build bitstream") + parser.add_argument("--with-bist", action="store_true", help="Add BIST Generator/Checker") parser.add_argument("--load", action="store_true", help="Load bitstream") parser.add_argument("--load-bios", action="store_true", help="Load BIOS") parser.add_argument("--set-sys-clk", default=None, help="Set sys_clk") parser.add_argument("--test", action="store_true", help="Run Full Bench") args = parser.parse_args() - soc = BenchSoC(uart=args.uart) + soc = BenchSoC(uart=args.uart, with_bist=args.with_bist) builder = Builder(soc, csr_csv="csr.csv") builder.build(run=args.build)