From e7e010179b1a3520f00c11a7a3af23ed42969ad0 Mon Sep 17 00:00:00 2001 From: John McMaster Date: Tue, 16 Oct 2018 22:09:00 -0700 Subject: [PATCH] fasm2frame => fasm2bits Signed-off-by: John McMaster --- utils/{fasm2frame.py => fasm2bits.py} | 0 .../{test_fasm2frame.py => test_fasm2bits.py} | 26 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) rename utils/{fasm2frame.py => fasm2bits.py} (100%) rename utils/{test_fasm2frame.py => test_fasm2bits.py} (89%) diff --git a/utils/fasm2frame.py b/utils/fasm2bits.py similarity index 100% rename from utils/fasm2frame.py rename to utils/fasm2bits.py diff --git a/utils/test_fasm2frame.py b/utils/test_fasm2bits.py similarity index 89% rename from utils/test_fasm2frame.py rename to utils/test_fasm2bits.py index 27c2815c..729632e1 100644 --- a/utils/test_fasm2frame.py +++ b/utils/test_fasm2bits.py @@ -1,6 +1,6 @@ # TODO: need better coverage for different tile types -import fasm2frame +import fasm2bits import unittest import StringIO @@ -52,11 +52,11 @@ class TestStringMethods(unittest.TestCase): def test_lut(self): '''Simple smoke test on just the LUTs''' fout = StringIO.StringIO() - fasm2frame.run(open('test_data/lut.fasm', 'r'), fout) + fasm2bits.run(open('test_data/lut.fasm', 'r'), fout) def bitread_frm_equals(self, frm_fn, bitread_fn): fout = StringIO.StringIO() - fasm2frame.run(open(frm_fn, 'r'), fout) + fasm2bits.run(open(frm_fn, 'r'), fout) # Build a list of output used bits bits_out = frm2bits(fout.getvalue()) @@ -86,12 +86,12 @@ class TestStringMethods(unittest.TestCase): '''Optional key with binary omitted value should produce valid result''' fin = StringIO.StringIO("CLBLM_L_X10Y102.SLICEM_X0.SRUSEDMUX") fout = StringIO.StringIO() - fasm2frame.run(fin, fout) + fasm2bits.run(fin, fout) def test_opkey_01_1(self): fin = StringIO.StringIO("CLBLM_L_X10Y102.SLICEM_X0.SRUSEDMUX 1") fout = StringIO.StringIO() - fasm2frame.run(fin, fout) + fasm2bits.run(fin, fout) def test_opkey_enum(self): '''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") fout = StringIO.StringIO() try: - fasm2frame.run(fin, fout) + fasm2bits.run(fin, fout) self.fail("Expected syntax error") - except fasm2frame.FASMSyntaxError: + except fasm2bits.FASMSyntaxError: pass def test_ff_int_0s(self): @@ -114,9 +114,9 @@ class TestStringMethods(unittest.TestCase): fin = StringIO.StringIO("CLBLM_L_X10Y102.SLICEM_X0.SRUSEDMUX 2") fout = StringIO.StringIO() try: - fasm2frame.run(fin, fout) + fasm2bits.run(fin, fout) self.fail("Expected syntax error") - except fasm2frame.FASMSyntaxError: + except fasm2bits.FASMSyntaxError: pass def test_dupkey(self): @@ -128,9 +128,9 @@ CLBLM_L_X10Y102.SLICEM_X0.SRUSEDMUX 1 """) fout = StringIO.StringIO() try: - fasm2frame.run(fin, fout) + fasm2bits.run(fin, fout) self.fail("Expected syntax error") - except fasm2frame.FASMSyntaxError: + except fasm2bits.FASMSyntaxError: pass def test_sparse(self): @@ -138,12 +138,12 @@ CLBLM_L_X10Y102.SLICEM_X0.SRUSEDMUX 1 frm_fn = 'test_data/lut_int.fasm' fout_sparse = StringIO.StringIO() - fasm2frame.run(open(frm_fn, 'r'), fout_sparse, sparse=True) + fasm2bits.run(open(frm_fn, 'r'), fout_sparse, sparse=True) fout_sparse_txt = fout_sparse.getvalue() bits_sparse = frm2bits(fout_sparse_txt) fout_full = StringIO.StringIO() - fasm2frame.run(open(frm_fn, 'r'), fout_full, sparse=False) + fasm2bits.run(open(frm_fn, 'r'), fout_full, sparse=False) fout_full_txt = fout_full.getvalue() bits_full = frm2bits(fout_full_txt)