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

fasm2bits -> fasm2frames 

Signed-off-by: John McMaster <johndmcmaster@gmail.com>
This commit is contained in:
John McMaster 2018-10-16 23:41:05 -07:00
parent c8ee9d4f16
commit 3588f278c1
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
utils/fasm2bits.py → utils/fasm2frames.py
View File

26
utils/test_fasm2bits.py → utils/test_fasm2frames.py
View File

@ -1,6 +1,6 @@
# TODO: need better coverage for different tile types # TODO: need better coverage for different tile types
import fasm2bits import fasm2frames
import unittest import unittest
import StringIO import StringIO
@ -52,11 +52,11 @@ class TestStringMethods(unittest.TestCase):
def test_lut(self): def test_lut(self):
'''Simple smoke test on just the LUTs''' '''Simple smoke test on just the LUTs'''
fout = StringIO.StringIO() fout = StringIO.StringIO()
fasm2bits.run(open('test_data/lut.fasm', 'r'), fout) fasm2frames.run(open('test_data/lut.fasm', 'r'), fout)
def bitread_frm_equals(self, frm_fn, bitread_fn): def bitread_frm_equals(self, frm_fn, bitread_fn):
fout = StringIO.StringIO() fout = StringIO.StringIO()
fasm2bits.run(open(frm_fn, 'r'), fout) fasm2frames.run(open(frm_fn, 'r'), fout)
# Build a list of output used bits # Build a list of output used bits
bits_out = frm2bits(fout.getvalue()) bits_out = frm2bits(fout.getvalue())
@ -86,12 +86,12 @@ class TestStringMethods(unittest.TestCase):
'''Optional key with binary omitted value should produce valid result''' '''Optional key with binary omitted value should produce valid result'''
fin = StringIO.StringIO("CLBLM_L_X10Y102.SLICEM_X0.SRUSEDMUX") fin = StringIO.StringIO("CLBLM_L_X10Y102.SLICEM_X0.SRUSEDMUX")
fout = StringIO.StringIO() fout = StringIO.StringIO()
fasm2bits.run(fin, fout) fasm2frames.run(fin, fout)
def test_opkey_01_1(self): def test_opkey_01_1(self):
fin = StringIO.StringIO("CLBLM_L_X10Y102.SLICEM_X0.SRUSEDMUX 1") fin = StringIO.StringIO("CLBLM_L_X10Y102.SLICEM_X0.SRUSEDMUX 1")
fout = StringIO.StringIO() fout = StringIO.StringIO()
fasm2bits.run(fin, fout) fasm2frames.run(fin, fout)
def test_opkey_enum(self): def test_opkey_enum(self):
'''Optional key with enumerated value should produce syntax error''' '''Optional key with enumerated value should produce syntax error'''
@ -99,9 +99,9 @@ class TestStringMethods(unittest.TestCase):
fin = StringIO.StringIO("CLBLM_L_X10Y102.SLICEM_X0.AMUX.O6") fin = StringIO.StringIO("CLBLM_L_X10Y102.SLICEM_X0.AMUX.O6")
fout = StringIO.StringIO() fout = StringIO.StringIO()
try: try:
fasm2bits.run(fin, fout) fasm2frames.run(fin, fout)
self.fail("Expected syntax error") self.fail("Expected syntax error")
except fasm2bits.FASMSyntaxError: except fasm2frames.FASMSyntaxError:
pass pass
def test_ff_int_0s(self): def test_ff_int_0s(self):
@ -114,9 +114,9 @@ class TestStringMethods(unittest.TestCase):
fin = StringIO.StringIO("CLBLM_L_X10Y102.SLICEM_X0.SRUSEDMUX 2") fin = StringIO.StringIO("CLBLM_L_X10Y102.SLICEM_X0.SRUSEDMUX 2")
fout = StringIO.StringIO() fout = StringIO.StringIO()
try: try:
fasm2bits.run(fin, fout) fasm2frames.run(fin, fout)
self.fail("Expected syntax error") self.fail("Expected syntax error")
except fasm2bits.FASMSyntaxError: except fasm2frames.FASMSyntaxError:
pass pass
def test_dupkey(self): def test_dupkey(self):
@ -128,9 +128,9 @@ CLBLM_L_X10Y102.SLICEM_X0.SRUSEDMUX 1
""") """)
fout = StringIO.StringIO() fout = StringIO.StringIO()
try: try:
fasm2bits.run(fin, fout) fasm2frames.run(fin, fout)
self.fail("Expected syntax error") self.fail("Expected syntax error")
except fasm2bits.FASMSyntaxError: except fasm2frames.FASMSyntaxError:
pass pass
def test_sparse(self): def test_sparse(self):
@ -138,12 +138,12 @@ CLBLM_L_X10Y102.SLICEM_X0.SRUSEDMUX 1
frm_fn = 'test_data/lut_int.fasm' frm_fn = 'test_data/lut_int.fasm'
fout_sparse = StringIO.StringIO() fout_sparse = StringIO.StringIO()
fasm2bits.run(open(frm_fn, 'r'), fout_sparse, sparse=True) fasm2frames.run(open(frm_fn, 'r'), fout_sparse, sparse=True)
fout_sparse_txt = fout_sparse.getvalue() fout_sparse_txt = fout_sparse.getvalue()
bits_sparse = frm2bits(fout_sparse_txt) bits_sparse = frm2bits(fout_sparse_txt)
fout_full = StringIO.StringIO() fout_full = StringIO.StringIO()
fasm2bits.run(open(frm_fn, 'r'), fout_full, sparse=False) fasm2frames.run(open(frm_fn, 'r'), fout_full, sparse=False)
fout_full_txt = fout_full.getvalue() fout_full_txt = fout_full.getvalue()
bits_full = frm2bits(fout_full_txt) bits_full = frm2bits(fout_full_txt)