From 8e908f016ee92782c42679b1ce8da1a2eaf89b55 Mon Sep 17 00:00:00 2001 From: mrg Date: Tue, 29 Sep 2020 13:43:59 -0700 Subject: [PATCH] PEP8 formatting --- compiler/tests/22_psram_1bank_2mux_func_test.py | 9 +++++---- compiler/tests/22_psram_1bank_4mux_func_test.py | 9 +++++---- compiler/tests/22_psram_1bank_8mux_func_test.py | 9 +++++---- compiler/tests/22_psram_1bank_nomux_func_test.py | 8 ++++---- compiler/tests/22_sram_1bank_2mux_func_test.py | 9 +++++---- compiler/tests/22_sram_1bank_2mux_global_func_test.py | 9 +++++---- compiler/tests/22_sram_1bank_2mux_sparecols_func_test.py | 9 +++++---- compiler/tests/22_sram_1bank_4mux_func_test.py | 9 +++++---- compiler/tests/22_sram_1bank_8mux_func_test.py | 9 +++++---- compiler/tests/22_sram_1bank_nomux_1rw_1r_func_test.py | 9 +++++---- compiler/tests/22_sram_1bank_nomux_func_test.py | 5 +++-- .../tests/22_sram_1bank_nomux_sparecols_func_test.py | 5 +++-- compiler/tests/22_sram_1bank_wmask_1rw_1r_func_test.py | 2 +- compiler/tests/22_sram_wmask_func_test.py | 5 +++-- 14 files changed, 59 insertions(+), 47 deletions(-) diff --git a/compiler/tests/22_psram_1bank_2mux_func_test.py b/compiler/tests/22_psram_1bank_2mux_func_test.py index 7a6da149..5e4040d6 100755 --- a/compiler/tests/22_psram_1bank_2mux_func_test.py +++ b/compiler/tests/22_psram_1bank_2mux_func_test.py @@ -8,13 +8,14 @@ # import unittest from testutils import * -import sys,os +import sys, os sys.path.append(os.getenv("OPENRAM_HOME")) import globals from globals import OPTS from sram_factory import factory import debug + class psram_1bank_2mux_func_test(openram_test): def runTest(self): @@ -36,7 +37,7 @@ class psram_1bank_2mux_func_test(openram_test): from importlib import reload import characterizer reload(characterizer) - from characterizer import functional, delay + from characterizer import functional from sram_config import sram_config c = sram_config(word_size=2, num_words=32, @@ -52,13 +53,13 @@ class psram_1bank_2mux_func_test(openram_test): c.words_per_row, c.num_banks)) s = factory.create(module_type="sram", sram_config=c) - tempspice = OPTS.openram_temp + "sram.sp" + tempspice = OPTS.openram_temp + "sram.sp" s.sp_write(tempspice) corner = (OPTS.process_corners[0], OPTS.supply_voltages[0], OPTS.temperatures[0]) f = functional(s.s, tempspice, corner) (fail, error) = f.run() - self.assertTrue(fail,error) + self.assertTrue(fail, error) globals.end_openram() diff --git a/compiler/tests/22_psram_1bank_4mux_func_test.py b/compiler/tests/22_psram_1bank_4mux_func_test.py index facd3874..2c51f2f3 100755 --- a/compiler/tests/22_psram_1bank_4mux_func_test.py +++ b/compiler/tests/22_psram_1bank_4mux_func_test.py @@ -8,13 +8,14 @@ # import unittest from testutils import * -import sys,os +import sys, os sys.path.append(os.getenv("OPENRAM_HOME")) import globals from globals import OPTS from sram_factory import factory import debug + #@unittest.skip("SKIPPING 22_psram_1bank_4mux_func_test, third port reads are broken?") class psram_1bank_4mux_func_test(openram_test): @@ -37,7 +38,7 @@ class psram_1bank_4mux_func_test(openram_test): from importlib import reload import characterizer reload(characterizer) - from characterizer import functional, delay + from characterizer import functional from sram_config import sram_config c = sram_config(word_size=2, num_words=256, @@ -53,13 +54,13 @@ class psram_1bank_4mux_func_test(openram_test): c.words_per_row, c.num_banks)) s = factory.create(module_type="sram", sram_config=c) - tempspice = OPTS.openram_temp + "sram.sp" + tempspice = OPTS.openram_temp + "sram.sp" s.sp_write(tempspice) corner = (OPTS.process_corners[0], OPTS.supply_voltages[0], OPTS.temperatures[0]) f = functional(s.s, tempspice, corner) (fail, error) = f.run() - self.assertTrue(fail,error) + self.assertTrue(fail, error) globals.end_openram() diff --git a/compiler/tests/22_psram_1bank_8mux_func_test.py b/compiler/tests/22_psram_1bank_8mux_func_test.py index acf0c3a4..447b7512 100755 --- a/compiler/tests/22_psram_1bank_8mux_func_test.py +++ b/compiler/tests/22_psram_1bank_8mux_func_test.py @@ -8,13 +8,14 @@ # import unittest from testutils import * -import sys,os +import sys, os sys.path.append(os.getenv("OPENRAM_HOME")) import globals from globals import OPTS from sram_factory import factory import debug + #@unittest.skip("SKIPPING 22_psram_1bank_8mux_func_test") class psram_1bank_8mux_func_test(openram_test): @@ -37,7 +38,7 @@ class psram_1bank_8mux_func_test(openram_test): from importlib import reload import characterizer reload(characterizer) - from characterizer import functional, delay + from characterizer import functional from sram_config import sram_config c = sram_config(word_size=4, num_words=256, @@ -53,13 +54,13 @@ class psram_1bank_8mux_func_test(openram_test): c.words_per_row, c.num_banks)) s = factory.create(module_type="sram", sram_config=c) - tempspice = OPTS.openram_temp + "sram.sp" + tempspice = OPTS.openram_temp + "sram.sp" s.sp_write(tempspice) corner = (OPTS.process_corners[0], OPTS.supply_voltages[0], OPTS.temperatures[0]) f = functional(s.s, tempspice, corner) (fail, error) = f.run() - self.assertTrue(fail,error) + self.assertTrue(fail, error) globals.end_openram() diff --git a/compiler/tests/22_psram_1bank_nomux_func_test.py b/compiler/tests/22_psram_1bank_nomux_func_test.py index b7d6cf78..5f2e81c8 100755 --- a/compiler/tests/22_psram_1bank_nomux_func_test.py +++ b/compiler/tests/22_psram_1bank_nomux_func_test.py @@ -8,7 +8,7 @@ # import unittest from testutils import * -import sys,os +import sys, os sys.path.append(os.getenv("OPENRAM_HOME")) import globals from globals import OPTS @@ -37,7 +37,7 @@ class psram_1bank_nomux_func_test(openram_test): from importlib import reload import characterizer reload(characterizer) - from characterizer import functional, delay + from characterizer import functional from sram_config import sram_config c = sram_config(word_size=2, num_words=32, @@ -53,13 +53,13 @@ class psram_1bank_nomux_func_test(openram_test): c.words_per_row, c.num_banks)) s = factory.create(module_type="sram", sram_config=c) - tempspice = OPTS.openram_temp + "sram.sp" + tempspice = OPTS.openram_temp + "sram.sp" s.sp_write(tempspice) corner = (OPTS.process_corners[0], OPTS.supply_voltages[0], OPTS.temperatures[0]) f = functional(s.s, tempspice, corner) (fail, error) = f.run() - self.assertTrue(fail,error) + self.assertTrue(fail, error) globals.end_openram() diff --git a/compiler/tests/22_sram_1bank_2mux_func_test.py b/compiler/tests/22_sram_1bank_2mux_func_test.py index 10d19c1c..20ac52f0 100755 --- a/compiler/tests/22_sram_1bank_2mux_func_test.py +++ b/compiler/tests/22_sram_1bank_2mux_func_test.py @@ -8,13 +8,14 @@ # import unittest from testutils import * -import sys,os +import sys, os sys.path.append(os.getenv("OPENRAM_HOME")) import globals from globals import OPTS from sram_factory import factory import debug + #@unittest.skip("SKIPPING 22_sram_1bank_2mux_func_test") class sram_1bank_2mux_func_test(openram_test): @@ -29,7 +30,7 @@ class sram_1bank_2mux_func_test(openram_test): from importlib import reload import characterizer reload(characterizer) - from characterizer import functional, delay + from characterizer import functional from sram_config import sram_config c = sram_config(word_size=4, num_words=32, @@ -42,13 +43,13 @@ class sram_1bank_2mux_func_test(openram_test): c.words_per_row, c.num_banks)) s = factory.create(module_type="sram", sram_config=c) - tempspice = OPTS.openram_temp + "sram.sp" + tempspice = OPTS.openram_temp + "sram.sp" s.sp_write(tempspice) corner = (OPTS.process_corners[0], OPTS.supply_voltages[0], OPTS.temperatures[0]) f = functional(s.s, tempspice, corner) (fail, error) = f.run() - self.assertTrue(fail,error) + self.assertTrue(fail, error) globals.end_openram() diff --git a/compiler/tests/22_sram_1bank_2mux_global_func_test.py b/compiler/tests/22_sram_1bank_2mux_global_func_test.py index c8ff5969..e5b8853a 100755 --- a/compiler/tests/22_sram_1bank_2mux_global_func_test.py +++ b/compiler/tests/22_sram_1bank_2mux_global_func_test.py @@ -8,13 +8,14 @@ # import unittest from testutils import * -import sys,os +import sys, os sys.path.append(os.getenv("OPENRAM_HOME")) import globals from globals import OPTS from sram_factory import factory import debug + #@unittest.skip("SKIPPING 22_sram_1bank_2mux_func_test") class sram_1bank_2mux_func_test(openram_test): @@ -29,7 +30,7 @@ class sram_1bank_2mux_func_test(openram_test): from importlib import reload import characterizer reload(characterizer) - from characterizer import functional, delay + from characterizer import functional from sram_config import sram_config OPTS.local_array_size = 8 OPTS.route_supplies = False @@ -44,13 +45,13 @@ class sram_1bank_2mux_func_test(openram_test): c.words_per_row, c.num_banks)) s = factory.create(module_type="sram", sram_config=c) - tempspice = OPTS.openram_temp + "sram.sp" + tempspice = OPTS.openram_temp + "sram.sp" s.sp_write(tempspice) corner = (OPTS.process_corners[0], OPTS.supply_voltages[0], OPTS.temperatures[0]) f = functional(s.s, tempspice, corner) (fail, error) = f.run() - self.assertTrue(fail,error) + self.assertTrue(fail, error) globals.end_openram() diff --git a/compiler/tests/22_sram_1bank_2mux_sparecols_func_test.py b/compiler/tests/22_sram_1bank_2mux_sparecols_func_test.py index 902cacdd..a09ab17e 100755 --- a/compiler/tests/22_sram_1bank_2mux_sparecols_func_test.py +++ b/compiler/tests/22_sram_1bank_2mux_sparecols_func_test.py @@ -8,13 +8,14 @@ # import unittest from testutils import * -import sys,os +import sys, os sys.path.append(os.getenv("OPENRAM_HOME")) import globals from globals import OPTS from sram_factory import factory import debug + #@unittest.skip("SKIPPING 22_sram_1bank_2mux_sparecols_func_test") class sram_1bank_2mux_sparecols_func_test(openram_test): @@ -29,7 +30,7 @@ class sram_1bank_2mux_sparecols_func_test(openram_test): from importlib import reload import characterizer reload(characterizer) - from characterizer import functional, delay + from characterizer import functional from sram_config import sram_config c = sram_config(word_size=4, num_words=32, @@ -44,13 +45,13 @@ class sram_1bank_2mux_sparecols_func_test(openram_test): c.num_spare_cols, c.num_banks)) s = factory.create(module_type="sram", sram_config=c) - tempspice = OPTS.openram_temp + "sram.sp" + tempspice = OPTS.openram_temp + "sram.sp" s.sp_write(tempspice) corner = (OPTS.process_corners[0], OPTS.supply_voltages[0], OPTS.temperatures[0]) f = functional(s.s, tempspice, corner) (fail, error) = f.run() - self.assertTrue(fail,error) + self.assertTrue(fail, error) globals.end_openram() diff --git a/compiler/tests/22_sram_1bank_4mux_func_test.py b/compiler/tests/22_sram_1bank_4mux_func_test.py index d2bf7886..baa25906 100755 --- a/compiler/tests/22_sram_1bank_4mux_func_test.py +++ b/compiler/tests/22_sram_1bank_4mux_func_test.py @@ -8,13 +8,14 @@ # import unittest from testutils import * -import sys,os +import sys, os sys.path.append(os.getenv("OPENRAM_HOME")) import globals from globals import OPTS from sram_factory import factory import debug + #@unittest.skip("SKIPPING 22_sram_1bank_4mux_func_test") class sram_1bank_4mux_func_test(openram_test): @@ -29,7 +30,7 @@ class sram_1bank_4mux_func_test(openram_test): from importlib import reload import characterizer reload(characterizer) - from characterizer import functional, delay + from characterizer import functional from sram_config import sram_config c = sram_config(word_size=4, num_words=128, @@ -42,13 +43,13 @@ class sram_1bank_4mux_func_test(openram_test): c.words_per_row, c.num_banks)) s = factory.create(module_type="sram", sram_config=c) - tempspice = OPTS.openram_temp + "sram.sp" + tempspice = OPTS.openram_temp + "sram.sp" s.sp_write(tempspice) corner = (OPTS.process_corners[0], OPTS.supply_voltages[0], OPTS.temperatures[0]) f = functional(s.s, tempspice, corner) (fail, error) = f.run() - self.assertTrue(fail,error) + self.assertTrue(fail, error) globals.end_openram() diff --git a/compiler/tests/22_sram_1bank_8mux_func_test.py b/compiler/tests/22_sram_1bank_8mux_func_test.py index 3f6ff55f..d9cd794a 100755 --- a/compiler/tests/22_sram_1bank_8mux_func_test.py +++ b/compiler/tests/22_sram_1bank_8mux_func_test.py @@ -8,13 +8,14 @@ # import unittest from testutils import * -import sys,os +import sys, os sys.path.append(os.getenv("OPENRAM_HOME")) import globals from globals import OPTS from sram_factory import factory import debug + #@unittest.skip("SKIPPING 22_sram_1bank_8mux_func_test") class sram_1bank_8mux_func_test(openram_test): @@ -29,7 +30,7 @@ class sram_1bank_8mux_func_test(openram_test): from importlib import reload import characterizer reload(characterizer) - from characterizer import functional, delay + from characterizer import functional if not OPTS.spice_exe: debug.error("Could not find {} simulator.".format(OPTS.spice_name),-1) @@ -45,13 +46,13 @@ class sram_1bank_8mux_func_test(openram_test): c.words_per_row, c.num_banks)) s = factory.create(module_type="sram", sram_config=c) - tempspice = OPTS.openram_temp + "sram.sp" + tempspice = OPTS.openram_temp + "sram.sp" s.sp_write(tempspice) corner = (OPTS.process_corners[0], OPTS.supply_voltages[0], OPTS.temperatures[0]) f = functional(s.s, tempspice, corner) (fail, error) = f.run() - self.assertTrue(fail,error) + self.assertTrue(fail, error) globals.end_openram() diff --git a/compiler/tests/22_sram_1bank_nomux_1rw_1r_func_test.py b/compiler/tests/22_sram_1bank_nomux_1rw_1r_func_test.py index f2958f9f..50906e62 100755 --- a/compiler/tests/22_sram_1bank_nomux_1rw_1r_func_test.py +++ b/compiler/tests/22_sram_1bank_nomux_1rw_1r_func_test.py @@ -8,13 +8,14 @@ # import unittest from testutils import * -import sys,os +import sys, os sys.path.append(os.getenv("OPENRAM_HOME")) import globals from globals import OPTS from sram_factory import factory import debug + #@unittest.skip("SKIPPING 22_sram_1rw_1r_1bank_nomux_func_test") class psram_1bank_nomux_func_test(openram_test): @@ -33,7 +34,7 @@ class psram_1bank_nomux_func_test(openram_test): from importlib import reload import characterizer reload(characterizer) - from characterizer import functional, delay + from characterizer import functional from sram_config import sram_config c = sram_config(word_size=4, num_words=32, @@ -46,13 +47,13 @@ class psram_1bank_nomux_func_test(openram_test): c.words_per_row, c.num_banks)) s = factory.create(module_type="sram", sram_config=c) - tempspice = OPTS.openram_temp + "sram.sp" + tempspice = OPTS.openram_temp + "sram.sp" s.sp_write(tempspice) corner = (OPTS.process_corners[0], OPTS.supply_voltages[0], OPTS.temperatures[0]) f = functional(s.s, tempspice, corner) (fail, error) = f.run() - self.assertTrue(fail,error) + self.assertTrue(fail, error) globals.end_openram() diff --git a/compiler/tests/22_sram_1bank_nomux_func_test.py b/compiler/tests/22_sram_1bank_nomux_func_test.py index 2aa20e99..0af55ec2 100755 --- a/compiler/tests/22_sram_1bank_nomux_func_test.py +++ b/compiler/tests/22_sram_1bank_nomux_func_test.py @@ -8,13 +8,14 @@ # import unittest from testutils import * -import sys,os +import sys, os sys.path.append(os.getenv("OPENRAM_HOME")) import globals from globals import OPTS from sram_factory import factory import debug + #@unittest.skip("SKIPPING 22_sram_func_test") class sram_1bank_nomux_func_test(openram_test): @@ -47,7 +48,7 @@ class sram_1bank_nomux_func_test(openram_test): corner = (OPTS.process_corners[0], OPTS.supply_voltages[0], OPTS.temperatures[0]) f = functional(s.s, tempspice, corner) (fail, error) = f.run() - self.assertTrue(fail,error) + self.assertTrue(fail, error) globals.end_openram() diff --git a/compiler/tests/22_sram_1bank_nomux_sparecols_func_test.py b/compiler/tests/22_sram_1bank_nomux_sparecols_func_test.py index 347d15d0..dbb9d7b2 100755 --- a/compiler/tests/22_sram_1bank_nomux_sparecols_func_test.py +++ b/compiler/tests/22_sram_1bank_nomux_sparecols_func_test.py @@ -8,13 +8,14 @@ # import unittest from testutils import * -import sys,os +import sys, os sys.path.append(os.getenv("OPENRAM_HOME")) import globals from globals import OPTS from sram_factory import factory import debug + #@unittest.skip("SKIPPING 22_sram_func_test") class sram_1bank_nomux_sparecols_func_test(openram_test): @@ -48,7 +49,7 @@ class sram_1bank_nomux_sparecols_func_test(openram_test): corner = (OPTS.process_corners[0], OPTS.supply_voltages[0], OPTS.temperatures[0]) f = functional(s.s, tempspice, corner) (fail, error) = f.run() - self.assertTrue(fail,error) + self.assertTrue(fail, error) globals.end_openram() diff --git a/compiler/tests/22_sram_1bank_wmask_1rw_1r_func_test.py b/compiler/tests/22_sram_1bank_wmask_1rw_1r_func_test.py index 07cff70e..7ab35824 100755 --- a/compiler/tests/22_sram_1bank_wmask_1rw_1r_func_test.py +++ b/compiler/tests/22_sram_1bank_wmask_1rw_1r_func_test.py @@ -35,7 +35,7 @@ class sram_wmask_1w_1r_func_test(openram_test): from importlib import reload import characterizer reload(characterizer) - from characterizer import functional, delay + from characterizer import functional from sram_config import sram_config c = sram_config(word_size=8, num_words=16, diff --git a/compiler/tests/22_sram_wmask_func_test.py b/compiler/tests/22_sram_wmask_func_test.py index d29795a9..b59c3b95 100755 --- a/compiler/tests/22_sram_wmask_func_test.py +++ b/compiler/tests/22_sram_wmask_func_test.py @@ -8,13 +8,14 @@ # import unittest from testutils import * -import sys,os +import sys, os sys.path.append(os.getenv("OPENRAM_HOME")) import globals from globals import OPTS from sram_factory import factory import debug + #@unittest.skip("SKIPPING sram_wmask_func_test") class sram_wmask_func_test(openram_test): @@ -29,7 +30,7 @@ class sram_wmask_func_test(openram_test): from importlib import reload import characterizer reload(characterizer) - from characterizer import functional, delay + from characterizer import functional from sram_config import sram_config c = sram_config(word_size=8, num_words=16,