stefan/kyupy
2
0 Fork 0
Code Issues Pull Requests Releases Wiki Activity

improve robustness of sdf annotation and wave sim

Browse Source
This commit is contained in:
Stefan Holst committed 2021-09-01 12:57:55 +09:00
1 parent 8bbaaf8fae
commit 7c03271048
2 files changed
+17 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/kyupy/sdf.py
+15 -9
View File
@@ -92,7 +92,7 @@ class DelayFile:
continue continue
cell = find_cell(cn) cell = find_cell(cn)
if cell is None: if cell is None:
log.warn(f'Cell from SDF not found in circuit: {cn}') #log.warn(f'Cell from SDF not found in circuit: {cn}')
continue continue
ipn = re.sub(r'\((neg|pos)edge ([^)]+)\)', r'\2', ipn) ipn = re.sub(r'\((neg|pos)edge ([^)]+)\)', r'\2', ipn)
ipin = tlib.pin_index(cell.kind, ipn) ipin = tlib.pin_index(cell.kind, ipn)
@@ -111,12 +111,15 @@ class DelayFile:
if ffdelays and (len(cell.outs) > opin): if ffdelays and (len(cell.outs) > opin):
add_delays(cell.outs[opin]) add_delays(cell.outs[opin])
else: else:
if kind.startswith(('xor', 'xnor')): if ipin < len(cell.ins):
# print(ipn, ipin, times[cell.i_lines[ipin], 0, 0]) if kind.startswith(('xor', 'xnor')):
take_avg = timing[cell.ins[ipin]].sum() > 0 # print(ipn, ipin, times[cell.i_lines[ipin], 0, 0])
add_delays(cell.ins[ipin]) take_avg = timing[cell.ins[ipin]].sum() > 0
if take_avg: add_delays(cell.ins[ipin])
timing[cell.ins[ipin]] /= 2 if take_avg:
timing[cell.ins[ipin]] /= 2
else:
log.warn(f'No line to annotate pin {ipn} of {cell}')
if not interconnect or self.interconnects is None: if not interconnect or self.interconnects is None:
return timing return timing
@@ -139,14 +142,17 @@ class DelayFile:
cn2, pn2 = (n2, 'IN') cn2, pn2 = (n2, 'IN')
c1 = find_cell(cn1) c1 = find_cell(cn1)
if c1 is None: if c1 is None:
log.warn(f'Cell from SDF not found in circuit: {cn1}') #log.warn(f'Cell from SDF not found in circuit: {cn1}')
continue continue
c2 = find_cell(cn2) c2 = find_cell(cn2)
if c2 is None: if c2 is None:
log.warn(f'Cell from SDF not found in circuit: {cn2}') #log.warn(f'Cell from SDF not found in circuit: {cn2}')
continue continue
p1, p2 = tlib.pin_index(c1.kind, pn1), tlib.pin_index(c2.kind, pn2) p1, p2 = tlib.pin_index(c1.kind, pn1), tlib.pin_index(c2.kind, pn2)
line = None line = None
if len(c2.ins) <= p2:
log.warn(f'No line to annotate pin {pn2} of {c2}')
continue
f1, f2 = c1.outs[p1].reader, c2.ins[p2].driver f1, f2 = c1.outs[p1].reader, c2.ins[p2].driver
if f1 != f2: # possible branchfork if f1 != f2: # possible branchfork
assert len(f2.ins) == 1 assert len(f2.ins) == 1
src/kyupy/wave_sim.py
+2 -1
View File
@@ -161,7 +161,8 @@ class WaveSim:
if kind == '__fork__': if kind == '__fork__':
if not strip_forks: if not strip_forks:
for o_line in n.outs: for o_line in n.outs:
ops.append((0b1010, o_line.index, i0_idx, i1_idx)) if o_line is not None:
ops.append((0b1010, o_line.index, i0_idx, i1_idx))
elif kind.startswith('nand'): elif kind.startswith('nand'):
ops.append((0b0111, o0_idx, i0_idx, i1_idx)) ops.append((0b0111, o0_idx, i0_idx, i1_idx))
elif kind.startswith('nor'): elif kind.startswith('nor'):