From 13ffbcbf50728e4085554fa894979c1e87dbb362 Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Fri, 26 Feb 2021 11:59:39 +0100 Subject: [PATCH] segmaker: fix site_type prefixes for GTP sites Signed-off-by: Alessandro Comodi --- fuzzers/063-gtp-common-conf/generate.py | 2 +- prjxray/segmaker.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fuzzers/063-gtp-common-conf/generate.py b/fuzzers/063-gtp-common-conf/generate.py index f7bb4d9c..640e4b53 100644 --- a/fuzzers/063-gtp-common-conf/generate.py +++ b/fuzzers/063-gtp-common-conf/generate.py @@ -134,7 +134,7 @@ def main(): for i in range(2): segmk.add_tile_tag( - tile, "IBUFDS_GTE2.%s[%u]" % (param, i), bitstr[i]) + tile, "IBUFDS_GTE2.CLKSWING_CFG[%u]" % (i), bitstr[i]) if tile_type.startswith("GTP_COMMON_MID"): bitfilter = bitfilter_gtp_common_mid diff --git a/prjxray/segmaker.py b/prjxray/segmaker.py index 2c162827..4d6795f3 100644 --- a/prjxray/segmaker.py +++ b/prjxray/segmaker.py @@ -283,7 +283,7 @@ class Segmaker: segment["tags"][tag] = value def add_site_tags(): - site_prefix = site.split('_')[0] + site_prefix = "_".join(site.split('_')[0:-1]) def name_slice(): ''' @@ -331,7 +331,7 @@ class Segmaker: 'IDELAY': name_y0y1, 'ILOGIC': name_y0y1, 'OLOGIC': name_y0y1, - 'IBUFDS': name_y0y1, + 'IBUFDS_GTE2': name_y0y1, }.get(site_prefix, name_default)() self.verbose and print( 'site %s w/ %s prefix => tag %s' %