vendor.lattice_machxo_2_3l: fix sdc generation #547
Conversation
anuejn
changed the title
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #547 +/- ##
==========================================
- Coverage 87.15% 87.11% -0.04%
==========================================
Files 41 41
Lines 7427 7430 +3
Branches 1767 1767
==========================================
Hits 6473 6473
- Misses 778 780 +2
- Partials 176 177 +1 ☔ View full report in Codecov by Sentry. |
|
Why not use |
|
I thought that this way it is more clear that we are working around a bug here. |
|
Also if we simply chain tcl_escape and tcl_quote, we end up transforming |
|
That function is also for working around a similar issue in Vivado... |
|
So is it safe to just use tcl_quote even if it doesnt escape |
|
Yes, |
|
Please do the same for (at least) ECP5, though if you have iCECube, then iCE40 as well, and verify that it works. |
|
Should I do it as part of this pr? |
|
Yup. |
|
What we need here is actually really something different than tcl_quote. It seems like synplify really expects the net to be wrapped in curly braces but escaped as if they were wrapped in quotation marks. Just using tcl_quote doesnt work :(. |
|
Ok well that's horrible (and explains why I couldn't get it right several times already...) In that case please add |
|
@anuejn Have you had a chance to give this another look? |
|
sorry for the long delay. the code I pushed now seems to work for me. |
There was a problem hiding this comment.
Can I ask you to split this PR into two separate commits? As far as I understand/remember (correct me if I'm wrong), the SDC quoting issue and the hierarchy separator issue are different, so it would be a lot easier to understand the VCS history later if they were split. In cases like this it's OK to do cross-cutting changes through the entire vendor/ subdirectory; you don't need to change any platforms you aren't familiar with.
nmigen/build/plat.py
Outdated
| @@ -395,6 +395,9 @@ def tcl_escape(string): | |||
| def tcl_quote(string): | |||
| return '"' + re.sub(r"([$[\\])", r"\\\1", string) + '"' | |||
|
|
|||
| def sdc_quote(string): | |||
| return "{" + re.sub(r"([${}\\])", r"\\\1", string) + "}" | |||
There was a problem hiding this comment.
Would be nice to have a comment here explaining that this separate method is necessary because SDC does not actually behave like Tcl.
There was a problem hiding this comment.
Wasn't the whole point of adding this function the fact that all Synplify frontends use this quoting?
There was a problem hiding this comment.
that would be ice40 in addition to the two I already changed, right?
sadly I do not have icecube installed so i cannot test easily. should I change it anyways?
There was a problem hiding this comment.
Do you have a testcase handy? I can check all of the currently supported toolchains since I have all of them.
There was a problem hiding this comment.
Whoops I had this comment sitting here since the beginnig of 2021 but didnt send it *self facepalm*. Here you go:
I am using the following code to test it with diamond. Then I check in build/top_impl/top_impl_scck.rpt if the clock was constrained to 2Mhz successfully.
from nmigen import *
from nmigen.build import *
from nmigen_boards.tinyfpga_ax2 import *
from nmigen_boards.orangecrab_r0_2 import *
import sys
class Test(Elaboratable):
def elaborate(self, plat):
m = Module()
m.submodules.jtag = JTAG()
return m
class JTAG(Elaboratable):
def elaborate(self, plat):
m = Module()
domain_name = "$funky_domain_name"
cd_sync = ClockDomain(domain_name)
m.domains += cd_sync
plat.add_clock_constraint(cd_sync.clk, 2e6)
if isinstance(platform, TinyFPGAAX2Platform):
plat.add_resources([Resource("gpio", 0, Pins("1", conn=("gpio", 0), dir="o"), Attrs(IOSTANDARD="LVCMOS33"))])
led = plat.request("gpio", 0)
else:
plat.add_resources([Resource("gpio", 0, Pins("1", conn=("io", 0), dir="o"), Attrs(IOSTANDARD="LVCMOS33"))])
led = plat.request("gpio", 0)
m.d[domain_name] += led.eq(~led)
m.submodules.inst = Instance("JTAGF" if isinstance(platform, TinyFPGAAX2Platform) else "JTAGG", o_JTCK=cd_sync.clk)
return m
for platform in [OrangeCrabR0_2Platform(toolchain="Diamond"), TinyFPGAAX2Platform()]:
print(platform, file=sys.stderr)
platform.build(Test())
synplify used in lattice diamond requires different quoting than standard tcl quoting: wrapped in curly braces but escaped as if wrapped in quotation marks.
|
I don't believe this PR fixes the issue it claims to fix. I still get this error: |
|
I've cherry-picked 306eb7e into #1177 (iCE40 needs the same fix, I think). I'm going to close this PR in favor of that one since the |
This PR fixes both issues reported in #546 .
Probably there is a similiar issue for ecp5 and ice40 since they both use synplify.