M-Labs/artiq
2
0
Fork 2
mirror of https://github.com/m-labs/artiq.git synced 2024-12-26 03:38:25 +08:00
Code Issues Projects Releases Wiki Activity

adapt to migen/misoc changes

Browse Source
This commit is contained in:
Sebastien Bourdeauducq 2016-10-31 00:53:01 +08:00
parent da5208e160
commit 9aa94e1a2d
6 changed files with 16 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
artiq/gateware/drtio/link_layer.py
View File

@ -3,7 +3,7 @@ from operator import xor, or_
from migen import * from migen import *
from migen.genlib.fsm import * from migen.genlib.fsm import *
from migen.genlib.cdc import MultiReg, NoRetiming from migen.genlib.cdc import MultiReg
class Scrambler(Module): class Scrambler(Module):
@ -240,10 +240,8 @@ class LinkLayer(Module):
ready_r = Signal() ready_r = Signal()
ready_rx = Signal() ready_rx = Signal()
self.sync.rtio += ready_r.eq(self.ready) self.sync.rtio += ready_r.eq(self.ready)
self.specials += [ ready_r.attr.add("no_retiming")
NoRetiming(ready_r), self.specials += MultiReg(ready_r, ready_rx, "rtio_rx")
MultiReg(ready_r, ready_rx, "rtio_rx")
]
self.comb += [ self.comb += [
self.rx_aux_frame.eq(rx.aux_frame & ready_rx), self.rx_aux_frame.eq(rx.aux_frame & ready_rx),
self.rx_rt_frame.eq(rx.rt_frame & ready_rx), self.rx_rt_frame.eq(rx.rt_frame & ready_rx),
@ -259,10 +257,10 @@ class LinkLayer(Module):
rx_remote_rx_ready = Signal() rx_remote_rx_ready = Signal()
rx_link_init = Signal() rx_link_init = Signal()
rx.remote_rx_ready.attr.add("no_retiming")
rx.link_init.attr.add("no_retiming")
self.specials += [ self.specials += [
NoRetiming(rx.remote_rx_ready),
MultiReg(rx.remote_rx_ready, rx_remote_rx_ready, "rtio"), MultiReg(rx.remote_rx_ready, rx_remote_rx_ready, "rtio"),
NoRetiming(rx.link_init),
MultiReg(rx.link_init, rx_link_init, "rtio") MultiReg(rx.link_init, rx_link_init, "rtio")
] ]

8
artiq/gateware/drtio/rt_controller.py
View File

@ -1,5 +1,5 @@
from migen import * from migen import *
from migen.genlib.cdc import MultiReg, NoRetiming from migen.genlib.cdc import MultiReg
from misoc.interconnect.csr import * from misoc.interconnect.csr import *
@ -44,10 +44,8 @@ class RTController(Module):
self.sync += If(self.kcsrs.counter_update.re, self.sync += If(self.kcsrs.counter_update.re,
self.kcsrs.counter.status.eq(self.counter.value_sys)) self.kcsrs.counter.status.eq(self.counter.value_sys))
tsc_correction = Signal(64) tsc_correction = Signal(64)
self.specials += [ self.kcsrs.tsc_correction.storage.attr.add("no_retiming")
NoRetiming(self.kcsrs.tsc_correction.storage), self.specials += MultiReg(self.kcsrs.tsc_correction.storage, tsc_correction)
MultiReg(self.kcsrs.tsc_correction.storage, tsc_correction)
]
self.comb += [ self.comb += [
rt_packets.tsc_value.eq( rt_packets.tsc_value.eq(
self.counter.value_rtio + tsc_correction), self.counter.value_rtio + tsc_correction),

6
artiq/gateware/drtio/rt_packets.py
View File

@ -3,7 +3,7 @@ from types import SimpleNamespace
from migen import * from migen import *
from migen.genlib.fsm import * from migen.genlib.fsm import *
from migen.genlib.fifo import AsyncFIFO from migen.genlib.fifo import AsyncFIFO
from migen.genlib.cdc import PulseSynchronizer, NoRetiming from migen.genlib.cdc import PulseSynchronizer
def layout_len(l): def layout_len(l):
@ -334,7 +334,7 @@ class _CrossDomainRequest(Module):
] ]
if req_data is not None: if req_data is not None:
req_data_r = Signal.like(req_data) req_data_r = Signal.like(req_data)
self.specials += NoRetiming(req_data_r) req_data_r.attr.add("no_retiming")
self.sync += If(req_stb, req_data_r.eq(req_data)) self.sync += If(req_stb, req_data_r.eq(req_data))
dsync += [ dsync += [
If(request.o, srv_stb.eq(1)), If(request.o, srv_stb.eq(1)),
@ -350,7 +350,7 @@ class _CrossDomainNotification(Module):
emi_stb, emi_data, emi_stb, emi_data,
rec_stb, rec_ack, rec_data): rec_stb, rec_ack, rec_data):
emi_data_r = Signal.like(emi_data) emi_data_r = Signal.like(emi_data)
self.specials += NoRetiming(emi_data_r) emi_data_r.attr.add("no_retiming")
dsync = getattr(self.sync, domain) dsync = getattr(self.sync, domain)
dsync += If(emi_stb, emi_data_r.eq(emi_data)) dsync += If(emi_stb, emi_data_r.eq(emi_data))

6
artiq/gateware/rtio/cdc.py
View File

@ -18,10 +18,8 @@ class GrayCodeTransfer(Module):
self.sync.rtio += value_gray_rtio.eq(self.i ^ self.i[1:]) self.sync.rtio += value_gray_rtio.eq(self.i ^ self.i[1:])
# transfer to system clock domain # transfer to system clock domain
value_gray_sys = Signal(width) value_gray_sys = Signal(width)
self.specials += [ value_gray_rtio.attr.add("no_retiming")
NoRetiming(value_gray_rtio), self.specials += MultiReg(value_gray_rtio, value_gray_sys)
MultiReg(value_gray_rtio, value_gray_sys)
]
# convert back to binary # convert back to binary
value_sys = Signal(width) value_sys = Signal(width)
self.comb += value_sys[-1].eq(value_gray_sys[-1]) self.comb += value_sys[-1].eq(value_gray_sys[-1])

18
artiq/gateware/targets/kc705.py
View File

@ -8,7 +8,6 @@ from migen.genlib.cdc import MultiReg
from migen.build.generic_platform import * from migen.build.generic_platform import *
from migen.build.xilinx.vivado import XilinxVivadoToolchain from migen.build.xilinx.vivado import XilinxVivadoToolchain
from migen.build.xilinx.ise import XilinxISEToolchain from migen.build.xilinx.ise import XilinxISEToolchain
from migen.fhdl.specials import Keep
from misoc.interconnect.csr import * from misoc.interconnect.csr import *
from misoc.interconnect import wishbone from misoc.interconnect import wishbone
@ -147,22 +146,11 @@ class _NIST_Ions(MiniSoC, AMPSoC):
self.submodules.rtio_moninj = rtio.MonInj(rtio_channels) self.submodules.rtio_moninj = rtio.MonInj(rtio_channels)
self.csr_devices.append("rtio_moninj") self.csr_devices.append("rtio_moninj")
self.specials += [ self.rtio_crg.cd_rtio.clk.attr.add("keep")
Keep(self.rtio.cd_rsys.clk),
Keep(self.rtio_crg.cd_rtio.clk),
Keep(self.ethphy.crg.cd_eth_rx.clk),
Keep(self.ethphy.crg.cd_eth_tx.clk),
]
self.platform.add_period_constraint(self.rtio.cd_rsys.clk, 8.)
self.platform.add_period_constraint(self.rtio_crg.cd_rtio.clk, 8.) self.platform.add_period_constraint(self.rtio_crg.cd_rtio.clk, 8.)
self.platform.add_period_constraint(self.ethphy.crg.cd_eth_rx.clk, 8.)
self.platform.add_period_constraint(self.ethphy.crg.cd_eth_tx.clk, 8.)
self.platform.add_false_path_constraints( self.platform.add_false_path_constraints(
self.rtio.cd_rsys.clk, self.crg.cd_sys.clk,
self.rtio_crg.cd_rtio.clk, self.rtio_crg.cd_rtio.clk)
self.ethphy.crg.cd_eth_rx.clk,
self.ethphy.crg.cd_eth_tx.clk)
self.submodules.rtio_analyzer = rtio.Analyzer(self.rtio, self.submodules.rtio_analyzer = rtio.Analyzer(self.rtio,
self.get_native_sdram_if()) self.get_native_sdram_if())

12
artiq/gateware/targets/kc705_drtio_master.py
View File

@ -3,7 +3,6 @@
import argparse import argparse
from migen import * from migen import *
from migen.fhdl.specials import Keep
from misoc.targets.kc705 import MiniSoC, soc_kc705_args, soc_kc705_argdict from misoc.targets.kc705 import MiniSoC, soc_kc705_args, soc_kc705_argdict
from misoc.integration.builder import builder_args, builder_argdict from misoc.integration.builder import builder_args, builder_argdict
@ -44,17 +43,6 @@ class Master(MiniSoC, AMPSoC):
self.submodules.drtio = DRTIOMaster(self.transceiver) self.submodules.drtio = DRTIOMaster(self.transceiver)
self.register_kernel_cpu_csrdevice("drtio") self.register_kernel_cpu_csrdevice("drtio")
self.specials += [
Keep(self.ethphy.crg.cd_eth_rx.clk),
Keep(self.ethphy.crg.cd_eth_tx.clk),
]
platform.add_period_constraint(self.ethphy.crg.cd_eth_rx.clk, 8.)
platform.add_period_constraint(self.ethphy.crg.cd_eth_tx.clk, 8.)
platform.add_false_path_constraints(
self.ethphy.crg.cd_eth_rx.clk,
self.ethphy.crg.cd_eth_tx.clk)
def main(): def main():
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(