From f5a9ab3b2ce4b7556c0928b665e70032a9a4cc83 Mon Sep 17 00:00:00 2001 From: Bob Vanhoof Date: Mon, 1 Mar 2021 15:23:57 +0100 Subject: [PATCH] cleanup clutter --- compiler/characterizer/delay.py | 1 - compiler/characterizer/simulation.py | 3 --- compiler/sram/sram.py | 1 - compiler/sram/sram_base.py | 3 +-- compiler/verify/calibre.py | 17 ----------------- 5 files changed, 1 insertion(+), 24 deletions(-) diff --git a/compiler/characterizer/delay.py b/compiler/characterizer/delay.py index a7114293..5858afb2 100644 --- a/compiler/characterizer/delay.py +++ b/compiler/characterizer/delay.py @@ -236,7 +236,6 @@ class delay(simulation): debug.check(len(storage_names) == 2, ("Only inverting/non-inverting storage nodes" "supported for characterization. Storage nets={}").format(storage_names)) - #todo: bob vanhoof's modification: hierarchical pex if OPTS.use_pex and OPTS.pex_exe[0] != 'calibre': bank_num = self.sram.get_bank_num(self.sram.name, bit_row, bit_col) q_name = "bitcell_Q_b{0}_r{1}_c{2}".format(bank_num, bit_row, bit_col) diff --git a/compiler/characterizer/simulation.py b/compiler/characterizer/simulation.py index 965dd087..3d62b28a 100644 --- a/compiler/characterizer/simulation.py +++ b/compiler/characterizer/simulation.py @@ -426,7 +426,6 @@ class simulation(): """ port = self.read_ports[0] - #todo: modified by bob vanhoof to take into account calibre pex if not OPTS.use_pex or (OPTS.use_pex and OPTS.pex_exe[0] == 'calibre'): self.graph.get_all_paths('{}{}'.format("clk", port), '{}{}_{}'.format(self.dout_name, port, self.probe_data)) @@ -483,7 +482,6 @@ class simulation(): debug.check(len(sa_mods) == 1, "Only expected one type of Sense Amp. Cannot perform s_en checks.") enable_name = sa_mods[0].get_enable_name() sen_name = self.get_alias_in_path(paths, enable_name, sa_mods[0]) - # todo: modified by bob vanhoof if OPTS.use_pex and (OPTS.pex_exe[0] != 'calibre'): sen_name = sen_name.split('.')[-1] return sen_name @@ -542,7 +540,6 @@ class simulation(): exclude_set = self.get_bl_name_search_exclusions() for int_net in [cell_bl, cell_br]: bl_names.append(self.get_alias_in_path(paths, int_net, cell_mod, exclude_set)) - #todo modified by bob vanhoof if OPTS.use_pex and OPTS.pex_exe[0] != 'calibre': for i in range(len(bl_names)): bl_names[i] = bl_names[i].split('.')[-1] diff --git a/compiler/sram/sram.py b/compiler/sram/sram.py index d872e118..d5e223f8 100644 --- a/compiler/sram/sram.py +++ b/compiler/sram/sram.py @@ -136,7 +136,6 @@ class sram(): if OPTS.use_pex: start_time = datetime.datetime.now() # Output the extracted design if requested - #todo: bob vanhoof: re-generate the layout so that it now does include the pex labels pexname = OPTS.output_path + self.s.name + ".pex.sp" spname = OPTS.output_path + self.s.name + ".sp" verify.run_pex(self.s.name, gdsname, spname, output=pexname) diff --git a/compiler/sram/sram_base.py b/compiler/sram/sram_base.py index 3d91dbb1..e84abbf1 100644 --- a/compiler/sram/sram_base.py +++ b/compiler/sram/sram_base.py @@ -201,8 +201,7 @@ class sram_base(design, verilog, lef): highest_coord = self.find_highest_coords() self.width = highest_coord[0] self.height = highest_coord[1] - #todo: bob vanhoof: this now does not automatically propagate the pex labels when the lvs tool is calibre - if OPTS.use_pex and not OPTS.lvs_exe[0] == "calibre": + if OPTS.use_pex and OPTS.lvs_exe[0] != "calibre": debug.info(2,"adding global pex labels") self.add_global_pex_labels() self.add_boundary(ll=vector(0, 0), diff --git a/compiler/verify/calibre.py b/compiler/verify/calibre.py index 71989911..619cbdbf 100644 --- a/compiler/verify/calibre.py +++ b/compiler/verify/calibre.py @@ -125,8 +125,6 @@ def write_lvs_script(cell_name, gds_name, sp_name, final_verification=False, out run_file = output_path + "run_lvs.sh" f = open(run_file, "w") f.write("#!/bin/sh\n") - #PDK_DIR=os.environ.get("PDK_DIR") - #f.write("export PDK_DIR={}\n".format(PDK_DIR)) cmd = "{0} -gui -lvs lvs_runset -batch".format(OPTS.lvs_exe[1]) f.write(cmd) @@ -238,9 +236,6 @@ def run_drc(cell_name, gds_name, sp_name, extract=False, final_verification=Fals global num_drc_runs num_drc_runs += 1 - # Copy file to local dir if it isn't already - #if not os.path.isfile(OPTS.openram_temp + os.path.basename(gds_name)): - # hutil.copy(gds_name, OPTS.openram_temp) drc_runset = write_drc_script(cell_name, gds_name, extract, final_verification, OPTS.openram_temp) @@ -284,12 +279,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: @@ -371,12 +360,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")