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_gbio2.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'icefuzz/make_gbio2.py') diff --git a/icefuzz/make_gbio2.py b/icefuzz/make_gbio2.py index 2b62ba4..41187ee 100644 --- a/icefuzz/make_gbio2.py +++ b/icefuzz/make_gbio2.py @@ -7,11 +7,13 @@ import os os.system("rm -rf work_gbio2") os.mkdir("work_gbio2") -w = 4 if os.getenv('ICE384PINS') else 8 - for p in gpins: if p in pins: pins.remove(p) +# We can either tickle every global buffer or we don't have enough pins to do +# the full logic for each one. +w = min(min((len(pins) - 8) // 4, len(gpins)), 8) + for idx in range(num): with open("work_gbio2/gbio2_%02d.v" % idx, "w") as f: glbs = np.random.permutation(list(range(8))) @@ -86,4 +88,3 @@ with open("work_gbio2/Makefile", "w") as f: for i in range(num): print("gbio2_%02d.bin:" % i, file=f) print("\t-bash ../icecube.sh gbio2_%02d > gbio2_%02d.log 2>&1 && rm -rf gbio2_%02d.tmp || tail gbio2_%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_gbio2.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'icefuzz/make_gbio2.py') diff --git a/icefuzz/make_gbio2.py b/icefuzz/make_gbio2.py index 41187ee..fedc8c8 100644 --- a/icefuzz/make_gbio2.py +++ b/icefuzz/make_gbio2.py @@ -4,8 +4,12 @@ from fuzzconfig import * import numpy as np import os -os.system("rm -rf work_gbio2") -os.mkdir("work_gbio2") +device_class = os.getenv("ICEDEVICE") + +working_dir = "work_%s_gbio2" % (device_class, ) + +os.system("rm -rf " + working_dir) +os.mkdir(working_dir) for p in gpins: if p in pins: pins.remove(p) @@ -15,7 +19,7 @@ for p in gpins: w = min(min((len(pins) - 8) // 4, len(gpins)), 8) for idx in range(num): - with open("work_gbio2/gbio2_%02d.v" % idx, "w") as f: + with open(working_dir + "/gbio2_%02d.v" % idx, "w") as f: glbs = np.random.permutation(list(range(8))) print(""" module top ( @@ -71,7 +75,7 @@ for idx in range(num): """ % ( glbs[0], glbs[1], glbs[1], glbs[2], glbs[3] ), file=f) - with open("work_gbio2/gbio2_%02d.pcf" % idx, "w") as f: + with open(working_dir + "/gbio2_%02d.pcf" % idx, "w") as f: p = np.random.permutation(pins) g = np.random.permutation(gpins) for i in range(w): @@ -83,8 +87,5 @@ for idx in range(num): print("set_io %s %s" % (n, p[4*w+i]), file=f) print("set_io q %s" % (p[-1]), file=f) -with open("work_gbio2/Makefile", "w") as f: - print("all: %s" % " ".join(["gbio2_%02d.bin" % i for i in range(num)]), file=f) - for i in range(num): - print("gbio2_%02d.bin:" % i, file=f) - print("\t-bash ../icecube.sh gbio2_%02d > gbio2_%02d.log 2>&1 && rm -rf gbio2_%02d.tmp || tail gbio2_%02d.log" % (i, i, i, i), file=f) + +output_makefile(working_dir, "gbio2") -- cgit v1.2.3