From 35a6b1d2ee6d0674dd9f44d99bbe7b9d29fed767 Mon Sep 17 00:00:00 2001 From: mrg Date: Fri, 11 Dec 2020 10:22:35 -0800 Subject: [PATCH] Fix copy gds/sp error with new relative paths --- compiler/verify/calibre.py | 23 ----------------------- compiler/verify/magic.py | 10 ---------- 2 files changed, 33 deletions(-) diff --git a/compiler/verify/calibre.py b/compiler/verify/calibre.py index 8eedd06f..852451ce 100644 --- a/compiler/verify/calibre.py +++ b/compiler/verify/calibre.py @@ -195,17 +195,6 @@ def run_drc(cell_name, gds_name, sp_name, extract=False, final_verification=Fals global num_drc_runs num_drc_runs += 1 - # Filter the layouts through magic as a GDS filter for nsdm/psdm/nwell merging - # Disabled for now - if False and OPTS.tech_name == "sky130": - shutil.copy(gds_name, OPTS.openram_temp + "temp.gds") - from magic import filter_gds - filter_gds(cell_name, OPTS.openram_temp + "temp.gds", OPTS.openram_temp + cell_name + ".gds") - else: - # Copy file to local dir if it isn't already - if not os.path.isfile(OPTS.openram_temp + os.path.basename(gds_name)): - shutil.copy(gds_name, OPTS.openram_temp + os.path.basename(gds_name)) - drc_runset = write_drc_script(cell_name, gds_name, extract, final_verification, OPTS.openram_temp) (outfile, errfile, resultsfile) = run_script(cell_name, "drc") @@ -248,12 +237,6 @@ def run_lvs(cell_name, gds_name, sp_name, final_verification=False): lvs_runset = write_lvs_script(cell_name, gds_name, sp_name, final_verification, OPTS.openram_temp) - # Copy file to local dir if it isn't already - if not os.path.isfile(OPTS.openram_temp + os.path.basename(gds_name)): - shutil.copy(gds_name, OPTS.openram_temp) - if not os.path.isfile(OPTS.openram_temp + os.path.basename(sp_name)): - shutil.copy(sp_name, OPTS.openram_temp) - (outfile, errfile, resultsfile) = run_script(cell_name, "lvs") # check the result for these lines in the summary: @@ -335,12 +318,6 @@ def run_pex(cell_name, gds_name, sp_name, output=None, final_verification=False) write_pex_script(cell_name, True, output, final_verification, OPTS.openram_temp) - # Copy file to local dir if it isn't already - if not os.path.isfile(OPTS.openram_temp + os.path.basename(gds_name)): - shutil.copy(gds_name, OPTS.openram_temp) - if not os.path.isfile(OPTS.openram_temp + os.path.basename(sp_name)): - shutil.copy(sp_name, OPTS.openram_temp) - (outfile, errfile, resultsfile) = run_script(cell_name, "pex") diff --git a/compiler/verify/magic.py b/compiler/verify/magic.py index 8972ce0f..aaae6bc5 100644 --- a/compiler/verify/magic.py +++ b/compiler/verify/magic.py @@ -190,10 +190,6 @@ def run_drc(cell_name, gds_name, sp_name=None, extract=True, final_verification= global num_drc_runs num_drc_runs += 1 - # Copy file to local dir if it isn't already - if os.path.dirname(gds_name)!=OPTS.openram_temp.rstrip('/'): - shutil.copy(gds_name, OPTS.openram_temp) - write_drc_script(cell_name, gds_name, extract, final_verification, OPTS.openram_temp, sp_name=sp_name) (outfile, errfile, resultsfile) = run_script(cell_name, "ext") @@ -281,12 +277,6 @@ def run_lvs(cell_name, gds_name, sp_name, final_verification=False, output_path= if not output_path: output_path = OPTS.openram_temp - # Copy file to local dir if it isn't already - if os.path.dirname(gds_name) != output_path.rstrip('/'): - shutil.copy(gds_name, output_path) - if os.path.dirname(sp_name) != output_path.rstrip('/'): - shutil.copy(sp_name, output_path) - write_lvs_script(cell_name, gds_name, sp_name, final_verification) (outfile, errfile, resultsfile) = run_script(cell_name, "lvs")