luke/verilator
1
0
Fork 0
mirror of https://github.com/verilator/verilator.git synced 2026-09-02 10:48:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support rand_mode in global constraint gathering (#6740) (#6752)

Browse Source
This commit is contained in:
Yilou Wang
2025-12-04 07:16:03 -05:00
committed by GitHub
parent 4426aff3d3
commit 22cd9bcadc
3 changed files with 99 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/V3Randomize.cpp
+43 -12
View File
@@ -882,20 +882,49 @@ class ConstraintExprVisitor final : public VNVisitor {
VNRelinker relinker;
nodep->unlinkFrBack(&relinker);
AstNodeExpr* exprp = new AstSFormatF{nodep->fileline(), smtName, false, nullptr};
AstNodeExpr* exprp;
if (randMode.usesMode) {
AstNodeExpr* constFormatp = getConstFormat(nodep);
UASSERT_OBJ(m_randModeVarp, nodep, "No m_randModeVarp");
AstCMethodHard* const atp = new AstCMethodHard{
nodep->fileline(),
new AstVarRef{varp->fileline(), VN_AS(m_randModeVarp->user2p(), NodeModule),
m_randModeVarp, VAccess::READ},
VCMethod::ARRAY_AT, new AstConst{nodep->fileline(), randMode.index}};
// Use string literal to avoid double formatting
exprp = new AstCExpr{nodep->fileline(), "std::string(\"" + smtName + "\")", 1};
exprp->dtypeSetString();
// Get const format, using membersel if available for correct width/value
AstNodeExpr* constFormatp
= membersel ? getConstFormat(membersel->cloneTree(false)) : getConstFormat(nodep);
// Build randmode access: for membersel, access parent object's __Vrandmode
AstNodeExpr* randModeAccess;
if (membersel) {
AstNodeExpr* parentAccess = membersel->fromp()->cloneTree(false);
AstNodeModule* const varClassp = VN_AS(varp->user2p(), NodeModule);
AstVar* const effectiveRandModeVarp = VN_AS(varClassp->user2p(), Var);
if (effectiveRandModeVarp) {
AstMemberSel* randModeSel
= new AstMemberSel{varp->fileline(), parentAccess, effectiveRandModeVarp};
randModeSel->dtypep(effectiveRandModeVarp->dtypep());
randModeAccess = randModeSel;
} else {
UASSERT_OBJ(m_randModeVarp, nodep, "No m_randModeVarp");
randModeAccess = new AstVarRef{varp->fileline(),
VN_AS(m_randModeVarp->user2p(), NodeModule),
m_randModeVarp, VAccess::READ};
}
} else {
UASSERT_OBJ(m_randModeVarp, nodep, "No m_randModeVarp");
randModeAccess
= new AstVarRef{varp->fileline(), VN_AS(m_randModeVarp->user2p(), NodeModule),
m_randModeVarp, VAccess::READ};
}
AstCMethodHard* const atp
= new AstCMethodHard{nodep->fileline(), randModeAccess, VCMethod::ARRAY_AT,
new AstConst{nodep->fileline(), randMode.index}};
atp->dtypeSetUInt32();
exprp = new AstCond{varp->fileline(), atp, exprp, constFormatp};
} else if (!isGlobalConstrained) {
// Non-global constraints: delete nodep immediately
VL_DO_DANGLING(pushDeletep(nodep), nodep);
exprp->user1(true); // Mark as formatted
} else {
exprp = new AstSFormatF{nodep->fileline(), smtName, false, nullptr};
if (!isGlobalConstrained) { VL_DO_DANGLING(pushDeletep(nodep), nodep); }
}
// else: Global constraints keep nodep alive for write_var processing
relinker.relink(exprp);
@@ -952,7 +981,9 @@ class ConstraintExprVisitor final : public VNVisitor {
methodp->addPinsp(varnamep);
methodp->addPinsp(
new AstConst{varp->dtypep()->fileline(), AstConst::Unsized64{}, dimension});
if (randMode.usesMode) {
// Don't pass randMode.index for global constraints with membersel
// because constraint object can't access nested object's randmode array
if (randMode.usesMode && !(isGlobalConstrained && membersel)) {
methodp->addPinsp(
new AstConst{varp->fileline(), AstConst::Unsized64{}, randMode.index});
}