Fixes for LP384 in some make_xx.py, etc

4 files changed, 22 insertions, 10 deletions

diff --git a/icefuzz/Makefile b/icefuzz/Makefile
index 54483b7..3fcd119 100644
--- a/icefuzz/Makefile
+++ b/icefuzz/Makefile
@@ -100,10 +100,11 @@ else
 	ICE384PINS=1 python3 make_$(1).py
 	+ICEDEV=lp384-qn32 $(MAKE) -C work_$(1)
 	python3 extract.py -3 work_$(1)/*.glb > $$@
- endif
+ else
 	python3 make_$(1).py
 	+$(MAKE) -C work_$(1)
 	python3 extract.py work_$(1)/*.glb > $$@
+ endif
 endif
 endef
 
diff --git a/icefuzz/icecube.sh b/icefuzz/icecube.sh
index d098b66..ed847a9 100644
--- a/icefuzz/icecube.sh
+++ b/icefuzz/icecube.sh
@@ -394,5 +394,6 @@ if [ -n "$ICE_SBTIMER_LP" ]; then
 	cp "$1.tmp"/outputs/netlist/top_timing_lp.rpt "$1.rlp"
 fi
 
+export LD_LIBRARY_PATH=""
 $scriptdir/../icepack/iceunpack "$1.bin" "$1.asc"
 
diff --git a/icefuzz/make_fanout.py b/icefuzz/make_fanout.py
index 9df56c7..1102cc0 100644
--- a/icefuzz/make_fanout.py
+++ b/icefuzz/make_fanout.py
@@ -9,15 +9,20 @@ os.mkdir("work_fanout")
 
 for idx in range(num):
     with open("work_fanout/fanout_%02d.v" % idx, "w") as f:
-        print("module top(input [1:0] a, output [63:0] y);", file=f)
-        print("  assign y = {32{a}};", file=f)
+        if os.getenv('ICE384PINS'):
+            print("module top(input [1:0] a, output [15:0] y);", file=f)
+            print("  assign y = {8{a}};", file=f)
+        else:
+            print("module top(input [1:0] a, output [63:0] y);", file=f)
+            print("  assign y = {32{a}};", file=f)
         print("endmodule", file=f)
     with open("work_fanout/fanout_%02d.pcf" % idx, "w") as f:
         p = np.random.permutation(pins)
-        for i in range(64):
+        r = 16 if os.getenv('ICE384PINS') else 64
+        for i in range(r):
             print("set_io y[%d] %s" % (i, p[i]), file=f)
-        print("set_io a[0] %s" % p[64], file=f)
-        print("set_io a[1] %s" % p[65], file=f)
+        print("set_io a[0] %s" % p[r], file=f)
+        print("set_io a[1] %s" % p[r+1], file=f)
 
 with open("work_fanout/Makefile", "w") as f:
     print("all: %s" % " ".join(["fanout_%02d.bin" % i for i in range(num)]), file=f)
diff --git a/icefuzz/make_mesh.py b/icefuzz/make_mesh.py
index 96e6044..1a69ca4 100644
--- a/icefuzz/make_mesh.py
+++ b/icefuzz/make_mesh.py
@@ -9,15 +9,20 @@ os.mkdir("work_mesh")
 
 for idx in range(num):
     with open("work_mesh/mesh_%02d.v" % idx, "w") as f:
-        print("module top(input [39:0] a, output [39:0] y);", file=f)
+        if os.getenv('ICE384PINS'):
+            print("module top(input [9:0] a, output [9:0] y);", file=f)
+        else:
+            print("module top(input [39:0] a, output [39:0] y);", file=f)
         print("  assign y = a;", file=f)
         print("endmodule", file=f)
     with open("work_mesh/mesh_%02d.pcf" % idx, "w") as f:
         p = np.random.permutation(pins)
-        for i in range(40):
+        if os.getenv('ICE384PINS'): r = 10
+        else: r = 40
+        for i in range(r):
             print("set_io a[%d] %s" % (i, p[i]), file=f)
-        for i in range(40):
-            print("set_io y[%d] %s" % (i, p[40+i]), file=f)
+        for i in range(r):
+            print("set_io y[%d] %s" % (i, p[r+i]), file=f)
 
 with open("work_mesh/Makefile", "w") as f:
     print("all: %s" % " ".join(["mesh_%02d.bin" % i for i in range(num)]), file=f)