From 49d8a6c22c89d8d2dfebde7f4a7dfcc8170b59db Mon Sep 17 00:00:00 2001 From: Karol Gugala Date: Wed, 9 Jan 2019 22:30:49 +0100 Subject: [PATCH] fuzzers: 56: use generic generate.py Signed-off-by: Karol Gugala --- fuzzers/056-pip-rem/Makefile | 1 + fuzzers/056-pip-rem/generate.py | 72 +-------------------------------- 2 files changed, 2 insertions(+), 71 deletions(-) mode change 100644 => 120000 fuzzers/056-pip-rem/generate.py diff --git a/fuzzers/056-pip-rem/Makefile b/fuzzers/056-pip-rem/Makefile index 15075333..bc0172a4 100644 --- a/fuzzers/056-pip-rem/Makefile +++ b/fuzzers/056-pip-rem/Makefile @@ -1,3 +1,4 @@ MAKETODO_FLAGS=--re ".*" --not-endswith ".VCC_WIRE" +GENERATE_FLAGS=--todo ../todo.txt include ../int_loop.mk diff --git a/fuzzers/056-pip-rem/generate.py b/fuzzers/056-pip-rem/generate.py deleted file mode 100644 index 78e62e14..00000000 --- a/fuzzers/056-pip-rem/generate.py +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/bin/env python3 - -from prjxray.segmaker import Segmaker - -verbose = 1 - -segmk = Segmaker("design.bits") - -tiledata = dict() -pipdata = dict() -ignpip = set() -todo = set() - -print("Loading todo from ../todo.txt.") -with open("../../todo.txt", "r") as f: - for line in f: - line = tuple(line.strip().split(".")) - verbose and print('todo', line) - todo.add(line) - -print("Loading tags from design.txt.") -with open("design.txt", "r") as f: - for line in f: - tile, pip, src, dst, pnum, pdir = line.split() - _, pip = pip.split(".") - _, src = src.split("/") - _, dst = dst.split("/") - pnum = int(pnum) - pdir = int(pdir) - - if tile not in tiledata: - tiledata[tile] = {"pips": set(), "srcs": set(), "dsts": set()} - - if pip in pipdata: - assert pipdata[pip] == (src, dst) - else: - pipdata[pip] = (src, dst) - - tiledata[tile]["pips"].add(pip) - tiledata[tile]["srcs"].add(src) - tiledata[tile]["dsts"].add(dst) - - if pdir == 0: - tiledata[tile]["srcs"].add(dst) - tiledata[tile]["dsts"].add(src) - - if pnum == 1 or pdir == 0: - verbose and print('ignore pnum == 1 or pdir == 0: ', pip) - ignpip.add(pip) - - t = ("_".join(tile.split("_")[0:2]), dst, src) - if t not in todo: - verbose and print('ignore not todo: ', t) - ignpip.add(pip) - -for tile, pips_srcs_dsts in tiledata.items(): - pips = pips_srcs_dsts["pips"] - srcs = pips_srcs_dsts["srcs"] - dsts = pips_srcs_dsts["dsts"] - - for pip, src_dst in pipdata.items(): - src, dst = src_dst - if pip in ignpip: - pass - elif pip in pips: - segmk.add_tile_tag(tile, "%s.%s" % (dst, src), 1) - elif src_dst[1] not in dsts: - segmk.add_tile_tag(tile, "%s.%s" % (dst, src), 0) - -segmk.compile() -segmk.write() diff --git a/fuzzers/056-pip-rem/generate.py b/fuzzers/056-pip-rem/generate.py new file mode 120000 index 00000000..2864b683 --- /dev/null +++ b/fuzzers/056-pip-rem/generate.py @@ -0,0 +1 @@ +../int_generate.py \ No newline at end of file