luke
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix normal randomize case

This commit is contained in:
Yilou Wang 2025-10-11 17:44:20 +02:00
parent 76a60df6fd
commit c29e2601cb
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/V3Randomize.cpp
View File

@ -2454,10 +2454,6 @@ class RandomizeVisitor final : public VNVisitor {
FileLine* fl = nodep->fileline(); FileLine* fl = nodep->fileline();
AstVar* const randModeVarp = getRandModeVar(nodep); AstVar* const randModeVarp = getRandModeVar(nodep);
AstFunc* const basicRandomizep
= V3Randomize::newRandomizeFunc(m_memberMap, nodep, BASIC_RANDOMIZE_FUNC_NAME);
addBasicRandomizeBody(basicRandomizep, nodep, randModeVarp);
AstFuncRef* const basicRandomizeCallp = new AstFuncRef{fl, basicRandomizep, nullptr};
AstNodeExpr* beginValp = nullptr; AstNodeExpr* beginValp = nullptr;
AstVar* genp = getRandomGenerator(nodep); AstVar* genp = getRandomGenerator(nodep);
if (genp) { if (genp) {
@ -2515,8 +2511,18 @@ class RandomizeVisitor final : public VNVisitor {
} }
AstVarRef* const fvarRefp = new AstVarRef{fl, fvarp, VAccess::WRITE}; AstVarRef* const fvarRefp = new AstVarRef{fl, fvarp, VAccess::WRITE};
randomizep->addStmtsp(
new AstAssign{fl, fvarRefp, globalcons ? basicRandomizeCallp : beginValp}); // For global constraints: call basic randomize first (without global constraints)
if (globalcons) {
AstFunc* const basicRandomizep
= V3Randomize::newRandomizeFunc(m_memberMap, nodep, BASIC_RANDOMIZE_FUNC_NAME);
addBasicRandomizeBody(basicRandomizep, nodep, randModeVarp);
AstFuncRef* const basicRandomizeCallp = new AstFuncRef{fl, basicRandomizep, nullptr};
randomizep->addStmtsp(new AstAssign{fl, fvarRefp, basicRandomizeCallp});
} else {
// For normal classes: use beginValp (standard flow)
randomizep->addStmtsp(new AstAssign{fl, fvarRefp, beginValp});
}
if (AstTask* const resizeAllTaskp if (AstTask* const resizeAllTaskp
= VN_AS(m_memberMap.findMember(nodep, "__Vresize_constrained_arrays"), Task)) { = VN_AS(m_memberMap.findMember(nodep, "__Vresize_constrained_arrays"), Task)) {
@ -2527,9 +2533,19 @@ class RandomizeVisitor final : public VNVisitor {
AstVarRef* const fvarRefReadp = fvarRefp->cloneTree(false); AstVarRef* const fvarRefReadp = fvarRefp->cloneTree(false);
fvarRefReadp->access(VAccess::READ); fvarRefReadp->access(VAccess::READ);
randomizep->addStmtsp(new AstAssign{ // For global constraints: combine with solver result (beginValp)
fl, fvarRefp->cloneTree(false), // For normal classes: call basic randomize after resize
new AstAnd{fl, fvarRefReadp, globalcons ? beginValp : basicRandomizeCallp}}); if (globalcons) {
randomizep->addStmtsp(new AstAssign{fl, fvarRefp->cloneTree(false),
new AstAnd{fl, fvarRefReadp, beginValp}});
} else {
AstFunc* const basicRandomizep
= V3Randomize::newRandomizeFunc(m_memberMap, nodep, BASIC_RANDOMIZE_FUNC_NAME);
addBasicRandomizeBody(basicRandomizep, nodep, randModeVarp);
AstFuncRef* const basicRandomizeCallp = new AstFuncRef{fl, basicRandomizep, nullptr};
randomizep->addStmtsp(new AstAssign{fl, fvarRefp->cloneTree(false),
new AstAnd{fl, fvarRefReadp, basicRandomizeCallp}});
}
addPrePostCall(nodep, randomizep, "post_randomize"); addPrePostCall(nodep, randomizep, "post_randomize");
nodep->user1(false); nodep->user1(false);
} }