From 81f2b2c86414e9032220672b66fd5b9a5cd7931e Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 23 Jan 2019 12:14:44 +0800 Subject: [PATCH] kasli: remove unpopulated Tester EEMs * matches hardware and avoids issues with programs that process the DDB (e.g. kasli_tester) * shortens compilation times --- artiq/examples/kasli_tester/device_db.py | 142 +---------------------- artiq/gateware/targets/kasli.py | 15 --- 2 files changed, 2 insertions(+), 155 deletions(-) diff --git a/artiq/examples/kasli_tester/device_db.py b/artiq/examples/kasli_tester/device_db.py index bcffa8fa2..96cd249e8 100644 --- a/artiq/examples/kasli_tester/device_db.py +++ b/artiq/examples/kasli_tester/device_db.py @@ -189,156 +189,18 @@ device_db["zotino0"] = { } -# Grabber (EEM6) starting at RTIO channel 25 -device_db["grabber0"] = { - "type": "local", - "module": "artiq.coredevice.grabber", - "class": "Grabber", - "arguments": {"channel_base": 25} -} - - -# Urukul (EEM7) starting at RTIO channel 27 -device_db.update( - spi_urukul1={ - "type": "local", - "module": "artiq.coredevice.spi2", - "class": "SPIMaster", - "arguments": {"channel": 27} - }, - ttl_urukul1_sync={ - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLClockGen", - "arguments": {"channel": 28, "acc_width": 4} - }, - ttl_urukul1_io_update={ - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 29} - }, - urukul1_cpld={ - "type": "local", - "module": "artiq.coredevice.urukul", - "class": "CPLD", - "arguments": { - "spi_device": "spi_urukul1", - "io_update_device": "ttl_urukul1_io_update", - "sync_device": "ttl_urukul1_sync", - "refclk": 100e6, - "clk_sel": 1 - } - } -) - -for i in range(4): - device_db["urukul1_ch" + str(i)] = { - "type": "local", - "module": "artiq.coredevice.ad9912", - "class": "AD9912", - "arguments": { - "pll_n": 10, - "chip_select": 4 + i, - "cpld_device": "urukul1_cpld" - } - } - - -# DIO (EEM8) starting at RTIO channel 30 -for i in range(8): - device_db["ttl" + str(8 + i)] = { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 30 + i}, - } - - -# DIO (EEM9) starting at RTIO channel 38 -for i in range(8): - device_db["ttl" + str(16 + i)] = { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 38 + i}, - } - - -# Sampler (EEM10) starting at RTIO channel 46 -device_db["spi_sampler1_adc"] = { - "type": "local", - "module": "artiq.coredevice.spi2", - "class": "SPIMaster", - "arguments": {"channel": 46} -} -device_db["spi_sampler1_pgia"] = { - "type": "local", - "module": "artiq.coredevice.spi2", - "class": "SPIMaster", - "arguments": {"channel": 47} -} -device_db["spi_sampler1_cnv"] = { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 48}, -} -device_db["sampler1"] = { - "type": "local", - "module": "artiq.coredevice.sampler", - "class": "Sampler", - "arguments": { - "spi_adc_device": "spi_sampler1_adc", - "spi_pgia_device": "spi_sampler1_pgia", - "cnv_device": "spi_sampler1_cnv" - } -} - - -# Zotino (EEM11) starting at RTIO channel 49 -device_db["spi_zotino1"] = { - "type": "local", - "module": "artiq.coredevice.spi2", - "class": "SPIMaster", - "arguments": {"channel": 49} -} -device_db["ttl_zotino1_ldac"] = { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 50} -} -device_db["ttl_zotino1_clr"] = { - "type": "local", - "module": "artiq.coredevice.ttl", - "class": "TTLOut", - "arguments": {"channel": 51} -} -device_db["zotino1"] = { - "type": "local", - "module": "artiq.coredevice.zotino", - "class": "Zotino", - "arguments": { - "spi_device": "spi_zotino1", - "ldac_device": "ttl_zotino1_ldac", - "clr_device": "ttl_zotino1_clr" - } -} - - device_db.update( led0={ "type": "local", "module": "artiq.coredevice.ttl", "class": "TTLOut", - "arguments": {"channel": 52} + "arguments": {"channel": 25} }, led1={ "type": "local", "module": "artiq.coredevice.ttl", "class": "TTLOut", - "arguments": {"channel": 53} + "arguments": {"channel": 26} }, ) diff --git a/artiq/gateware/targets/kasli.py b/artiq/gateware/targets/kasli.py index 46cb578e1..8c17c765a 100755 --- a/artiq/gateware/targets/kasli.py +++ b/artiq/gateware/targets/kasli.py @@ -774,7 +774,6 @@ class Tester(_StandaloneBase): self.comb += self.platform.request("clk_sel").eq(1) self.rtio_channels = [] - self.grabber_csr_group = [] eem.DIO.add_std(self, 5, ttl_serdes_7series.InOut_8X, ttl_serdes_7series.Output_8X, edge_counter_cls=edge_counter.SimpleEdgeCounter) @@ -782,15 +781,6 @@ class Tester(_StandaloneBase): ttl_simple.ClockGen) eem.Sampler.add_std(self, 3, 2, ttl_serdes_7series.Output_8X) eem.Zotino.add_std(self, 4, ttl_serdes_7series.Output_8X) - eem.Grabber.add_std(self, 6) - eem.Urukul.add_std(self, 7, None, ttl_serdes_7series.Output_8X, - ttl_simple.ClockGen) - eem.DIO.add_std(self, 8, - ttl_serdes_7series.Output_8X, ttl_serdes_7series.Output_8X) - eem.DIO.add_std(self, 9, - ttl_serdes_7series.Output_8X, ttl_serdes_7series.Output_8X) - eem.Sampler.add_std(self, 10, None, ttl_serdes_7series.Output_8X) - eem.Zotino.add_std(self, 11, ttl_serdes_7series.Output_8X) for i in (1, 2): sfp_ctl = self.platform.request("sfp_ctl", i) @@ -803,11 +793,6 @@ class Tester(_StandaloneBase): self.rtio_channels.append(rtio.LogChannel()) self.add_rtio(self.rtio_channels) - self.config["HAS_GRABBER"] = None - self.add_csr_group("grabber", self.grabber_csr_group) - self.platform.add_false_path_constraints( - self.rtio_crg.cd_rtio.clk, self.grabber0.deserializer.cd_cl.clk) - class _RTIOClockMultiplier(Module, AutoCSR): def __init__(self, rtio_clk_freq):