riscv
/
skywater-pdk
mirror of https://github.com/google/skywater-pdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #92 from mithro/ccsnoise-fix 

Fix ccsnoise properties ending up in basic liberty files.
This commit is contained in:
Tim Ansell 2020-07-12 22:59:42 -07:00 committed by GitHub
parent f2838cf382 b626ca017d
commit ad3b507e38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
scripts/python-skywater-pdk/skywater_pdk/liberty.py
View File

@ -257,7 +257,7 @@ def collect(library_dir) -> Tuple[Dict[str, TimingType], List[str]]:
return libname0, corners, all_cells return libname0, corners, all_cells
def remove_ccsnoise(data): def remove_ccsnoise(data, cellname):
for k, v in list(data.items()): for k, v in list(data.items()):
if "ccsn_" in k: if "ccsn_" in k:
del data[k] del data[k]
@ -271,19 +271,32 @@ def remove_ccsnoise(data):
if "input_voltage" in pin_data: if "input_voltage" in pin_data:
del pin_data["input_voltage"] del pin_data["input_voltage"]
ccsn_keys = set()
for pk in pin_data:
if not pk.startswith("ccsn_"):
continue
ccsn_keys.add(pk)
for pk in ccsn_keys:
if debug:
print("{:20s} - {:15s}: Removing {}".format(cellname, k, pk))
del pin_data[pk]
if "timing" not in pin_data: if "timing" not in pin_data:
continue continue
pin_timing = pin_data["timing"] pin_timing = pin_data["timing"]
for t in pin_timing: for i,t in enumerate(pin_timing):
ccsn_keys = set() ccsn_keys = set()
for k in t: for tk in t:
if not k.startswith("ccsn_"): if not tk.startswith("ccsn_"):
continue continue
ccsn_keys.add(k) ccsn_keys.add(tk)
for k in ccsn_keys: for tk in ccsn_keys:
del t[k] if debug:
print("{:20s} - {:15s}.timing[{:3d}]: Removing {}".format(cellname, k, i, tk))
del t[tk]
def generate(library_dir, lib, corner, ocorner_type, icorner_type, cells): def generate(library_dir, lib, corner, ocorner_type, icorner_type, cells):
@ -320,7 +333,7 @@ def generate(library_dir, lib, corner, ocorner_type, icorner_type, cells):
# Remove the ccsnoise if it exists # Remove the ccsnoise if it exists
if ocorner_type != TimingType.ccsnoise: if ocorner_type != TimingType.ccsnoise:
remove_ccsnoise(common_data) remove_ccsnoise(common_data, "library")
output = liberty_dict("library", lib+"__"+corner, common_data) output = liberty_dict("library", lib+"__"+corner, common_data)
assert output[-1] == '}', output assert output[-1] == '}', output
@ -336,7 +349,7 @@ def generate(library_dir, lib, corner, ocorner_type, icorner_type, cells):
# Remove the ccsnoise if it exists # Remove the ccsnoise if it exists
if ocorner_type != TimingType.ccsnoise: if ocorner_type != TimingType.ccsnoise:
remove_ccsnoise(cell_data) remove_ccsnoise(cell_data, cell_with_size)
top_write(['']) top_write([''])
top_write(liberty_dict("cell", "%s__%s" % (lib, cell_with_size), cell_data, [cell_with_size])) top_write(liberty_dict("cell", "%s__%s" % (lib, cell_with_size), cell_data, [cell_with_size]))
@ -706,8 +719,8 @@ def liberty_list(k, v, i=tuple()):
for l in v: for l in v:
o.append('%s"%s", \\' % (INDENT*(len(i)+1), join(l))) o.append('%s"%s", \\' % (INDENT*(len(i)+1), join(l)))
o[1] = o[0]+o[1] o0 = o.pop(0)
o.pop(0) o[0] = o0+o[0].lstrip()
o[-1] = o[-1][:-3] + ');' o[-1] = o[-1][:-3] + ');'
else: else: