luke
/
OpenRAM
mirror of https://github.com/VLSIDA/OpenRAM.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix deprecation warnings in regex by converting to raw strings. Add error if unable to find DRC errors in Magic.

This commit is contained in:
Matt Guthaus 2019-02-13 17:01:26 -08:00
parent 3ffcf63e00
commit c359bbf42a
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/verify/calibre.py
View File

@ -126,9 +126,9 @@ def run_drc(cell_name, gds_name, extract=False, final_verification=False):
f.close() f.close()
# those lines should be the last 3 # those lines should be the last 3
results = results[-3:] results = results[-3:]
geometries = int(re.split("\W+", results[0])[5]) geometries = int(re.split(r'\W+', results[0])[5])
rulechecks = int(re.split("\W+", results[1])[4]) rulechecks = int(re.split(r'\W+', results[1])[4])
errors = int(re.split("\W+", results[2])[5]) n errors = int(re.split(r'\W+', results[2])[5])
# always display this summary # always display this summary
if errors > 0: if errors > 0:
@ -227,7 +227,7 @@ def run_lvs(cell_name, gds_name, sp_name, final_verification=False):
incorrect = list(filter(test.search, results)) incorrect = list(filter(test.search, results))
# Errors begin with "Error:" # Errors begin with "Error:"
test = re.compile("\s+Error:") test = re.compile(r'\s+Error:')
errors = list(filter(test.search, results)) errors = list(filter(test.search, results))
for e in errors: for e in errors:
debug.error(e.strip("\n")) debug.error(e.strip("\n"))
@ -363,7 +363,7 @@ def correct_port(name, output_file_name, ref_file_name):
pex_file.seek(match_index_start) pex_file.seek(match_index_start)
rest_text = pex_file.read() rest_text = pex_file.read()
# locate the end of circuit definition line # locate the end of circuit definition line
match = re.search("\* \n", rest_text) match = re.search(r'\* \n', rest_text)
match_index_end = match.start() match_index_end = match.start()
# store the unchanged part of pex file in memory # store the unchanged part of pex file in memory
pex_file.seek(0) pex_file.seek(0)

4
compiler/verify/magic.py
View File

@ -140,11 +140,15 @@ def run_drc(cell_name, gds_name, extract=True, final_verification=False):
debug.error("Unable to retrieve DRC results file. Is magic set up?",1) debug.error("Unable to retrieve DRC results file. Is magic set up?",1)
results = f.readlines() results = f.readlines()
f.close() f.close()
errors=1
# those lines should be the last 3 # those lines should be the last 3
for line in results: for line in results:
if "Total DRC errors found:" in line: if "Total DRC errors found:" in line:
errors = int(re.split(": ", line)[1]) errors = int(re.split(": ", line)[1])
break break
else:
debug.error("Unable to find the total error line in Magic output.",1)
# always display this summary # always display this summary
if errors > 0: if errors > 0: