luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #60 from mcmasterg/slice_x01 

fasm: slice site name as 0/1 instead of global coordinate. Test cleanup
This commit is contained in:
John McMaster 2018-01-23 15:27:21 -08:00 committed by GitHub
parent 79fa80c737 e892576560
commit 7110a67c55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 39 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/fasm2frame.py
View File

@ -144,34 +144,7 @@ def run(f_in, f_out, sparse=False, debug=False):
segdb = get_database(segj['type'])
def clb2dbkey(tile, tilej, site, suffix, value):
def slice_global2x01(tile_name, tile_type, site):
# SLICE_X12Y102 => SLICEL_X0
m = re.match(r'SLICE_X([0-9]+)Y[0-9]+', site)
xg = int(m.group(1))
prefix = {
'CLBLL_L': {
0: 'SLICEL',
1: 'SLICEL'
},
'CLBLM_L': {
0: 'SLICEM',
1: 'SLICEL'
},
'CLBLL_R': {
0: 'SLICEL',
1: 'SLICEL'
},
'CLBLM_R': {
0: 'SLICEM',
1: 'SLICEL'
},
}
x01 = xg % 2
return '%s_X%d' % (prefix[tile_type][x01], x01)
db_site = slice_global2x01(tile, tilej['type'], site)
db_k = '%s.%s.%s' % (tilej['type'], db_site, suffix)
db_k = '%s.%s.%s' % (tilej['type'], site, suffix)
return db_k
def int2dbkey(tile, tilej, site, suffix, value):

20
tools/segprint2fasm.py
View File

@ -11,25 +11,7 @@ def tag2fasm(grid, seg, tag):
segj = grid['segments'][seg]
def clbf(seg, tile, tag_post):
# seg: SEG_CLBLM_L_X10Y102
# tile_type: CLBLM_L
# tag_post: SLICEM_X0.ALUT.INIT[43]
# To: CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[43] 1
m = re.match(r'(SLICE[LM])_X([01])[.](.*)', tag_post)
slicelm = m.group(1)
off01 = int(m.group(2))
post = m.group(3)
# xxx: actually this might not work on decimal overflow (9 => 10)
for site in grid['tiles'][tile]['sites'].keys():
m = re.match(r'SLICE_X(.*)Y.*', site)
sitex = int(m.group(1))
if sitex % 2 == off01:
break
else:
raise Exception("Failed to match site")
return '%s.%s.%s 1' % (tile, site, post)
return '%s.%s 1' % (tile, tag_post)
def intf(seg, tile, tag_post):
# Make the selection an argument of the configruation

14
tools/test_data/ff_int.fasm
View File

@ -2,13 +2,13 @@
# segprint -zd test_data/clb_ff/design.bits
# FF as LDCE
CLBLM_L_X10Y102.SLICE_X12Y102.AFF.DMUX.AX 1
CLBLM_L_X10Y102.SLICE_X12Y102.AFF.ZINI 1
CLBLM_L_X10Y102.SLICE_X12Y102.AFF.ZRST 1
CLBLM_L_X10Y102.SLICE_X12Y102.CEUSEDMUX 1
CLBLM_L_X10Y102.SLICE_X12Y102.SRUSEDMUX 1
# CLBLM_L_X10Y102.SLICE_X12Y102.FFSYNC 0
# CLBLM_L_X10Y102.SLICE_X12Y102.LATCH 0
CLBLM_L_X10Y102.SLICEM_X0.AFF.DMUX.AX 1
CLBLM_L_X10Y102.SLICEM_X0.AFF.ZINI 1
CLBLM_L_X10Y102.SLICEM_X0.AFF.ZRST 1
CLBLM_L_X10Y102.SLICEM_X0.CEUSEDMUX 1
CLBLM_L_X10Y102.SLICEM_X0.SRUSEDMUX 1
# CLBLM_L_X10Y102.SLICEM_X0.FFSYNC 0
# CLBLM_L_X10Y102.SLICEM_X0.LATCH 0
# Note: a number of pseudo pips here
# Omitted

0
tools/test_data/clb_ff/.gitignore → tools/test_data/ff_int/.gitignore vendored
View File

0
tools/test_data/clb_ff/design.bits → tools/test_data/ff_int/design.bits
View File

0
tools/test_data/clb_ff/design.segp → tools/test_data/ff_int/design.segp
View File

0
tools/test_data/clb_ff/top.v → tools/test_data/ff_int/top.v
View File

26
tools/test_data/lut.fasm
View File

@ -1,15 +1,15 @@
# LUT
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[00] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[08] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[10] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[11] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[13] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[14] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[15] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[41] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[43] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[44] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[46] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[47] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[63] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[00] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[08] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[10] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[11] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[13] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[14] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[15] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[41] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[43] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[44] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[46] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[47] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[63] 1

26
tools/test_data/lut_int.fasm
View File

@ -2,19 +2,19 @@
# segprint -zd test_data/clb_lut/design.bits
# LUT
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[00] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[08] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[10] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[11] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[13] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[14] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[15] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[41] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[43] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[44] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[46] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[47] 1
CLBLM_L_X10Y102.SLICE_X12Y102.ALUT.INIT[63] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[00] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[08] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[10] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[11] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[13] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[14] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[15] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[41] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[43] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[44] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[46] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[47] 1
CLBLM_L_X10Y102.SLICEM_X0.ALUT.INIT[63] 1
# din bus
# din[0]

0
tools/test_data/clb_lut/.gitignore → tools/test_data/lut_int/.gitignore vendored
View File

0
tools/test_data/clb_lut/design.bits → tools/test_data/lut_int/design.bits
View File

0
tools/test_data/clb_lut/design.segp → tools/test_data/lut_int/design.segp
View File

0
tools/test_data/clb_lut/top.v → tools/test_data/lut_int/top.v
View File

4
tools/test_fasm2frame.py
View File

@ -68,11 +68,11 @@ class TestStringMethods(unittest.TestCase):
def test_lut_int(self):
self.bitread_frm_equals(
'test_data/lut_int.fasm', 'test_data/clb_lut/design.bits')
'test_data/lut_int.fasm', 'test_data/lut_int/design.bits')
def test_ff_int(self):
self.bitread_frm_equals(
'test_data/ff_int.fasm', 'test_data/clb_ff/design.bits')
'test_data/ff_int.fasm', 'test_data/ff_int/design.bits')
def test_sparse(self):
'''Verify sparse equivilent to normal encoding'''

4
tools/test_segprint2fasm.py
View File

@ -33,11 +33,11 @@ class TestStringMethods(unittest.TestCase):
def test_lut_int(self):
self.check_segprint_fasm_equiv(
'test_data/clb_lut/design.segp', 'test_data/lut_int.fasm')
'test_data/lut_int/design.segp', 'test_data/lut_int.fasm')
def test_ff_int(self):
self.check_segprint_fasm_equiv(
'test_data/clb_ff/design.segp', 'test_data/ff_int.fasm')
'test_data/ff_int/design.segp', 'test_data/ff_int.fasm')
if __name__ == '__main__':