Merge pull request #1448 from litghost/fix_oserdes_dup

Fix duplicate feature ZBUF and TDDR.SRUSED.

fuzzers/036-iob-ologic/bits.dbf

@@ -2,7 +2,7 @@
 30_35,IOB33.IOB_Y1.ODDR.DDR_CLK_EDGE.OPPOSITE_EDGE
 33_91 33_93
 32_36 32_34
-33_61 32_38 32_58 33_57
-32_70 32_66 33_89 33_69
+33_61 32_58 33_57
+32_70 32_66 33_69
 30_95 30_99 30_127 31_126 31_124 30_121 31_120 30_123 31_116 31_100
 31_00 30_01 30_03 31_06 30_07 31_04 30_11 31_28 31_32 30_29 30_27

fuzzers/036-iob-ologic/generate.py

@@ -79,9 +79,6 @@ def main():
                         site, 'OSERDES.DATA_RATE_TQ.{}'.format(opt),
                         opt == data_rate_tq)
 
-                segmk.add_site_tag(
-                    site, 'OSERDES.DATA_RATE_TQ.ZBUF', data_rate_tq != 'BUF')
-
                 for opt in ['SRVAL_OQ', 'SRVAL_TQ', 'INIT_OQ', 'INIT_TQ']:
                     segmk.add_site_tag(site, opt, d[opt])
                     segmk.add_site_tag(site, 'Z' + opt, 1 ^ d[opt])

prjxray/tile_segbits.py

@@ -46,7 +46,9 @@ def parsebit(val):
         isset = False
         val = val[1:]
     # 28_05 => 28, 05
-    seg_word_column, word_bit_n = val.split('_')
+    parts = val.split('_')
+    assert len(parts) == 2, val
+    seg_word_column, word_bit_n = parts
 
     return Bit(
         word_column=int(seg_word_column),