github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-01-01 04:07:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix capturing fields from superclass in randomize() with (#5389)

Browse Source 
Signed-off-by: Krzysztof Bieganski <kbieganski@antmicro.com>
This commit is contained in:
Krzysztof Bieganski 2024-08-20 19:25:58 +02:00 committed by GitHub
parent 6f3f64e63f
commit 59d2eea302
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/V3Randomize.cpp
View File

@ -708,8 +708,7 @@ public:
};
class ClassLookupHelper final {
const std::set<AstNodeModule*>
m_visibleModules; // Modules directly reachale from our lookup point
std::set<AstNodeModule*> m_visibleModules; // Modules directly reachable from our lookup point
std::map<AstNode*, AstNodeModule*>
m_classMap; // Memoized mapping between nodes and modules that define them
@ -760,8 +759,9 @@ public:
return nullptr;
}
ClassLookupHelper(AstClass* classp)
: m_visibleModules(initVisibleModules(classp)) {}
ClassLookupHelper(AstClass* classp) {
if (classp) m_visibleModules = initVisibleModules(classp);
}
};
enum class CaptureMode : uint8_t {
@ -786,7 +786,7 @@ bool hasFlags(CaptureMode a, CaptureMode flags) {
class CaptureVisitor final : public VNVisitor {
AstArg* m_argsp; // Original references turned into arguments
AstNodeModule* m_callerp; // Module of the outer context (for capturing `this`)
AstClass* m_classp; // Module of inner context (for symbol lookup)
AstClass* m_targetp; // Module of inner context (for symbol lookup)
std::map<const AstVar*, AstVar*> m_varCloneMap; // Map original var nodes to their clones
std::set<AstNode*> m_ignore; // Nodes to ignore for capturing
ClassLookupHelper m_lookup; // Util for class lookup
@ -815,7 +815,7 @@ class CaptureVisitor final : public VNVisitor {
template <typename NodeT>
void fixupClassOrPackage(AstNode* memberp, NodeT refp) {
AstNodeModule* const declClassp = m_lookup.findDeclaringModule(memberp, false);
if (declClassp != m_classp) refp->classOrPackagep(declClassp);
if (declClassp != m_targetp) refp->classOrPackagep(declClassp);
}
template <typename NodeT>
@ -974,12 +974,11 @@ class CaptureVisitor final : public VNVisitor {
void visit(AstNode* nodep) override { iterateChildren(nodep); }
public:
explicit CaptureVisitor(AstNode* const nodep, AstNodeModule* callerp, AstClass* const classp,
const bool clone = true, VNRelinker* const linkerp = nullptr)
explicit CaptureVisitor(AstNode* const nodep, AstNodeModule* callerp, AstClass* const targetp)
: m_argsp(nullptr)
, m_callerp(callerp)
, m_classp(classp)
, m_lookup(classp) {
, m_targetp(targetp)
, m_lookup(VN_CAST(callerp, Class)) {
iterateAndNextNull(nodep);
}
@ -1821,7 +1820,7 @@ class RandomizeVisitor final : public VNVisitor {
m_memberMap, classp, m_inlineUniqueNames.get(nodep), false);
// Detach the expression and prepare variable copies
const CaptureVisitor captured{withp->exprp(), m_modp, classp, false};
const CaptureVisitor captured{withp->exprp(), m_modp, classp};
// Add function arguments
captured.addFunctionArguments(randomizeFuncp);

9
test_regress/t/t_randomize_method_with_scoping.v
View File

@ -36,6 +36,9 @@ class SubA extends Cls;
endfunction
endclass
class SubB extends Cls;
int z;
endclass
class SubC extends SubB;
c2 e = new;
rand enum {
AMBIG,
@ -58,6 +61,10 @@ class SubB extends Cls;
doit = f.randomize() with { x == local::x; };
if (f.x != x) $stop;
z = 6;
doit &= f.randomize() with { x == z; };
if (f.x != z) $stop;
doit &= f.randomize() with { e.c1_f == local::e.c2_f; };
doit &= f.randomize() with { get_x() == local::get_x(); };
doit &= f.randomize() with { get_c().c1_f == local::get_c().c2_f; };
@ -91,7 +98,7 @@ class SubB extends Cls;
endclass
module t (/*AUTOARG*/);
SubB obj = new;
SubC obj = new;
initial begin
if (obj.doit != 1) $stop;