luke/verilator
1
0
Fork 0
mirror of https://github.com/verilator/verilator.git synced 2026-08-31 18:14:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix enum variables in constraint solver producing invalid enum values (#7058) (#7065)

Browse Source
This commit is contained in:
Yilou Wang
2026-02-16 22:44:38 -05:00
committed by GitHub
parent 4357aee09a
commit ed3aa43657
3 changed files with 131 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/V3Randomize.cpp
+28
View File
@@ -3338,6 +3338,34 @@ class RandomizeVisitor final : public VNVisitor {
}
}
randomizep->addStmtsp(implementConstraintsClear(fl, genp));
// Restrict enum variables in solver to valid members only
{
AstNodeModule* const genModp = VN_AS(genp->user2p(), NodeModule);
nodep->foreachMember([&](AstClass*, AstVar* memberVarp) {
if (!memberVarp->user3()) return;
AstEnumDType* const enumDtp
= VN_CAST(memberVarp->dtypep()->skipRefToEnump(), EnumDType);
if (!enumDtp) return;
const int width = enumDtp->width();
const std::string smtName = memberVarp->name();
std::string constraint = "(__Vbv (or";
for (AstEnumItem* itemp = enumDtp->itemsp(); itemp;
itemp = VN_AS(itemp->nextp(), EnumItem)) {
const AstConst* const vconstp = VN_AS(itemp->valuep(), Const);
constraint += " (= " + smtName + " (_ bv" + cvtToStr(vconstp->toUInt())
+ " " + cvtToStr(width) + "))";
}
constraint += "))";
AstCMethodHard* const callp = new AstCMethodHard{
fl, new AstVarRef{fl, genModp, genp, VAccess::READWRITE},
VCMethod::RANDOMIZER_HARD,
new AstCExpr{fl, AstCExpr::Pure{}, "\"" + constraint + "\""}};
callp->dtypeSetVoid();
randomizep->addStmtsp(callp->makeStmt());
});
}
AstTask* setupAllTaskp = getCreateConstraintSetupFunc(nodep);
AstTaskRef* const setupTaskRefp = new AstTaskRef{fl, setupAllTaskp, nullptr};
randomizep->addStmtsp(setupTaskRefp->makeStmt());