Merge branch 'ice5k'

1 files changed, 10 insertions, 9 deletions

diff --git a/icefuzz/make_binop.py b/icefuzz/make_binop.py
index b84ee7d..ada9d56 100644
--- a/icefuzz/make_binop.py
+++ b/icefuzz/make_binop.py
@@ -4,23 +4,24 @@ from fuzzconfig import *
 import numpy as np
 import os
 
-os.system("rm -rf work_binop")
-os.mkdir("work_binop")
+device_class = os.getenv("ICEDEVICE")
+
+working_dir = "work_%s_binop" % (device_class, )
+
+os.system("rm -rf " + working_dir)
+os.mkdir(working_dir)
 
 for idx in range(num):
-    with open("work_binop/binop_%02d.v" % idx, "w") as f:
+    with open(working_dir + "/binop_%02d.v" % idx, "w") as f:
         print("module top(input a, b, output y);", file=f)
         print("  assign y = a%sb;" % np.random.choice([" ^ ", " ^ ~", " & ", " & ~", " | ", " | ~"]), file=f)
         print("endmodule", file=f)
-    with open("work_binop/binop_%02d.pcf" % idx, "w") as f:
+    with open(working_dir + "/binop_%02d.pcf" % idx, "w") as f:
         p = np.random.permutation(pins)
         print("set_io a %s" % p[0], file=f)
         print("set_io b %s" % p[1], file=f)
         print("set_io y %s" % p[2], file=f)
 
-with open("work_binop/Makefile", "w") as f:
-    print("all: %s" % " ".join(["binop_%02d.bin" % i for i in range(num)]), file=f)
-    for i in range(num):
-        print("binop_%02d.bin:" % i, file=f)
-        print("\t-bash ../icecube.sh binop_%02d > binop_%02d.log 2>&1 && rm -rf binop_%02d.tmp || tail binop_%02d.log" % (i, i, i, i), file=f)
+
+output_makefile(working_dir, "binop")