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

build/lattice/prjtrellis: test and fix iowrapper multi-bit signals support

Browse source
This commit is contained in:
Florent Kermarrec 2018-10-29 13:26:29 +01:00
parent a8f819fec2
commit c05b9ef2ad
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
litex/build/lattice/prjtrellis.py
View file

@ -12,7 +12,6 @@ from litex.build.lattice import common
# TODO: # TODO:
# - add inout support to iowrapper # - add inout support to iowrapper
# - verify iowrapper handle correctly multi-bit signals
# - check/document attr_translate # - check/document attr_translate
@ -45,9 +44,9 @@ def generate_prjtrellis_iowrapper(platform, vns):
ios_direction = {} ios_direction = {}
# resolve ios directions # resolve ios directions
cm = platform.constraint_manager cm = platform.constraint_manager
for io_name, io_pin, _, _ in ios: for io_name, io_pins, _, _ in ios:
for cm_sig, cm_pin, _, _ in cm.get_sig_constraints(): for cm_sig, cm_pins, _, _ in cm.get_sig_constraints():
if io_pin == cm_pin: if io_pins == cm_pins:
ios_direction[io_name] = cm_sig.direction ios_direction[io_name] = cm_sig.direction
last_io_name = io_name last_io_name = io_name
@ -56,10 +55,10 @@ def generate_prjtrellis_iowrapper(platform, vns):
# ios declaration # ios declaration
ios_declaration = "" ios_declaration = ""
for io_name, io_pin, _, _ in ios: for io_name, io_pins, _, _ in ios:
ios_declaration += "\t" + ios_direction[io_name] + " " ios_declaration += "\t" + ios_direction[io_name] + " "
if len(io_pin) > 1: if len(io_pins) > 1:
ios_declaration += "[{}:0] ".format(len(io_pin - 1)) ios_declaration += "[{}:0] ".format(len(io_pins) - 1)
ios_declaration += io_name + "_io" ios_declaration += io_name + "_io"
ios_declaration += ",\n" if io_name != last_io_name else "" ios_declaration += ",\n" if io_name != last_io_name else ""
iowrapper_contents.append(ios_declaration) iowrapper_contents.append(ios_declaration)
@ -67,37 +66,38 @@ def generate_prjtrellis_iowrapper(platform, vns):
# wires declaration # wires declaration
wires_declaration = "" wires_declaration = ""
for io_name, io_pin, _, _ in ios: for io_name, io_pins, _, _ in ios:
wires_declaration += "wire " wires_declaration += "wire "
if len(io_pin) > 1: if len(io_pins) > 1:
wires_declaration += "[{}:0] ".format(len(io_pin - 1)) wires_declaration += "[{}:0] ".format(len(io_pins) - 1)
wires_declaration += io_name wires_declaration += io_name
wires_declaration += ";\n" wires_declaration += ";\n"
iowrapper_contents.append(wires_declaration) iowrapper_contents.append(wires_declaration)
# trellis_io declaration # trellis_io declaration
trellis_io_declaration = "" trellis_io_declaration = ""
for io_name, io_pin, io_others, _ in ios: for io_name, io_pins, io_others, _ in ios:
for io_other in io_others: for io_other in io_others:
if isinstance(io_other, IOStandard): if isinstance(io_other, IOStandard):
io_standard = io_other.name io_standard = io_other.name
trellis_io_declaration += \ for i, io_pin in enumerate(io_pins):
"(* LOC=\"{}\" *) (* IO_TYPE=\"{}\" *)\n".format(io_pin[0], io_standard)
if ios_direction[io_name] == "input":
trellis_io_declaration += \ trellis_io_declaration += \
"TRELLIS_IO #(.DIR(\"INPUT\")) {} (.B({}), .O({}));\n".format( "(* LOC=\"{}\" *) (* IO_TYPE=\"{}\" *)\n".format(io_pin, io_standard)
io_name + "_buf", io_name + "_io", io_name) if ios_direction[io_name] == "input":
elif ios_direction[io_name] == "output": trellis_io_declaration += \
trellis_io_declaration += \ "TRELLIS_IO #(.DIR(\"INPUT\")) {} (.B({}), .O({}));\n".format(
"TRELLIS_IO #(.DIR(\"OUTPUT\")) {} (.B({}), .I({}));\n".format( io_name + "_buf" + str(i), io_name + "_io[" + str(i) + "]", io_name + "[" + str(i) + "]")
io_name + "_buf", io_name + "_io", io_name) elif ios_direction[io_name] == "output":
else: trellis_io_declaration += \
raise NotImplementedError "TRELLIS_IO #(.DIR(\"OUTPUT\")) {} (.B({}), .I({}));\n".format(
io_name + "_buf" + str(i), io_name + "_io[" + str(i) + "]", io_name + "[" + str(i) + "]")
else:
raise NotImplementedError
iowrapper_contents.append(trellis_io_declaration) iowrapper_contents.append(trellis_io_declaration)
# top declaration # top declaration
top_declaration = "{build_name} _{build_name}(\n" top_declaration = "{build_name} _{build_name}(\n"
for io_name, io_pin, _, _ in ios: for io_name, io_pins, _, _ in ios:
top_declaration += "\t." + io_name + "(" + io_name + ")" top_declaration += "\t." + io_name + "(" + io_name + ")"
top_declaration += ",\n" if io_name != last_io_name else "\n" top_declaration += ",\n" if io_name != last_io_name else "\n"
top_declaration += ");\n" top_declaration += ");\n"