Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build/xilinx: add disable_constraints parameter to Platform.add_ip. 

When integrate .xci, we don't necessarily want to apply the default timing/loc
constrants generated by Vivado but our custom ones. Setting disable_constraints
to True allow disabling .xdc generated by the IP.
This commit is contained in:
Florent Kermarrec 2020-05-07 11:34:26 +02:00
parent 84841e1d58
commit d74f8fc93d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
litex/build/xilinx/platform.py
View File

@ -15,7 +15,7 @@ class XilinxPlatform(GenericPlatform):
def __init__(self, *args, toolchain="ise", **kwargs): def __init__(self, *args, toolchain="ise", **kwargs):
GenericPlatform.__init__(self, *args, **kwargs) GenericPlatform.__init__(self, *args, **kwargs)
self.edifs = set() self.edifs = set()
self.ips = set() self.ips = {}
if toolchain == "ise": if toolchain == "ise":
self.toolchain = ise.XilinxISEToolchain() self.toolchain = ise.XilinxISEToolchain()
elif toolchain == "vivado": elif toolchain == "vivado":
@ -26,8 +26,8 @@ class XilinxPlatform(GenericPlatform):
def add_edif(self, filename): def add_edif(self, filename):
self.edifs.add((os.path.abspath(filename))) self.edifs.add((os.path.abspath(filename)))
def add_ip(self, filename): def add_ip(self, filename, disable_constraints=False):
self.ips.add((os.path.abspath(filename))) self.ips.update({os.path.abspath(filename): disable_constraints})
def get_verilog(self, *args, special_overrides=dict(), **kwargs): def get_verilog(self, *args, special_overrides=dict(), **kwargs):
so = dict(common.xilinx_special_overrides) so = dict(common.xilinx_special_overrides)

4
litex/build/xilinx/vivado.py
View File

@ -155,7 +155,7 @@ class XilinxVivadoToolchain:
# Add IPs # Add IPs
tcl.append("\n# Add IPs\n") tcl.append("\n# Add IPs\n")
for filename in platform.ips: for filename, disable_constraints in platform.ips.items():
filename_tcl = "{" + filename + "}" filename_tcl = "{" + filename + "}"
ip = os.path.splitext(os.path.basename(filename))[0] ip = os.path.splitext(os.path.basename(filename))[0]
tcl.append("read_ip " + filename_tcl) tcl.append("read_ip " + filename_tcl)
@ -163,6 +163,8 @@ class XilinxVivadoToolchain:
tcl.append("generate_target all [get_ips {}]".format(ip)) tcl.append("generate_target all [get_ips {}]".format(ip))
tcl.append("synth_ip [get_ips {}] -force".format(ip)) tcl.append("synth_ip [get_ips {}] -force".format(ip))
tcl.append("get_files -all -of_objects [get_files {}]".format(filename_tcl)) tcl.append("get_files -all -of_objects [get_files {}]".format(filename_tcl))
if disable_constraints:
tcl.append("set_property is_enabled false [get_files -of_objects [get_files {}] -filter {{FILE_TYPE == XDC}}]".format(filename_tcl))
# Add constraints # Add constraints
tcl.append("\n# Add constraints\n") tcl.append("\n# Add constraints\n")