From 40894fcb0039da4b1db1d61320b1e654ab6eb1d8 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sun, 19 Nov 2017 23:14:49 +0000 Subject: [PATCH] Update database Signed-off-by: Clifford Wolf Signed-off-by: Tim 'mithro' Ansell --- fuzzers/054-gfan/generate.py | 10 ++-------- fuzzers/054-gfan/maketodo.py | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/fuzzers/054-gfan/generate.py b/fuzzers/054-gfan/generate.py index 23ead416..ff4c97ef 100644 --- a/fuzzers/054-gfan/generate.py +++ b/fuzzers/054-gfan/generate.py @@ -41,7 +41,7 @@ with open("design.txt", "r") as f: tiledata[tile]["srcs"].add(dst) tiledata[tile]["dsts"].add(src) - if pnum == 1 or pdir == 0 or not re.match(r"^CTRL", dst): + if pnum == 1 or pdir == 0 or not re.match(r"^GFAN", dst): ignpip.add(pip) for tile, pips_srcs_dsts in tiledata.items(): @@ -58,12 +58,6 @@ for tile, pips_srcs_dsts in tiledata.items(): elif src_dst[1] not in dsts: segmk.addtag(tile, "%s.%s" % (dst, src), 0) -def bitfilter(frame_idx, bit_idx): - assert os.getenv("XRAY_DATABASE") == "artix7" - if (frame_idx, bit_idx) in [(0, 48), (1, 31), (0, 32), (1, 35)]: - return False - return frame_idx in [0, 1] - -segmk.compile(bitfilter=bitfilter) +segmk.compile() segmk.write() diff --git a/fuzzers/054-gfan/maketodo.py b/fuzzers/054-gfan/maketodo.py index 4d2f9800..e6c42c8c 100644 --- a/fuzzers/054-gfan/maketodo.py +++ b/fuzzers/054-gfan/maketodo.py @@ -13,7 +13,7 @@ def maketodo(pipfile, dbfile): line = line.split() todos.remove(line[0]) for line in todos: - if re.match(r"^INT_[LR].GFAN", line): + if re.match(r"^INT_[LR].GFAN", line) and not line.endswith(".GND_WIRE"): print(line) maketodo("pips_int_l.txt", "%s/%s/segbits_int_l.db" % (os.getenv("XRAY_DATABASE_DIR"), os.getenv("XRAY_DATABASE")))