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

Internals: V3Randomize cleanup. No functional change intended (#8187)

Browse Source 
Signed-off-by: Ryszard Rozak <[email protected]>
This commit is contained in:
Ryszard Rozak
2026-08-21 16:36:52 -04:00
committed by GitHub
parent d1067002da
commit c9e270a9fa
1 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/V3Randomize.cpp
+6 -19
View File
@@ -1504,17 +1504,14 @@ class ConstraintExprVisitor final : public VNVisitor {
new AstVarRef{varp->fileline(), VN_AS(m_genp->user2p(), NodeModule), m_genp,
VAccess::READWRITE},
VCMethod::RANDOMIZER_WRITE_VAR};
uint32_t dimension = 0;
uint32_t unpackedDims = 0;
if (varp->dtypep()->isNonPackedArray()) {
const std::pair<uint32_t, uint32_t> dims
= varp->dtypep()->dimensions(/*includeBasic=*/true);
const uint32_t unpackedDimensions = dims.second;
dimension = unpackedDimensions;
unpackedDims = varp->dtypep()->dimensions(false).second;
}
if (VN_IS(varp->dtypeSkipRefp(), StructDType)
&& !VN_AS(varp->dtypeSkipRefp(), StructDType)->packed()) {
markStructConstrainedRandRecurse(varp->dtypeSkipRefp());
dimension = 1;
unpackedDims = 1;
}
methodp->dtypeSetVoid();
AstNodeModule* classp;
@@ -1545,7 +1542,7 @@ class ConstraintExprVisitor final : public VNVisitor {
varnamep->dtypep(varp->dtypep());
methodp->addPinsp(varnamep);
methodp->addPinsp(
new AstConst{varp->dtypep()->fileline(), AstConst::Unsized64{}, dimension});
new AstConst{varp->dtypep()->fileline(), AstConst::Unsized64{}, unpackedDims});
if (randMode.usesMode && !(isGlobalConstrained && memberselp)) {
methodp->addPinsp(
new AstConst{varp->fileline(), AstConst::Unsized64{}, randMode.index});
@@ -5600,8 +5597,8 @@ class RandomizeVisitor final : public VNVisitor {
// Array elements of class data type are passed to the solver as separate
// variables, so passing the original array variable is redundant, because it
// won't be referenced
const uint32_t unpackedDims = arrVarp->dtypep()->dimensions(false).second;
if (isDynArrOfClassTypeRecurse(arrVarp->dtypep())) {
const uint32_t unpackedDims = arrVarp->dtypep()->dimensions(false).second;
if (unpackedDims > 1) {
arrVarp->v3warn(
E_UNSUPPORTED,
@@ -5619,16 +5616,6 @@ class RandomizeVisitor final : public VNVisitor {
varRefp->classOrPackagep(classp);
methodp->addPinsp(varRefp);
uint32_t dimension = 0;
if (VN_IS(arrVarp->dtypep(), UnpackArrayDType)
|| VN_IS(arrVarp->dtypep(), DynArrayDType)
|| VN_IS(arrVarp->dtypep(), QueueDType)
|| VN_IS(arrVarp->dtypep(), AssocArrayDType)) {
const std::pair<uint32_t, uint32_t> dims
= arrVarp->dtypep()->dimensions(/*includeBasic=*/true);
dimension = dims.second;
}
const size_t width = arrayElementDTypep(arrVarp->dtypep())->width();
methodp->addPinsp(new AstConst{fl, AstConst::Unsized64{}, width});
@@ -5636,7 +5623,7 @@ class RandomizeVisitor final : public VNVisitor {
fl, AstCExpr::Pure{}, "\"" + arrVarp->name() + "\"", arrVarp->width()};
varnamep->dtypep(arrVarp->dtypep());
methodp->addPinsp(varnamep);
methodp->addPinsp(new AstConst{fl, AstConst::Unsized64{}, dimension});
methodp->addPinsp(new AstConst{fl, AstConst::Unsized64{}, unpackedDims});
randomizep->addStmtsp(methodp->makeStmt());
}