Hardware/litex
1
0
Fork 0
mirror of https://github.com/enjoy-digital/litex.git synced 2025-01-04 09:52:26 -05:00
Code Issues Projects Releases Packages Wiki Activity

fhdl/specials: clean up clock domain handling

Browse source
This commit is contained in:
Sebastien Bourdeauducq 2013-03-26 11:58:34 +01:00
parent 77a0f0a3bb
commit 574becc1fc
2 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
migen/fhdl/specials.py
View file

@ -45,7 +45,7 @@ class Tristate(Special):
yield self, attr, target_context yield self, attr, target_context
@staticmethod @staticmethod
def emit_verilog(tristate, ns, clock_domains): def emit_verilog(tristate, ns):
def pe(e): def pe(e):
return verilog_printexpr(ns, e)[0] return verilog_printexpr(ns, e)[0]
w, s = value_bits_sign(tristate.target) w, s = value_bits_sign(tristate.target)
@ -109,7 +109,7 @@ class Instance(Special):
yield item, "expr", SPECIAL_INOUT yield item, "expr", SPECIAL_INOUT
@staticmethod @staticmethod
def emit_verilog(instance, ns, clock_domains): def emit_verilog(instance, ns):
r = instance.of + " " r = instance.of + " "
parameters = list(filter(lambda i: isinstance(i, Instance.Parameter), instance.items)) parameters = list(filter(lambda i: isinstance(i, Instance.Parameter), instance.items))
if parameters: if parameters:
@ -161,7 +161,7 @@ class _MemoryPort:
self.re = re self.re = re
self.we_granularity = we_granularity self.we_granularity = we_granularity
self.mode = mode self.mode = mode
self.clock_domain = clock_domain self.clock = ClockSignal(clock_domain)
class Memory(Special): class Memory(Special):
def __init__(self, width, depth, init=None, name=None): def __init__(self, width, depth, init=None, name=None):
@ -205,21 +205,12 @@ class Memory(Special):
("we", SPECIAL_INPUT), ("we", SPECIAL_INPUT),
("dat_w", SPECIAL_INPUT), ("dat_w", SPECIAL_INPUT),
("re", SPECIAL_INPUT), ("re", SPECIAL_INPUT),
("dat_r", SPECIAL_OUTPUT)]: ("dat_r", SPECIAL_OUTPUT),
("clock", SPECIAL_INPUT)]:
yield p, attr, target_context yield p, attr, target_context
def rename_clock_domain(self, old, new):
# port expressions are always signals - no need to call Special.rename_clock_domain
for port in self.ports:
if port.clock_domain == old:
port.clock_domain = new
def list_clock_domains(self):
# port expressions are always signals - no need to call Special.list_clock_domains
return set(port.clock_domain for port in self.ports)
@staticmethod @staticmethod
def emit_verilog(memory, ns, clock_domains): def emit_verilog(memory, ns):
r = "" r = ""
gn = ns.get_name # usable instead of verilog_printexpr as ports contain only signals gn = ns.get_name # usable instead of verilog_printexpr as ports contain only signals
adrbits = bits_for(memory.depth-1) adrbits = bits_for(memory.depth-1)
@ -244,7 +235,7 @@ class Memory(Special):
data_regs[id(port)] = data_reg data_regs[id(port)] = data_reg
for port in memory.ports: for port in memory.ports:
r += "always @(posedge " + gn(clock_domains[port.clock_domain].clk) + ") begin\n" r += "always @(posedge " + gn(port.clock) + ") begin\n"
if port.we is not None: if port.we is not None:
if port.we_granularity: if port.we_granularity:
n = memory.width//port.we_granularity n = memory.width//port.we_granularity
@ -299,7 +290,7 @@ class SynthesisDirective(Special):
self.signals = signals self.signals = signals
@staticmethod @staticmethod
def emit_verilog(directive, ns, clock_domains): def emit_verilog(directive, ns):
name_dict = dict((k, ns.get_name(sig)) for k, sig in directive.signals.items()) name_dict = dict((k, ns.get_name(sig)) for k, sig in directive.signals.items())
formatted = directive.template.format(**name_dict) formatted = directive.template.format(**name_dict)
return "// synthesis " + formatted + "\n" return "// synthesis " + formatted + "\n"

6
migen/fhdl/verilog.py
View file

@ -233,10 +233,10 @@ def _lower_specials(overrides, specials):
lowered_specials.add(special) lowered_specials.add(special)
return f, lowered_specials return f, lowered_specials
def _printspecials(overrides, specials, ns, clock_domains): def _printspecials(overrides, specials, ns):
r = "" r = ""
for special in sorted(specials, key=lambda x: x.huid): for special in sorted(specials, key=lambda x: x.huid):
pr = _call_special_classmethod(overrides, special, "emit_verilog", ns, clock_domains) pr = _call_special_classmethod(overrides, special, "emit_verilog", ns)
if pr is None: if pr is None:
raise NotImplementedError("Special " + str(special) + " failed to implement emit_verilog") raise NotImplementedError("Special " + str(special) + " failed to implement emit_verilog")
r += pr r += pr
@ -289,7 +289,7 @@ def convert(f, ios=None, name="top",
r += _printheader(f, ios, name, ns) r += _printheader(f, ios, name, ns)
r += _printcomb(f, ns, display_run) r += _printcomb(f, ns, display_run)
r += _printsync(f, ns) r += _printsync(f, ns)
r += _printspecials(special_overrides, f.specials - lowered_specials, ns, f.clock_domains) r += _printspecials(special_overrides, f.specials - lowered_specials, ns)
r += _printinit(f, ios, ns) r += _printinit(f, ios, ns)
r += "endmodule\n" r += "endmodule\n"