mirrors/sby
3
0
Fork 0
mirror of https://github.com/YosysHQ/sby.git synced 2025-08-16 18:05:31 +00:00
Code Activity

Re-order status evaluation

Browse source 
Always add the current row to the status map if there's a key error instead of trying to be clever with `.get()` and `None`s.
This commit is contained in:
Krystine Sherwin 2025-07-29 10:26:51 +12:00
parent 990d8db9a2
commit 9cb368b9c8
No known key found for this signature in database
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
sbysrc/sby_status.py
View file

@ -465,24 +465,26 @@ class SbyStatusDb:
except KeyError: except KeyError:
prop_map[key] = prop_status_map = {} prop_map[key] = prop_status_map = {}
current_depth, _, current_kind = prop_status_map.get(status, (None, None, None)) try:
current_depth, _, current_kind = prop_status_map[status]
except KeyError:
prop_status_map[status] = (this_depth, row, this_kind)
continue
update_map = False update_map = False
if current_depth is None: if current_depth is None and current_kind is None:
if current_kind is None: # no depth or kind to compare, just take latest data
update_map = True update_map = True
elif this_kind in ['fst', 'vcd']: elif this_depth is not None and this_depth != current_depth:
# prefer traces over witness files
update_map = True
elif this_depth is not None:
if status == 'FAIL' and this_depth < current_depth: if status == 'FAIL' and this_depth < current_depth:
# earliest fail # earliest fail
update_map = True update_map = True
elif status != 'FAIL' and this_depth > current_depth: elif status != 'FAIL' and this_depth > current_depth:
# latest non-FAIL # latest non-FAIL
update_map = True update_map = True
elif this_depth == current_depth and this_kind in ['fst', 'vcd']: elif this_kind in ['fst', 'vcd']:
# prefer traces over witness files # prefer traces over witness files
update_map = True update_map = True
if update_map: if update_map:
prop_status_map[status] = (this_depth, row, this_kind) prop_status_map[status] = (this_depth, row, this_kind)