commit db9410886820b315a049612b44cf07a2234bdf9d
author William D. Jones <thor0505@comcast.net> Sun Sep 06 22:43:40 2020 -0400
committer William D. Jones <thor0505@comcast.net> Sun Sep 06 22:43:40 2020 -0400
tree 56bdf272fd294e1e42a9189e9241b88327818c66
parent 52c31c120e0ac5fc1d4d42c68da712d16dcb5148
parent 389c25162ee9c3c1d77b67b4643ed9d8df619614

Merge branch 'master' of https://github.com/YosysHQ/prjtrellis into facade

database

diff --git a/database b/database
index fb3fa8c..4583f2e 160000
--- a/database
+++ b/database
@@ -1 +1 @@
-Subproject commit fb3fa8cfc1ce57a8ba81a8a94da01f096664b057
+Subproject commit 4583f2ec47698945123f8099ae22342f037caf33

fuzzers/ECP5/132-dlldel/fuzzer.py

diff --git a/fuzzers/ECP5/132-dlldel/fuzzer.py b/fuzzers/ECP5/132-dlldel/fuzzer.py
index 206cb91..9c552d2 100644
--- a/fuzzers/ECP5/132-dlldel/fuzzer.py
+++ b/fuzzers/ECP5/132-dlldel/fuzzer.py
@@ -6,15 +6,18 @@
 
 jobs = [(FuzzConfig(job="TDLLDEL", family="ECP5", device="LFE5U-45F", ncl="empty.ncl",
                     tiles=["MIB_R0C40:TMID_0", "MIB_R0C41:TMID_1"]),
-         [("DLLDEL_00", "R0C39"), ("DLLDEL_01", "R0C40"), ("DLLDEL_10", "R0C41"), ("DLLDEL_11", "R0C42")]
+         [("DLLDEL_00", "R0C39"), ("DLLDEL_01", "R0C40"), ("DLLDEL_10", "R0C41"), ("DLLDEL_11", "R0C42")],
+         ["R0C39_JPADDI", "R0C40_JPADDI", "R0C41_JPADDI", "R0C41_JPADDI"]
          ),
         (FuzzConfig(job="LDLLDEL", family="ECP5", device="LFE5U-45F", ncl="empty.ncl",
                     tiles=["CIB_R34C2:ECLK_L", "MIB_R34C3:LMID_0"]),
-         [("DLLDEL_61", "R36C0"), ("DLLDEL_60", "R35C0"), ("DLLDEL_71", "R34C0"), ("DLLDEL_70", "R33C0")]
+         [("DLLDEL_61", "R36C0"), ("DLLDEL_60", "R35C0"), ("DLLDEL_71", "R34C0"), ("DLLDEL_70", "R33C0")],
+         ["R36C0_JPADDI", "R35C0_JPADDI", "R34C0_JPADDI", "R33C0_JPADDI"]
          ),
         (FuzzConfig(job="RDLLDEL", family="ECP5", device="LFE5U-45F", ncl="empty.ncl",
                     tiles=["CIB_R34C88:ECLK_R", "MIB_R34C87:RMID_0"]),
-         [("DLLDEL_31", "R36C90"), ("DLLDEL_30", "R35C90"), ("DLLDEL_21", "R34C90"), ("DLLDEL_20", "R33C90")]
+         [("DLLDEL_31", "R36C90"), ("DLLDEL_30", "R35C90"), ("DLLDEL_21", "R34C90"), ("DLLDEL_20", "R33C90")],
+         ["R36C90_JPADDI", "R35C90_JPADDI", "R34C90_JPADDI", "R33C90_JPADDI"]
          ),
         ]
 
@@ -31,7 +34,7 @@
     pytrellis.load_database("../../../database")
 
     def per_job(job):
-        cfg, locs = job
+        cfg, locs, paddi = job
         cfg.setup()
 
         empty_bitfile = cfg.build_design(cfg.ncl, {})
@@ -81,7 +84,7 @@
                 "{}_JDIRECTION_DLLDEL".format(rc),
                 "{}_Z_DLLDEL".format(rc),
                 "{}_JINCK".format(rc),
-            ]
+            ] + paddi
 
             cfg.ncl = "dlldel_routing.ncl"
             interconnect.fuzz_interconnect_with_netnames(cfg, nets, bidir=True)