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

fix conflicts

This commit is contained in:
Yilou Wang 2025-11-07 10:28:30 +01:00
parent 57af50499d
commit 11bd5fb9ec
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/V3AstAttr.h
View File

@ -783,7 +783,8 @@ public:
FORK_INIT, FORK_INIT,
FORK_JOIN, FORK_JOIN,
RANDOMIZER_BASIC_STD_RANDOMIZATION, RANDOMIZER_BASIC_STD_RANDOMIZATION,
RANDOMIZER_CLEAR, RANDOMIZER_CLEARCONSTRAINTS,
RANDOMIZER_CLEARALL,
RANDOMIZER_HARD, RANDOMIZER_HARD,
RANDOMIZER_WRITE_VAR, RANDOMIZER_WRITE_VAR,
RNG_GET_RANDSTATE, RNG_GET_RANDSTATE,
@ -911,7 +912,8 @@ inline std::ostream& operator<<(std::ostream& os, const VCMethod& rhs) {
{FORK_INIT, "init", false}, \ {FORK_INIT, "init", false}, \
{FORK_JOIN, "join", false}, \ {FORK_JOIN, "join", false}, \
{RANDOMIZER_BASIC_STD_RANDOMIZATION, "basicStdRandomization", false}, \ {RANDOMIZER_BASIC_STD_RANDOMIZATION, "basicStdRandomization", false}, \
{RANDOMIZER_CLEAR, "clear", false}, \ {RANDOMIZER_CLEARCONSTRAINTS, "clearConstraints", false}, \
{RANDOMIZER_CLEARALL, "clearAll", false}, \
{RANDOMIZER_HARD, "hard", false}, \ {RANDOMIZER_HARD, "hard", false}, \
{RANDOMIZER_WRITE_VAR, "write_var", false}, \ {RANDOMIZER_WRITE_VAR, "write_var", false}, \
{RNG_GET_RANDSTATE, "__Vm_rng.get_randstate", true}, \ {RNG_GET_RANDSTATE, "__Vm_rng.get_randstate", true}, \

21
src/V3Randomize.cpp
View File

@ -371,15 +371,6 @@ class RandomizeMarkVisitor final : public VNVisitor {
iterateChildren(nodep); iterateChildren(nodep);
if (!nodep->backp()) VL_DO_DANGLING(nodep->deleteTree(), nodep); if (!nodep->backp()) VL_DO_DANGLING(nodep->deleteTree(), nodep);
} }
void visit(AstWith* nodep) override {
for (AstNode* pinp = m_stdRandCallp ? m_stdRandCallp->pinsp() : nullptr; pinp;
pinp = pinp->nextp()) {
AstWith* const withp = VN_CAST(pinp, With);
if (withp == nodep) m_inStdWith = true;
}
iterateChildrenConst(nodep);
m_inStdWith = false;
}
void visit(AstNodeFTaskRef* nodep) override { void visit(AstNodeFTaskRef* nodep) override {
if (nodep->classOrPackagep() && nodep->classOrPackagep()->name() == "std") if (nodep->classOrPackagep() && nodep->classOrPackagep()->name() == "std")
m_stdRandCallp = nodep; m_stdRandCallp = nodep;
@ -705,7 +696,13 @@ class RandomizeMarkVisitor final : public VNVisitor {
void visit(AstWith* nodep) override { void visit(AstWith* nodep) override {
VL_RESTORER(m_withp); VL_RESTORER(m_withp);
m_withp = nodep; m_withp = nodep;
for (AstNode* pinp = m_stdRandCallp ? m_stdRandCallp->pinsp() : nullptr; pinp;
pinp = pinp->nextp()) {
AstWith* const withp = VN_CAST(pinp, With);
if (withp == nodep) m_inStdWith = true;
}
iterateChildrenConst(nodep); iterateChildrenConst(nodep);
m_inStdWith = false;
} }
void visit(AstNodeExpr* nodep) override { void visit(AstNodeExpr* nodep) override {
@ -2650,10 +2647,10 @@ class RandomizeVisitor final : public VNVisitor {
ConstraintExprVisitor{m_memberMap, capturedTreep, randomizeFuncp, stdrand, ConstraintExprVisitor{m_memberMap, capturedTreep, randomizeFuncp, stdrand,
nullptr}; nullptr};
} }
AstVarRef* const randNextp = new AstVarRef{fl, stdrand, VAccess::READWRITE}; AstCExpr* const solverCallp = new AstCExpr{fl};
randNextp->AstNode::addNext(new AstText{fl, ".next()"});
AstNodeExpr* const solverCallp = new AstCExpr{fl, randNextp};
solverCallp->dtypeSetBit(); solverCallp->dtypeSetBit();
solverCallp->add(new AstVarRef{fl, stdrand, VAccess::READWRITE});
solverCallp->add(".next()");
AstVar* const fvarp = VN_AS(randomizeFuncp->fvarp(), Var); AstVar* const fvarp = VN_AS(randomizeFuncp->fvarp(), Var);
AstVarRef* const retvalReadp = new AstVarRef{fl, fvarp, VAccess::READ}; AstVarRef* const retvalReadp = new AstVarRef{fl, fvarp, VAccess::READ};
AstNodeExpr* const andExprp = new AstAnd{fl, retvalReadp, solverCallp}; AstNodeExpr* const andExprp = new AstAnd{fl, retvalReadp, solverCallp};