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

Fix randomize with foreach constraints (#5492)

Browse Source 
Signed-off-by: Arkadiusz Kozdra <akozdra@antmicro.com>
This commit is contained in:
Arkadiusz Kozdra 2024-09-26 19:31:06 +02:00 committed by GitHub
parent 2a01365f9b
commit 02e7767886
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/V3Randomize.cpp
View File

@ -913,7 +913,11 @@ class CaptureVisitor final : public VNVisitor {
const bool varHasAutomaticLifetime = varRefp->varp()->lifetime().isAutomatic(); const bool varHasAutomaticLifetime = varRefp->varp()->lifetime().isAutomatic();
const bool varIsFieldOfCaller = AstClass::isClassExtendedFrom(callerClassp, varClassp); const bool varIsFieldOfCaller = AstClass::isClassExtendedFrom(callerClassp, varClassp);
const bool varIsParam = varRefp->varp()->isParam(); const bool varIsParam = varRefp->varp()->isParam();
const bool varIsConstraintIterator
= VN_IS(varRefp->varp()->firstAbovep(), SelLoopVars)
&& VN_IS(varRefp->varp()->firstAbovep()->firstAbovep(), ConstraintForeach);
if (refIsXref) return CaptureMode::CAP_VALUE | CaptureMode::CAP_F_XREF; if (refIsXref) return CaptureMode::CAP_VALUE | CaptureMode::CAP_F_XREF;
if (varIsConstraintIterator) return CaptureMode::CAP_NO;
if (varIsFuncLocal && varHasAutomaticLifetime) return CaptureMode::CAP_VALUE; if (varIsFuncLocal && varHasAutomaticLifetime) return CaptureMode::CAP_VALUE;
if (varIsParam) return CaptureMode::CAP_VALUE; if (varIsParam) return CaptureMode::CAP_VALUE;
// Static var in function (will not be inlined, because it's in class) // Static var in function (will not be inlined, because it's in class)

3
test_regress/t/t_randomize_method_with_scoping.v
View File

@ -13,6 +13,7 @@ endclass
localparam int PARAM = 42; localparam int PARAM = 42;
class Cls; class Cls;
rand int x; rand int x;
int q[$] = {0};
rand enum { rand enum {
ONE_Y, ONE_Y,
TWO_Y TWO_Y
@ -98,6 +99,8 @@ class SubC extends SubB;
if (f.x != 0) $stop; if (f.x != 0) $stop;
doit &= f.randomize() with { x == op(local::op(op(local::op(1)))); }; doit &= f.randomize() with { x == op(local::op(op(local::op(1)))); };
if (f.x != 1) $stop; if (f.x != 1) $stop;
doit &= f.randomize() with { foreach (q[i]) x == i; };
if (f.x != 0) $stop;
endfunction endfunction
endclass endclass