mirror of
https://github.com/YosysHQ/yosys
synced 2025-04-23 00:55:32 +00:00
Merge branch 'YosysHQ:main' into master
This commit is contained in:
commit
5cc35131a8
2 changed files with 6 additions and 1 deletions
2
Makefile
2
Makefile
|
@ -140,7 +140,7 @@ LIBS += -lrt
|
|||
endif
|
||||
endif
|
||||
|
||||
YOSYS_VER := 0.41+126
|
||||
YOSYS_VER := 0.41+129
|
||||
|
||||
# Note: We arrange for .gitcommit to contain the (short) commit hash in
|
||||
# tarballs generated with git-archive(1) using .gitattributes. The git repo
|
||||
|
|
|
@ -719,6 +719,8 @@ def smt_extract_mask(smt_expr, mask):
|
|||
return combined_chunks, ''.join(mask_index_order[start:end] for start, end in chunks)[::-1]
|
||||
|
||||
def smt_concat(exprs):
|
||||
if not isinstance(exprs, (tuple, list)):
|
||||
exprs = tuple(exprs)
|
||||
if not exprs:
|
||||
return ""
|
||||
if len(exprs) == 1:
|
||||
|
@ -818,6 +820,9 @@ def ywfile_constraints(inywfile, constr_assumes, map_steps=None, skip_x=False):
|
|||
if not bits_re.match(bits):
|
||||
raise ValueError("unsupported bit value in Yosys witness file")
|
||||
|
||||
if bits.count('?') == len(bits):
|
||||
continue
|
||||
|
||||
smt_expr = ywfile_signal(sig, map_steps.get(t, t))
|
||||
|
||||
smt_expr, bits = smt_extract_mask(smt_expr, bits)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue