Skip to content

Commit

Permalink
Handle only unconstrained variables in basic_randomize
Browse files Browse the repository at this point in the history 
Signed-off-by: Ryszard Rozak <[email protected]>
  • Loading branch information
@RRozak
RRozak committed Nov 28, 2024
1 parent c2d302a commit 59aeedf
Showing 1 changed file with 29 additions and 20 deletions.
49 changes: 29 additions & 20 deletions src/V3Randomize.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,8 @@ class RandomizeMarkVisitor final : public VNVisitor {

class ConstraintExprVisitor final : public VNVisitor {
// NODE STATE
// AstVar::user3() -> bool. Handled in constraints
// AstVar::user3() -> int. 0 - unconstrained, 1 - constrained by class constraints,
// higher value - constrained by with clause of randomize
// AstNodeExpr::user1() -> bool. Depending on a randomized variable
// VNuser3InUse m_inuser3; (Allocated for use in RandomizeVisitor)

Expand All @@ -498,6 +499,7 @@ class ConstraintExprVisitor final : public VNVisitor {
AstVar* m_randModeVarp; // Relevant randmode state variable
bool m_wantSingle = false; // Whether to merge constraint expressions with LOGAND
VMemberMap& m_memberMap; // Member names cached for fast lookup
const int m_visitCnt = 0; // visit count

AstSFormatF* getConstFormat(AstNodeExpr* nodep) {
return new AstSFormatF{nodep->fileline(), (nodep->width() & 3) ? "#b%b" : "#x%x", false,
Expand Down Expand Up @@ -633,7 +635,8 @@ class ConstraintExprVisitor final : public VNVisitor {
}
relinker.relink(exprp);

if (!varp->user3()) {
if (varp->user3() != 1 && varp->user3() != m_visitCnt) {
varp->user3(m_visitCnt);
AstCMethodHard* const methodp = new AstCMethodHard{
varp->fileline(),
new AstVarRef{varp->fileline(), VN_AS(m_genp->user2p(), NodeModule), m_genp,
Expand Down Expand Up @@ -673,7 +676,7 @@ class ConstraintExprVisitor final : public VNVisitor {
}
AstNodeFTask* initTaskp = m_inlineInitTaskp;
if (!initTaskp) {
varp->user3(true); // Mark as set up in new()
// Set up in new()
initTaskp = VN_AS(m_memberMap.findMember(classp, "new"), NodeFTask);
UASSERT_OBJ(initTaskp, classp, "No new() in class");
}
Expand Down Expand Up @@ -878,11 +881,12 @@ class ConstraintExprVisitor final : public VNVisitor {
// CONSTRUCTORS
explicit ConstraintExprVisitor(VMemberMap& memberMap, AstNode* nodep,
AstNodeFTask* inlineInitTaskp, AstVar* genp,
AstVar* randModeVarp)
AstVar* randModeVarp, const int visitCnt)
: m_inlineInitTaskp{inlineInitTaskp}
, m_genp{genp}
, m_randModeVarp{randModeVarp}
, m_memberMap{memberMap} {
, m_memberMap{memberMap}
, m_visitCnt{visitCnt} {
iterateAndNextNull(nodep);
}
};
Expand Down Expand Up @@ -1140,7 +1144,7 @@ class RandomizeVisitor final : public VNVisitor {
// AstEnumDType::user2() -> AstVar*. Pointer to table with enum values
// AstConstraint::user2p() -> AstTask*. Pointer to constraint setup procedure
// AstClass::user2p() -> AstVar*. Rand mode state variable
// AstVar::user3() -> bool. Handled in constraints
// AstVar::user3() -> int. Handled in constraints
// AstClass::user3p() -> AstVar*. Constrained randomizer variable
// AstConstraint::user3p() -> AstTask*. Pointer to resize procedure
// AstClass::user4p() -> AstVar*. Constraint mode state variable
Expand All @@ -1166,6 +1170,7 @@ class RandomizeVisitor final : public VNVisitor {
int m_randCaseNum = 0; // Randcase number within a module for var naming
std::map<std::string, AstCDType*> m_randcDtypes; // RandC data type deduplication
AstConstraint* m_constraintp = nullptr; // Current constraint
int m_withCnt = 1; // AstWith count, 1 is for class constraints

// METHODS
void createRandomGenerator(AstClass* const classp) {
Expand Down Expand Up @@ -1715,15 +1720,18 @@ class RandomizeVisitor final : public VNVisitor {
}
});
}
void addBasicRandomizeBody(AstFunc* const basicRandomizep, AstClass* const nodep) {
void addBasicRandomizeBody(AstFunc* const basicRandomizep, AstClass* const nodep,
const int withCnt) {
FileLine* const fl = nodep->fileline();
AstVar* const basicFvarp = VN_AS(basicRandomizep->fvarp(), Var);
AstVarRef* const basicFvarRefp = new AstVarRef{fl, basicFvarp, VAccess::WRITE};
AstConst* const beginBasicValp = new AstConst{fl, AstConst::WidthedValue{}, 32, 1};
basicRandomizep->addStmtsp(new AstAssign{fl, basicFvarRefp, beginBasicValp});
nodep->foreachMember([&](AstClass* classp, AstVar* memberVarp) {
if (!memberVarp->rand().isRandomizable()) return;
if (memberVarp->user3()) return; // Handled in constraints
if (memberVarp->user3() == 1 || memberVarp->user3() == withCnt) {
return; // Handled in constraints
}
const AstNodeDType* const dtypep = memberVarp->dtypep()->skipRefp();
if (const AstClassRefDType* const classRefp = VN_CAST(dtypep, ClassRefDType)) {
if (classRefp->classp() == nodep) {
Expand Down Expand Up @@ -1945,7 +1953,8 @@ class RandomizeVisitor final : public VNVisitor {
resizeAllTaskp->addStmtsp(resizeTaskRefp->makeStmt());
}

ConstraintExprVisitor{m_memberMap, constrp->itemsp(), nullptr, genp, randModeVarp};
ConstraintExprVisitor{m_memberMap, constrp->itemsp(), nullptr,
genp, randModeVarp, 1};
if (constrp->itemsp()) {
taskp->addStmtsp(wrapIfConstraintMode(
nodep, constrp, constrp->itemsp()->unlinkFrBackWithNext()));
Expand Down Expand Up @@ -1990,7 +1999,7 @@ class RandomizeVisitor final : public VNVisitor {
AstFunc* const basicRandomizep
= V3Randomize::newRandomizeFunc(m_memberMap, nodep, "__Vbasic_randomize");
handleRandMode(nodep, randModeVarp);
addBasicRandomizeBody(basicRandomizep, nodep);
addBasicRandomizeBody(basicRandomizep, nodep, 1);
AstFuncRef* const basicRandomizeCallp = new AstFuncRef{fl, "__Vbasic_randomize", nullptr};
basicRandomizeCallp->taskp(basicRandomizep);
basicRandomizeCallp->dtypep(basicRandomizep->dtypep());
Expand Down Expand Up @@ -2156,14 +2165,6 @@ class RandomizeVisitor final : public VNVisitor {

randomizeFuncp->addStmtsp(localGenp);

AstFunc* const basicRandomizeFuncp = V3Randomize::newRandomizeFunc(
m_memberMap, classp, m_uniqueBasicNames.get(nodep), false);
AstFuncRef* const basicRandomizeFuncCallp
= new AstFuncRef{nodep->fileline(), basicRandomizeFuncp->name(), nullptr};
basicRandomizeFuncCallp->taskp(basicRandomizeFuncp);
basicRandomizeFuncCallp->dtypep(basicRandomizeFuncp->dtypep());
addBasicRandomizeBody(basicRandomizeFuncp, classp);

// Copy (derive) class constraints if present
if (classGenp) {
randomizeFuncp->addStmtsp(
Expand All @@ -2187,10 +2188,18 @@ class RandomizeVisitor final : public VNVisitor {
AstNode* const capturedTreep = withp->exprp()->unlinkFrBackWithNext();
randomizeFuncp->addStmtsp(capturedTreep);
{
ConstraintExprVisitor{m_memberMap, capturedTreep, randomizeFuncp, localGenp,
randModeVarp};
ConstraintExprVisitor{m_memberMap, capturedTreep, randomizeFuncp,
localGenp, randModeVarp, ++m_withCnt};
}

AstFunc* const basicRandomizeFuncp = V3Randomize::newRandomizeFunc(
m_memberMap, classp, m_uniqueBasicNames.get(nodep), false);
AstFuncRef* const basicRandomizeFuncCallp
= new AstFuncRef{nodep->fileline(), basicRandomizeFuncp->name(), nullptr};
basicRandomizeFuncCallp->taskp(basicRandomizeFuncp);
basicRandomizeFuncCallp->dtypep(basicRandomizeFuncp->dtypep());
addBasicRandomizeBody(basicRandomizeFuncp, classp, m_withCnt);

// Call the solver and set return value
AstVarRef* const randNextp
= new AstVarRef{nodep->fileline(), localGenp, VAccess::READWRITE};
Expand Down

0 comments on commit 59aeedf

Please sign in to comment.