Skip to content

Commit 55e5c42

Browse files
committed
Fix same file error and enable passing tests
1 parent 14c219d commit 55e5c42

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

compiler/characterizer/functional.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@ def __init__(self, sram, spfile=None, corner=None, cycles=15, period=None, outpu
4545
sram.sp_write(self.sp_file, trim=OPTS.trim_netlist)
4646
# Copy sp file to temp dir
4747
self.temp_spice = path.join(OPTS.openram_temp, "sram.sp")
48-
shutil.copy(self.sp_file, self.temp_spice)
48+
try:
49+
shutil.copy(self.sp_file, self.temp_spice)
50+
except shutil.SameFileError: # skip if the same
51+
pass
4952

5053
if not corner:
5154
corner = (OPTS.process_corners[0], OPTS.supply_voltages[0], OPTS.temperatures[0])

compiler/tests/Makefile

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,6 @@ BROKEN_STAMPS = \
2525
%/19_single_bank_16mux_test.ok \
2626
%/20_sram_1bank_16mux_1rw_1r_test.ok \
2727
%/21_xyce_delay_test.ok \
28-
%/22_psram_1bank_2mux_func_test.ok \
29-
%/22_psram_1bank_4mux_func_test.ok \
30-
%/22_psram_1bank_8mux_func_test.ok \
31-
%/22_psram_1bank_nomux_func_test.ok \
32-
%/22_sram_1bank_2mux_func_test.ok \
33-
%/22_sram_1bank_2mux_global_func_test.ok \
34-
%/22_sram_1bank_4mux_func_test.ok \
35-
%/22_sram_1bank_8mux_func_test.ok \
36-
%/22_sram_1bank_nomux_1rw_1r_func_test.ok \
37-
%/22_sram_1bank_nomux_func_test.ok \
38-
%/22_sram_1bank_wmask_1rw_1r_func_test.ok \
39-
%/22_sram_wmask_func_test.ok \
4028
%/27_verilog_multibank_test.ok \
4129
freepdk45/04_rom_address_control_buf_test.ok \
4230
freepdk45/05_rom_array_test.ok \
@@ -129,6 +117,13 @@ BROKEN_STAMPS = \
129117
sky130/21_ngspice_delay_extra_rows_test.ok \
130118
sky130/21_ngspice_delay_test.ok \
131119
sky130/21_regression_delay_test.ok \
120+
sky130/22_psram_1bank_2mux_func_test.ok \
121+
sky130/22_psram_1bank_4mux_func_test.ok \
122+
sky130/22_psram_1bank_8mux_func_test.ok \
123+
sky130/22_psram_1bank_nomux_func_test.ok \
124+
sky130/22_sram_1bank_2mux_global_func_test.ok \
125+
sky130/22_sram_1bank_wmask_1rw_1r_func_test.ok \
126+
sky130/22_sram_wmask_func_test.ok \
132127
sky130/23_lib_sram_linear_regression_test.ok \
133128
sky130/23_lib_sram_model_corners_test.ok \
134129
sky130/23_lib_sram_model_test.ok \

0 commit comments

Comments
 (0)