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_logic.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'icefuzz/make_logic.py') diff --git a/icefuzz/make_logic.py b/icefuzz/make_logic.py index 0d45a03..7d4b62b 100644 --- a/icefuzz/make_logic.py +++ b/icefuzz/make_logic.py @@ -11,26 +11,22 @@ def random_op(): return np.random.choice(["+", "-", "^", "&", "|", "&~", "|~"]) for idx in range(num): + bus_width = len(pins) // 5 with open("work_logic/logic_%02d.v" % idx, "w") as f: - if os.getenv('ICE384PINS'): - print("module top(input [5:0] a, b, c, d, output [5:0] y);", file=f) - else: - print("module top(input [15:0] a, b, c, d, output [15:0] y);", file=f) + print("module top(input [%d:0] a, b, c, d, output [%d:0] y);" % (bus_width, bus_width), file=f) print(" assign y = (a %s b) %s (c %s d);" % (random_op(), random_op(), random_op()), file=f) print("endmodule", file=f) with open("work_logic/logic_%02d.pcf" % idx, "w") as f: p = np.random.permutation(pins) - r = 6 if os.getenv('ICE384PINS') else 16 - for i in range(r): + for i in range(bus_width): print("set_io a[%d] %s" % (i, p[i]), file=f) - print("set_io b[%d] %s" % (i, p[i+r]), file=f) - print("set_io c[%d] %s" % (i, p[i+r*2]), file=f) - print("set_io d[%d] %s" % (i, p[i+r*3]), file=f) - print("set_io y[%d] %s" % (i, p[i+r*4]), file=f) + print("set_io b[%d] %s" % (i, p[i+bus_width]), file=f) + print("set_io c[%d] %s" % (i, p[i+bus_width*2]), file=f) + print("set_io d[%d] %s" % (i, p[i+bus_width*3]), file=f) + print("set_io y[%d] %s" % (i, p[i+bus_width*4]), file=f) with open("work_logic/Makefile", "w") as f: print("all: %s" % " ".join(["logic_%02d.bin" % i for i in range(num)]), file=f) for i in range(num): print("logic_%02d.bin:" % i, file=f) print("\t-bash ../icecube.sh logic_%02d > logic_%02d.log 2>&1 && rm -rf logic_%02d.tmp || tail logic_%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_logic.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'icefuzz/make_logic.py') diff --git a/icefuzz/make_logic.py b/icefuzz/make_logic.py index 7d4b62b..9a83b21 100644 --- a/icefuzz/make_logic.py +++ b/icefuzz/make_logic.py @@ -4,19 +4,23 @@ from fuzzconfig import * import numpy as np import os -os.system("rm -rf work_logic") -os.mkdir("work_logic") +device_class = os.getenv("ICEDEVICE") + +working_dir = "work_%s_logic" % (device_class, ) + +os.system("rm -rf " + working_dir) +os.mkdir(working_dir) def random_op(): return np.random.choice(["+", "-", "^", "&", "|", "&~", "|~"]) for idx in range(num): bus_width = len(pins) // 5 - with open("work_logic/logic_%02d.v" % idx, "w") as f: + with open(working_dir + "/logic_%02d.v" % idx, "w") as f: print("module top(input [%d:0] a, b, c, d, output [%d:0] y);" % (bus_width, bus_width), file=f) print(" assign y = (a %s b) %s (c %s d);" % (random_op(), random_op(), random_op()), file=f) print("endmodule", file=f) - with open("work_logic/logic_%02d.pcf" % idx, "w") as f: + with open(working_dir + "/logic_%02d.pcf" % idx, "w") as f: p = np.random.permutation(pins) for i in range(bus_width): print("set_io a[%d] %s" % (i, p[i]), file=f) @@ -25,8 +29,4 @@ for idx in range(num): print("set_io d[%d] %s" % (i, p[i+bus_width*3]), file=f) print("set_io y[%d] %s" % (i, p[i+bus_width*4]), file=f) -with open("work_logic/Makefile", "w") as f: - print("all: %s" % " ".join(["logic_%02d.bin" % i for i in range(num)]), file=f) - for i in range(num): - print("logic_%02d.bin:" % i, file=f) - print("\t-bash ../icecube.sh logic_%02d > logic_%02d.log 2>&1 && rm -rf logic_%02d.tmp || tail logic_%02d.log" % (i, i, i, i), file=f) +output_makefile(working_dir, "logic") -- cgit v1.2.3