From 58a6110be198089d784b5ad3e2ecb611182bd5ea Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 22 Jun 2017 17:38:38 -0700 Subject: Add icefuzz support for the UP5K and rework underlying device specification for more flexibility. --- icefuzz/make_aig.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'icefuzz/make_aig.py') diff --git a/icefuzz/make_aig.py b/icefuzz/make_aig.py index 8dd5ef0..14431d5 100644 --- a/icefuzz/make_aig.py +++ b/icefuzz/make_aig.py @@ -7,11 +7,13 @@ import os os.system("rm -rf work_aig") os.mkdir("work_aig") +w = len(pins) // 2 + for idx in range(num): with open("work_aig/aig_%02d.v" % idx, "w") as f: - print("module top(input [31:0] a, output [31:0] y);", file=f) + print("module top(input [%d:0] a, output [%d:0] y);" % (w-1, w-1), file=f) - sigs = ["a[%d]" % i for i in range(32)] + sigs = ["a[%d]" % i for i in range(w)] netidx = 0 for i in range(100 if num_ramb40 < 20 else 1000): @@ -40,20 +42,19 @@ for idx in range(num): sigs.append(newnet) - for i in range(32): + for i in range(w): print(" assign y[%d] = %s;" % (i, sigs[i]), file=f) print("endmodule", file=f) with open("work_aig/aig_%02d.pcf" % idx, "w") as f: p = np.random.permutation(pins) - for i in range(32): + for i in range(w): print("set_io a[%d] %s" % (i, p[i]), file=f) - print("set_io y[%d] %s" % (i, p[i+32]), file=f) + print("set_io y[%d] %s" % (i, p[i+w]), file=f) with open("work_aig/Makefile", "w") as f: print("all: %s" % " ".join(["aig_%02d.bin" % i for i in range(num)]), file=f) for i in range(num): print("aig_%02d.bin:" % i, file=f) print("\t-bash ../icecube.sh aig_%02d > aig_%02d.log 2>&1 && rm -rf aig_%02d.tmp || tail aig_%02d.log" % (i, i, i, i), file=f) - -- cgit v1.2.3 From b00ffb1c091b65ed6c741dde74a4e7d5f709efd1 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Sun, 2 Jul 2017 15:38:44 -0700 Subject: Introduce device class into fuxx workign directories and have glbcheck handle unsupported 5k tiles ok. --- icefuzz/make_aig.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'icefuzz/make_aig.py') diff --git a/icefuzz/make_aig.py b/icefuzz/make_aig.py index 14431d5..60f5946 100644 --- a/icefuzz/make_aig.py +++ b/icefuzz/make_aig.py @@ -4,13 +4,17 @@ from fuzzconfig import * import numpy as np import os -os.system("rm -rf work_aig") -os.mkdir("work_aig") +device_class = os.getenv("ICEDEVICE") + +working_dir = "work_%s_aig" % (device_class, ) + +os.system("rm -rf " + working_dir) +os.mkdir(working_dir) w = len(pins) // 2 for idx in range(num): - with open("work_aig/aig_%02d.v" % idx, "w") as f: + with open(working_dir + "/aig_%02d.v" % idx, "w") as f: print("module top(input [%d:0] a, output [%d:0] y);" % (w-1, w-1), file=f) sigs = ["a[%d]" % i for i in range(w)] @@ -47,14 +51,11 @@ for idx in range(num): print("endmodule", file=f) - with open("work_aig/aig_%02d.pcf" % idx, "w") as f: + with open(working_dir + "/aig_%02d.pcf" % idx, "w") as f: p = np.random.permutation(pins) for i in range(w): print("set_io a[%d] %s" % (i, p[i]), file=f) print("set_io y[%d] %s" % (i, p[i+w]), file=f) -with open("work_aig/Makefile", "w") as f: - print("all: %s" % " ".join(["aig_%02d.bin" % i for i in range(num)]), file=f) - for i in range(num): - print("aig_%02d.bin:" % i, file=f) - print("\t-bash ../icecube.sh aig_%02d > aig_%02d.log 2>&1 && rm -rf aig_%02d.tmp || tail aig_%02d.log" % (i, i, i, i), file=f) + +output_makefile(working_dir, "aig") -- cgit v1.2.3