All 5k IP traced

4 files changed, 129 insertions, 3 deletions

diff --git a/icefuzz/tests/ip/trace_ip.py b/icefuzz/tests/ip/trace_ip.py
index a6a5197..f61bcfe 100755
--- a/icefuzz/tests/ip/trace_ip.py
+++ b/icefuzz/tests/ip/trace_ip.py
@@ -22,7 +22,8 @@ ip_signals["I2C"] = [["SBCLKI", "SBRWI", "SBSTBI", "SCLI", "SDAI"],
 ip_signals["SPI"] = [["SBCLKI", "SBRWI", "SBSTBI", "MI", "SI", "SCKI", "SCSNI"],
                      ["SBACKO", "SPIIRQ", "SPIWKUP", "SO", "SOE", "MO", "MOE", "SCKO", "SCKOE"]]
 
-ip_signals["LEDDA_IP"] = [["LEDDCS", "LEDDCLK", "LEDDDEN", "LEDDEXE", "LEDDRST"], ["PWMOUT0", "PWMOUT1", "PWMOUT2", "LEDDON"]]
+# LEDDRST is missing because it doesn't really exist...
+ip_signals["LEDDA_IP"] = [["LEDDCS", "LEDDCLK", "LEDDDEN", "LEDDEXE"], ["PWMOUT0", "PWMOUT1", "PWMOUT2", "LEDDON"]]
 
 fixed_cbits = {}
 
@@ -274,6 +275,7 @@ for ip in ip_types:
     with open(device + "_" + ip + "_data.txt", "w") as f:
         for loc in ip_data[ip]:
             x, y, z = loc
+            print("\t(\"%s\", (%d, %d, %d)): {" % (ip, x, y, z), file=f)
             data = ip_data[ip][loc]
             for net in sorted(data):
                 cnets = []
diff --git a/icefuzz/tests/ip/up5k_I2C_data.txt b/icefuzz/tests/ip/up5k_I2C_data.txt
index 79b9c13..a891b0c 100644
--- a/icefuzz/tests/ip/up5k_I2C_data.txt
+++ b/icefuzz/tests/ip/up5k_I2C_data.txt
@@ -1,3 +1,4 @@
+	("I2C", (0, 31, 0)): {
 		"I2CIRQ":                (0, 30, "slf_op_7"), 
 		"I2CWKUP":               (0, 29, "slf_op_5"), 
 		"I2C_ENABLE_0":          (13, 31, "cbit2usealt_in_0"), 
@@ -39,10 +40,11 @@
 		"SDA_INPUT_DELAYED":     (12, 31, "SDA_input_delay"), 
 		"SDA_OUTPUT_DELAYED":    (12, 31, "SDA_output_delay"), 
 	},
+	("I2C", (25, 31, 0)): {
 		"I2CIRQ":                (25, 30, "slf_op_7"), 
 		"I2CWKUP":               (25, 29, "slf_op_5"), 
-		"I2C_ENABLE_0":          (19, 31, "cbit2usealt_in_1"), 
-		"I2C_ENABLE_1":          (19, 31, "cbit2usealt_in_0"), 
+		"I2C_ENABLE_0":          (19, 31, "cbit2usealt_in_0"), 
+		"I2C_ENABLE_1":          (19, 31, "cbit2usealt_in_1"), 
 		"SBACKO":                (25, 30, "slf_op_6"), 
 		"SBADRI0":               (25, 30, "lutff_1/in_0"), 
 		"SBADRI1":               (25, 30, "lutff_2/in_0"), 
diff --git a/icefuzz/tests/ip/up5k_LEDDA_IP_data.txt b/icefuzz/tests/ip/up5k_LEDDA_IP_data.txt
new file mode 100644
index 0000000..4e130d1
--- /dev/null
+++ b/icefuzz/tests/ip/up5k_LEDDA_IP_data.txt
@@ -0,0 +1,22 @@
+	("LEDDA_IP", (0, 31, 2)): {
+		"LEDDADDR0":             (0, 28, "lutff_4/in_0"), 
+		"LEDDADDR1":             (0, 28, "lutff_5/in_0"), 
+		"LEDDADDR2":             (0, 28, "lutff_6/in_0"), 
+		"LEDDADDR3":             (0, 28, "lutff_7/in_0"), 
+		"LEDDCLK":               (0, 29, "clk"), 
+		"LEDDCS":                (0, 28, "lutff_2/in_0"), 
+		"LEDDDAT0":              (0, 28, "lutff_2/in_1"), 
+		"LEDDDAT1":              (0, 28, "lutff_3/in_1"), 
+		"LEDDDAT2":              (0, 28, "lutff_4/in_1"), 
+		"LEDDDAT3":              (0, 28, "lutff_5/in_1"), 
+		"LEDDDAT4":              (0, 28, "lutff_6/in_1"), 
+		"LEDDDAT5":              (0, 28, "lutff_7/in_1"), 
+		"LEDDDAT6":              (0, 28, "lutff_0/in_0"), 
+		"LEDDDAT7":              (0, 28, "lutff_1/in_0"), 
+		"LEDDDEN":               (0, 28, "lutff_1/in_1"), 
+		"LEDDEXE":               (0, 28, "lutff_0/in_1"), 
+		"LEDDON":                (0, 29, "slf_op_0"), 
+		"PWMOUT0":               (0, 28, "slf_op_4"), 
+		"PWMOUT1":               (0, 28, "slf_op_5"), 
+		"PWMOUT2":               (0, 28, "slf_op_6"), 
+	},
diff --git a/icefuzz/tests/ip/up5k_SPI_data.txt b/icefuzz/tests/ip/up5k_SPI_data.txt
new file mode 100644
index 0000000..149c93a
--- /dev/null
+++ b/icefuzz/tests/ip/up5k_SPI_data.txt
@@ -0,0 +1,100 @@
+	("SPI", (0, 0, 0)): {
+		"MCSNO0":                (0, 21, "slf_op_2"), 
+		"MCSNO1":                (0, 21, "slf_op_4"), 
+		"MCSNO2":                (0, 21, "slf_op_7"), 
+		"MCSNO3":                (0, 22, "slf_op_1"), 
+		"MCSNOE0":               (0, 21, "slf_op_3"), 
+		"MCSNOE1":               (0, 21, "slf_op_5"), 
+		"MCSNOE2":               (0, 22, "slf_op_0"), 
+		"MCSNOE3":               (0, 22, "slf_op_2"), 
+		"MI":                    (0, 22, "lutff_0/in_1"), 
+		"MO":                    (0, 20, "slf_op_6"), 
+		"MOE":                   (0, 20, "slf_op_7"), 
+		"SBACKO":                (0, 20, "slf_op_1"), 
+		"SBADRI0":               (0, 19, "lutff_1/in_1"), 
+		"SBADRI1":               (0, 19, "lutff_2/in_1"), 
+		"SBADRI2":               (0, 20, "lutff_0/in_3"), 
+		"SBADRI3":               (0, 20, "lutff_1/in_3"), 
+		"SBADRI4":               (0, 20, "lutff_2/in_3"), 
+		"SBADRI5":               (0, 20, "lutff_3/in_3"), 
+		"SBADRI6":               (0, 20, "lutff_4/in_3"), 
+		"SBADRI7":               (0, 20, "lutff_5/in_3"), 
+		"SBCLKI":                (0, 20, "clk"), 
+		"SBDATI0":               (0, 19, "lutff_1/in_3"), 
+		"SBDATI1":               (0, 19, "lutff_2/in_3"), 
+		"SBDATI2":               (0, 19, "lutff_3/in_3"), 
+		"SBDATI3":               (0, 19, "lutff_4/in_3"), 
+		"SBDATI4":               (0, 19, "lutff_5/in_3"), 
+		"SBDATI5":               (0, 19, "lutff_6/in_3"), 
+		"SBDATI6":               (0, 19, "lutff_7/in_3"), 
+		"SBDATI7":               (0, 19, "lutff_0/in_1"), 
+		"SBDATO0":               (0, 19, "slf_op_1"), 
+		"SBDATO1":               (0, 19, "slf_op_2"), 
+		"SBDATO2":               (0, 19, "slf_op_3"), 
+		"SBDATO3":               (0, 19, "slf_op_4"), 
+		"SBDATO4":               (0, 19, "slf_op_5"), 
+		"SBDATO5":               (0, 19, "slf_op_6"), 
+		"SBDATO6":               (0, 19, "slf_op_7"), 
+		"SBDATO7":               (0, 20, "slf_op_0"), 
+		"SBRWI":                 (0, 19, "lutff_0/in_3"), 
+		"SBSTBI":                (0, 20, "lutff_6/in_3"), 
+		"SCKI":                  (0, 22, "lutff_1/in_1"), 
+		"SCKO":                  (0, 21, "slf_op_0"), 
+		"SCKOE":                 (0, 21, "slf_op_1"), 
+		"SCSNI":                 (0, 22, "lutff_2/in_1"), 
+		"SI":                    (0, 22, "lutff_7/in_3"), 
+		"SO":                    (0, 20, "slf_op_4"), 
+		"SOE":                   (0, 20, "slf_op_5"), 
+		"SPIIRQ":                (0, 20, "slf_op_2"), 
+		"SPIWKUP":               (0, 20, "slf_op_3"), 
+	},
+	("SPI", (25, 0, 1)): {
+		"MCSNO0":                (25, 21, "slf_op_2"), 
+		"MCSNO1":                (25, 21, "slf_op_4"), 
+		"MCSNO2":                (25, 21, "slf_op_7"), 
+		"MCSNO3":                (25, 22, "slf_op_1"), 
+		"MCSNOE0":               (25, 21, "slf_op_3"), 
+		"MCSNOE1":               (25, 21, "slf_op_5"), 
+		"MCSNOE2":               (25, 22, "slf_op_0"), 
+		"MCSNOE3":               (25, 22, "slf_op_2"), 
+		"MI":                    (25, 22, "lutff_0/in_1"), 
+		"MO":                    (25, 20, "slf_op_6"), 
+		"MOE":                   (25, 20, "slf_op_7"), 
+		"SBACKO":                (25, 20, "slf_op_1"), 
+		"SBADRI0":               (25, 19, "lutff_1/in_1"), 
+		"SBADRI1":               (25, 19, "lutff_2/in_1"), 
+		"SBADRI2":               (25, 20, "lutff_0/in_3"), 
+		"SBADRI3":               (25, 20, "lutff_1/in_3"), 
+		"SBADRI4":               (25, 20, "lutff_2/in_3"), 
+		"SBADRI5":               (25, 20, "lutff_3/in_3"), 
+		"SBADRI6":               (25, 20, "lutff_4/in_3"), 
+		"SBADRI7":               (25, 20, "lutff_5/in_3"), 
+		"SBCLKI":                (25, 20, "clk"), 
+		"SBDATI0":               (25, 19, "lutff_1/in_3"), 
+		"SBDATI1":               (25, 19, "lutff_2/in_3"), 
+		"SBDATI2":               (25, 19, "lutff_3/in_3"), 
+		"SBDATI3":               (25, 19, "lutff_4/in_3"), 
+		"SBDATI4":               (25, 19, "lutff_5/in_3"), 
+		"SBDATI5":               (25, 19, "lutff_6/in_3"), 
+		"SBDATI6":               (25, 19, "lutff_7/in_3"), 
+		"SBDATI7":               (25, 19, "lutff_0/in_1"), 
+		"SBDATO0":               (25, 19, "slf_op_1"), 
+		"SBDATO1":               (25, 19, "slf_op_2"), 
+		"SBDATO2":               (25, 19, "slf_op_3"), 
+		"SBDATO3":               (25, 19, "slf_op_4"), 
+		"SBDATO4":               (25, 19, "slf_op_5"), 
+		"SBDATO5":               (25, 19, "slf_op_6"), 
+		"SBDATO6":               (25, 19, "slf_op_7"), 
+		"SBDATO7":               (25, 20, "slf_op_0"), 
+		"SBRWI":                 (25, 19, "lutff_0/in_3"), 
+		"SBSTBI":                (25, 20, "lutff_6/in_3"), 
+		"SCKI":                  (25, 22, "lutff_1/in_1"), 
+		"SCKO":                  (25, 21, "slf_op_0"), 
+		"SCKOE":                 (25, 21, "slf_op_1"), 
+		"SCSNI":                 (25, 22, "lutff_2/in_1"), 
+		"SI":                    (25, 22, "lutff_7/in_3"), 
+		"SO":                    (25, 20, "slf_op_4"), 
+		"SOE":                   (25, 20, "slf_op_5"), 
+		"SPIIRQ":                (25, 20, "slf_op_2"), 
+		"SPIWKUP":               (25, 20, "slf_op_3"), 
+	},