build: efinix: use constant output option

use constant output option, when the output is a `Constant`

Signed-off-by: Fin Maaß <f.maass@vogl-electronic.com>
This commit is contained in:
Fin Maaß 2024-10-23 11:55:22 +02:00
parent 2d96e99494
commit 54973eb9cb
No known key found for this signature in database
2 changed files with 42 additions and 7 deletions

View File

@ -38,6 +38,20 @@ if _have_colorama:
def assert_is_signal_or_clocksignal(obj): def assert_is_signal_or_clocksignal(obj):
assert isinstance(obj, (ClockSignal, Signal)), f"Object {obj} is not a ClockSignal or Signal" assert isinstance(obj, (ClockSignal, Signal)), f"Object {obj} is not a ClockSignal or Signal"
def const_output_calc(o, io):
if o.value == 0:
const_output = 0
elif len(o) == 1:
const_output = 1
else:
const_output = []
for bit in range(len(io)):
if o.value & (1 << bit):
const_output.append(1)
else:
const_output.append(0)
return const_output
# Efinix AsyncResetSynchronizer -------------------------------------------------------------------- # Efinix AsyncResetSynchronizer --------------------------------------------------------------------
class EfinixAsyncResetSynchronizerImpl(LiteXModule): class EfinixAsyncResetSynchronizerImpl(LiteXModule):
@ -142,12 +156,16 @@ class EfinixTristateImpl(LiteXModule):
io_pad = platform.get_pins_location(io) io_pad = platform.get_pins_location(io)
io_prop = platform.get_pin_properties(io[0]) io_prop = platform.get_pin_properties(io[0])
io_prop_dict = dict(io_prop) io_prop_dict = dict(io_prop)
if isinstance(o, Constant):
const_output = const_output_calc(o, io)
else:
const_output = "NONE"
io_data_i = platform.add_iface_io(io_name + "_OUT", len(io)) io_data_i = platform.add_iface_io(io_name + "_OUT", len(io))
io_data_o = platform.add_iface_io(io_name + "_IN", len(io))
io_data_e = platform.add_iface_io(io_name + "_OE", len(io))
self.comb += io_data_i.eq(o) self.comb += io_data_i.eq(o)
io_data_e = platform.add_iface_io(io_name + "_OE", len(io))
self.comb += io_data_e.eq(oe) self.comb += io_data_e.eq(oe)
if i is not None: if i is not None:
io_data_o = platform.add_iface_io(io_name + "_IN", len(io))
self.comb += i.eq(io_data_o) self.comb += i.eq(io_data_o)
block = { block = {
"type" : "GPIO", "type" : "GPIO",
@ -156,6 +174,7 @@ class EfinixTristateImpl(LiteXModule):
"location" : io_pad, "location" : io_pad,
"properties" : io_prop, "properties" : io_prop,
"size" : len(io), "size" : len(io),
"const_output" : const_output,
"drive_strength" : io_prop_dict.get("DRIVE_STRENGTH", "4") "drive_strength" : io_prop_dict.get("DRIVE_STRENGTH", "4")
} }
platform.toolchain.ifacewriter.blocks.append(block) platform.toolchain.ifacewriter.blocks.append(block)
@ -326,10 +345,14 @@ class EfinixSDRTristateImpl(LiteXModule):
io_pad = platform.get_pin_location(io) io_pad = platform.get_pin_location(io)
io_prop = platform.get_pin_properties(io) io_prop = platform.get_pin_properties(io)
io_prop_dict = dict(io_prop) io_prop_dict = dict(io_prop)
if isinstance(o, Constant):
const_output = const_output_calc(o, io)
else:
const_output = "NONE"
io_data_i = platform.add_iface_io(io_name + "_OUT") io_data_i = platform.add_iface_io(io_name + "_OUT")
self.comb += io_data_i.eq(o)
io_data_o = platform.add_iface_io(io_name + "_IN") io_data_o = platform.add_iface_io(io_name + "_IN")
io_data_e = platform.add_iface_io(io_name + "_OE") io_data_e = platform.add_iface_io(io_name + "_OE")
self.comb += io_data_i.eq(o)
self.comb += io_data_e.eq(oe) self.comb += io_data_e.eq(oe)
self.comb += i.eq(io_data_o) self.comb += i.eq(io_data_o)
block = { block = {
@ -343,6 +366,7 @@ class EfinixSDRTristateImpl(LiteXModule):
"in_clk_pin" : clk, "in_clk_pin" : clk,
"out_reg" : "REG", "out_reg" : "REG",
"out_clk_pin" : clk, "out_clk_pin" : clk,
"const_output" : const_output,
"oe_reg" : "REG", "oe_reg" : "REG",
"in_clk_inv" : 0, "in_clk_inv" : 0,
"out_clk_inv" : 0, "out_clk_inv" : 0,
@ -367,6 +391,10 @@ class EfinixSDROutputImpl(LiteXModule):
io_pad = platform.get_pin_location(o) io_pad = platform.get_pin_location(o)
io_prop = platform.get_pin_properties(o) io_prop = platform.get_pin_properties(o)
io_prop_dict = dict(io_prop) io_prop_dict = dict(io_prop)
if isinstance(i, Constant):
const_output = const_output_calc(i, o)
else:
const_output = "NONE"
io_data_i = platform.add_iface_io(io_name) io_data_i = platform.add_iface_io(io_name)
self.comb += io_data_i.eq(i) self.comb += io_data_i.eq(i)
block = { block = {
@ -378,6 +406,7 @@ class EfinixSDROutputImpl(LiteXModule):
"size" : 1, "size" : 1,
"out_reg" : "REG", "out_reg" : "REG",
"out_clk_pin" : clk, "out_clk_pin" : clk,
"const_output" : const_output,
"out_clk_inv" : 0, "out_clk_inv" : 0,
"drive_strength" : io_prop_dict.get("DRIVE_STRENGTH", "4") "drive_strength" : io_prop_dict.get("DRIVE_STRENGTH", "4")
} }

View File

@ -222,6 +222,12 @@ design.create("{2}", "{3}", "./../gateware", overwrite=True)
cmd += 'design.set_property("{}","DRIVE_STRENGTH","{}")\n'.format(name, block["drive_strength"]) cmd += 'design.set_property("{}","DRIVE_STRENGTH","{}")\n'.format(name, block["drive_strength"])
if "slewrate" in block: if "slewrate" in block:
cmd += 'design.set_property("{}","SLEWRATE","{}")\n'.format(name, block["slewrate"]) cmd += 'design.set_property("{}","SLEWRATE","{}")\n'.format(name, block["slewrate"])
if "const_output" in block:
if not isinstance(block["const_output"], list):
cmd += f'design.set_property("{name}","CONST_OUTPUT","{block["const_output"]}")\n'
else:
for i, val in enumerate(block["const_output"]):
cmd += f'design.set_property("{name}[{i}]","CONST_OUTPUT","{val}")\n'
if mode == "INOUT" or mode == "INPUT" or mode == "OUTPUT": if mode == "INOUT" or mode == "INPUT" or mode == "OUTPUT":
if prop: if prop: