More work figuring out values in icebox.py

4 files changed, 48 insertions, 5 deletions

diff --git a/icefuzz/Makefile b/icefuzz/Makefile
index 47aeb0c..b3e3b95 100644
--- a/icefuzz/Makefile
+++ b/icefuzz/Makefile
@@ -47,9 +47,14 @@ database: bitdata_io.txt bitdata_logic.txt bitdata_ramb$(RAM_SUFFIX).txt bitdata
 ifneq ($(RAM_SUFFIX),)
 	cp cached_ramb.txt bitdata_ramb.txt
 	cp cached_ramt.txt bitdata_ramt.txt
-else
-	cp cached_ramb$(RAM_SUFFIX).txt bitdata_ramb$(RAM_SUFFIX).txt
-	cp cached_ramt$(RAM_SUFFIX).txt bitdata_ramt$(RAM_SUFFIX).txt
+endif
+ifneq ($(RAM_SUFFIX),_8k)
+	cp cached_ramb_8k.txt bitdata_ramb_8k.txt
+	cp cached_ramt_8k.txt bitdata_ramt_8k.txt
+endif
+ifneq ($(RAM_SUFFIX),_5k)
+	cp cached_ramb_5k.txt bitdata_ramb_5k.txt
+	cp cached_ramt_5k.txt bitdata_ramt_5k.txt
 endif
 	ICEDEVICE=$(DEVICECLASS) python3 database.py
 	python3 export.py
diff --git a/icefuzz/cached_io.txt b/icefuzz/cached_io.txt
index ceab399..eb247af 100644
--- a/icefuzz/cached_io.txt
+++ b/icefuzz/cached_io.txt
@@ -553,9 +553,12 @@
 (2 2) PLL config bit: CLOCK_T_0_2_IOLEFT_cf_bit_4
 (2 2) PLL config bit: CLOCK_T_0_3_IOLEFT_cf_bit_4
 (2 2) PLL config bit: CLOCK_T_0_4_IOLEFT_cf_bit_4
+(2 2) PLL config bit: CLOCK_T_10_31_IOUP_cf_bit_4
+(2 2) PLL config bit: CLOCK_T_11_31_IOUP_cf_bit_4
 (2 2) PLL config bit: CLOCK_T_12_31_IOUP_cf_bit_4
 (2 2) PLL config bit: CLOCK_T_13_31_IOUP_cf_bit_4
 (2 2) PLL config bit: CLOCK_T_14_0_IODOWN_cf_bit_4
+(2 2) PLL config bit: CLOCK_T_14_31_IOUP_cf_bit_4
 (2 2) PLL config bit: CLOCK_T_15_0_IODOWN_cf_bit_4
 (2 2) PLL config bit: CLOCK_T_16_0_IODOWN_cf_bit_4
 (2 2) PLL config bit: CLOCK_T_17_0_IODOWN_cf_bit_4
@@ -671,8 +674,12 @@
 (3 2) PLL config bit: CLOCK_T_0_3_IOLEFT_cf_bit_5
 (3 2) PLL config bit: CLOCK_T_0_4_IOLEFT_cf_bit_5
 (3 2) PLL config bit: CLOCK_T_0_5_IOLEFT_cf_bit_5
+(3 2) PLL config bit: CLOCK_T_10_31_IOUP_cf_bit_5
+(3 2) PLL config bit: CLOCK_T_11_31_IOUP_cf_bit_5
+(3 2) PLL config bit: CLOCK_T_12_31_IOUP_cf_bit_5
 (3 2) PLL config bit: CLOCK_T_13_31_IOUP_cf_bit_5
 (3 2) PLL config bit: CLOCK_T_14_0_IODOWN_cf_bit_5
+(3 2) PLL config bit: CLOCK_T_14_31_IOUP_cf_bit_5
 (3 2) PLL config bit: CLOCK_T_15_0_IODOWN_cf_bit_5
 (3 2) PLL config bit: CLOCK_T_16_0_IODOWN_cf_bit_5
 (3 2) PLL config bit: CLOCK_T_17_0_IODOWN_cf_bit_5
@@ -682,7 +689,9 @@
 (3 3) PLL config bit: CLOCK_T_0_3_IOLEFT_cf_bit_3
 (3 3) PLL config bit: CLOCK_T_0_4_IOLEFT_cf_bit_3
 (3 3) PLL config bit: CLOCK_T_0_5_IOLEFT_cf_bit_3
+(3 3) PLL config bit: CLOCK_T_10_31_IOUP_cf_bit_3
 (3 3) PLL config bit: CLOCK_T_11_31_IOUP_cf_bit_3
+(3 3) PLL config bit: CLOCK_T_12_31_IOUP_cf_bit_3
 (3 3) PLL config bit: CLOCK_T_13_31_IOUP_cf_bit_3
 (3 3) PLL config bit: CLOCK_T_14_0_IODOWN_cf_bit_3
 (3 3) PLL config bit: CLOCK_T_14_31_IOUP_cf_bit_3
@@ -704,7 +713,9 @@
 (3 5) PLL config bit: CLOCK_T_0_2_IOLEFT_cf_bit_6
 (3 5) PLL config bit: CLOCK_T_0_3_IOLEFT_cf_bit_6
 (3 5) PLL config bit: CLOCK_T_0_4_IOLEFT_cf_bit_6
+(3 5) PLL config bit: CLOCK_T_10_31_IOUP_cf_bit_6
 (3 5) PLL config bit: CLOCK_T_11_31_IOUP_cf_bit_6
+(3 5) PLL config bit: CLOCK_T_12_31_IOUP_cf_bit_6
 (3 5) PLL config bit: CLOCK_T_13_31_IOUP_cf_bit_6
 (3 5) PLL config bit: CLOCK_T_14_0_IODOWN_cf_bit_6
 (3 5) PLL config bit: CLOCK_T_15_0_IODOWN_cf_bit_6
diff --git a/icefuzz/database.py b/icefuzz/database.py
index 979b92b..50a28fc 100644
--- a/icefuzz/database.py
+++ b/icefuzz/database.py
@@ -138,11 +138,11 @@ with open("database_ramt.txt", "w") as f:
     for entry in read_database("bitdata_ramt.txt", "ramt"):
         print("\t".join(entry), file=f)
 
-if device_class in ["5k", "8k"]:
+for device_class in ["5k", "8k"]:
   with open("database_ramb_%s.txt" % (device_class, ), "w") as f:
       for entry in read_database("bitdata_ramb_%s.txt" % (device_class, ), "ramb_" + device_class):
           print("\t".join(entry), file=f)
 
-  with open("database_ramt_8k.txt", "w") as f:
+  with open("database_ramt_%s.txt" % (device_class, ), "w") as f:
       for entry in read_database("bitdata_ramt_%s.txt" % (device_class, ), "ramt_" + device_class):
           print("\t".join(entry), file=f)
diff --git a/icefuzz/tests/io_latched_5k.sh b/icefuzz/tests/io_latched_5k.sh
new file mode 100644
index 0000000..a43c77f
--- /dev/null
+++ b/icefuzz/tests/io_latched_5k.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -ex
+
+mkdir -p io_latched_5k.work
+cd io_latched_5k.work
+
+pins="
+2 3 4 6 9 10 11 12
+13 18 19 20 21 23
+25 26 27 28 31 32 34 35 36
+37 38 42 43 44 45 46 47 48
+"
+pins="$( echo $pins )"
+
+for pin in $pins ; do
+	pf="io_latched_$pin"
+	cp ../io_latched.v ${pf}.v
+	read pin_latch pin_data < <( echo $pins | tr ' ' '\n' | grep -v $pin | sort -R; )
+	{
+		echo "set_io pin $pin"
+		echo "set_io latch_in $pin_latch"
+		echo "set_io data_out $pin_data"
+	} > ${pf}.pcf
+	ICEDEV=up5k-sg48 bash ../../icecube.sh ${pf}.v
+	../../../icebox/icebox_vlog.py -SP ${pf}.psb ${pf}.asc > ${pf}.ve
+done