3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2026-07-09 17:00:19 +00:00

Merge pull request #5986 from YosysHQ/nella/x-wildcard

fix case item containing x/z treated as wildcard in proc_rmdead
This commit is contained in:
nella 2026-07-07 08:00:02 +00:00 committed by GitHub
commit 8a2499b544
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 68 additions and 0 deletions

View file

@ -107,6 +107,18 @@ struct BitPatternPool
return bits;
}
/**
* A literal x/z bit can never match a 2-valued selector, so a pattern containing
* one covers nothing.
*/
static bool covers_nothing(RTLIL::SigSpec sig)
{
for (auto bit : sig)
if (bit.wire == NULL && (bit.data == RTLIL::State::Sx || bit.data == RTLIL::State::Sz))
return true;
return false;
}
/**
* Two cubes match if their intersection is non-empty.
*/
@ -131,6 +143,8 @@ struct BitPatternPool
*/
bool has_any(RTLIL::SigSpec sig)
{
if (covers_nothing(sig))
return false;
bits_t bits = sig2bits(sig);
for (auto &it : database)
if (match(it, bits))
@ -149,6 +163,8 @@ struct BitPatternPool
*/
bool has_all(RTLIL::SigSpec sig)
{
if (covers_nothing(sig))
return true;
bits_t bits = sig2bits(sig);
for (auto &it : database)
if (match(it, bits)) {
@ -170,6 +186,8 @@ struct BitPatternPool
bool take(RTLIL::SigSpec sig)
{
bool status = false;
if (covers_nothing(sig))
return false;
bits_t bits = sig2bits(sig);
for (auto it = database.begin(); it != database.end();)
if (match(*it, bits)) {