Merge pull request #397 from mcmasterg/branch3

Drop HCLK_CK_INOUT_*
This commit is contained in:
John McMaster 2018-12-22 17:24:15 -08:00 committed by GitHub
commit fa5297d2a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 7 deletions

View File

@ -8,8 +8,8 @@ database: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -o build/segbits_hclk_r.db $(addsuffix /segdata_hclk_r_design_*.txt,$(SPECIMENS))
${XRAY_MASKMERGE} mask_hclk_l.db $(addsuffix /segdata_hclk_l_design_*.txt,$(SPECIMENS))
${XRAY_MASKMERGE} mask_hclk_r.db $(addsuffix /segdata_hclk_r_design_*.txt,$(SPECIMENS))
grep CK_INOUT segbits_hclk_l.db | sed 's, .*, always,' > build/ppips_hclk_l.txt
grep CK_INOUT segbits_hclk_r.db | sed 's, .*, always,' > build/ppips_hclk_r.txt
grep CK_INOUT build/segbits_hclk_l.db | sed 's, .*, always,' > build/ppips_hclk_l.txt
grep CK_INOUT build/segbits_hclk_r.db | sed 's, .*, always,' > build/ppips_hclk_r.txt
pushdb:
${XRAY_DBFIXUP} --db-root . --clb-int

View File

@ -4,3 +4,4 @@ Fuzzer for PIPs in HCLK titles
Run this fuzzer once.
It cannot solve HCLK.HCLK_CK_INOUT_* family

View File

@ -1,6 +1,7 @@
#!/usr/bin/env python3
import sys
import re
from prjxray.segmaker import Segmaker
@ -40,18 +41,26 @@ for arg in sys.argv[1:]:
if "CLB_IO_CLK" not in segmk.grid[tile]["bits"]:
print("WARNING: dropping tile %s" % tile)
continue
tag = "%s.%s" % (dst, src)
segmk.add_tile_tag(tile, tag, 1)
def add_tile_tag(tag, val):
# Workaround for https://github.com/SymbiFlow/prjxray/issues/396
# TODO: drop from tcl or make an ignpip
if re.match(r"HCLK_CK_INOUT_.*", tag):
# print("Dropping %s %s" % (tag, val))
return
segmk.add_tile_tag(tile, tag, val)
add_tile_tag(tag, 1)
if "HCLK_CK_BUFH" in src:
en_tag = "ENABLE_BUFFER.%s" % src
segmk.add_tile_tag(tile, en_tag, 1)
add_tile_tag(en_tag, 1)
for tag, tag_dst in tags.items():
if tag_dst != dst:
segmk.add_tile_tag(tile, tag, 0)
add_tile_tag(tag, 0)
for en_tag, en_tag_src in en_tags.items():
if en_tag_src != src:
segmk.add_tile_tag(tile, en_tag, 0)
add_tile_tag(en_tag, 0)
segmk.compile()
segmk.write(arg)