From b88947ef5cff3ea649d13970b31e12140afdaa61 Mon Sep 17 00:00:00 2001 From: Matt Guthaus Date: Wed, 18 Jul 2018 11:51:42 -0700 Subject: [PATCH] Pass the sram design to lib instead of the sram wrapper --- compiler/characterizer/lib.py | 2 +- compiler/tests/23_lib_sram_model_test.py | 2 +- compiler/tests/23_lib_sram_prune_test.py | 2 +- compiler/tests/23_lib_sram_test.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/characterizer/lib.py b/compiler/characterizer/lib.py index 0c56187d..416ab0d8 100644 --- a/compiler/characterizer/lib.py +++ b/compiler/characterizer/lib.py @@ -13,7 +13,7 @@ class lib: def __init__(self, out_dir, sram, sp_file, use_model=OPTS.analytical_delay): self.out_dir = out_dir - self.sram = sram.s + self.sram = sram self.sp_file = sp_file self.use_model = use_model diff --git a/compiler/tests/23_lib_sram_model_test.py b/compiler/tests/23_lib_sram_model_test.py index 2691de48..a41460f7 100755 --- a/compiler/tests/23_lib_sram_model_test.py +++ b/compiler/tests/23_lib_sram_model_test.py @@ -28,7 +28,7 @@ class lib_test(openram_test): tempspice = OPTS.openram_temp + "temp.sp" s.sp_write(tempspice) - lib(out_dir=OPTS.openram_temp, sram=s, sp_file=tempspice, use_model=True) + lib(out_dir=OPTS.openram_temp, sram=s.s, sp_file=tempspice, use_model=True) # get all of the .lib files generated files = os.listdir(OPTS.openram_temp) diff --git a/compiler/tests/23_lib_sram_prune_test.py b/compiler/tests/23_lib_sram_prune_test.py index b2f45d8a..4a49bc74 100755 --- a/compiler/tests/23_lib_sram_prune_test.py +++ b/compiler/tests/23_lib_sram_prune_test.py @@ -37,7 +37,7 @@ class lib_test(openram_test): tempspice = OPTS.openram_temp + "temp.sp" s.sp_write(tempspice) - lib(out_dir=OPTS.openram_temp, sram=s, sp_file=tempspice, use_model=False) + lib(out_dir=OPTS.openram_temp, sram=s.s, sp_file=tempspice, use_model=False) # get all of the .lib files generated files = os.listdir(OPTS.openram_temp) diff --git a/compiler/tests/23_lib_sram_test.py b/compiler/tests/23_lib_sram_test.py index 80f34064..9338b6c4 100755 --- a/compiler/tests/23_lib_sram_test.py +++ b/compiler/tests/23_lib_sram_test.py @@ -37,7 +37,7 @@ class lib_test(openram_test): tempspice = OPTS.openram_temp + "temp.sp" s.sp_write(tempspice) - lib(out_dir=OPTS.openram_temp, sram=s, sp_file=tempspice, use_model=False) + lib(out_dir=OPTS.openram_temp, sram=s.s, sp_file=tempspice, use_model=False) # get all of the .lib files generated files = os.listdir(OPTS.openram_temp)