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

Fix parameters inside std::randomize `with` clause (#7140)

This commit is contained in:
Kamil Danecki 2026-02-28 15:53:05 +01:00 committed by GitHub
parent 8705bc56c8
commit df6b808c49
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/V3Randomize.cpp
View File

@ -2188,7 +2188,7 @@ class CaptureVisitor final : public VNVisitor {
newVarp->fileline(fileline);
newVarp->varType(VVarType::BLOCKTEMP);
newVarp->funcLocal(true);
newVarp->direction(m_targetp ? VDirection::INPUT : VDirection::REF);
newVarp->direction(VDirection::INPUT);
newVarp->lifetime(VLifetime::AUTOMATIC_EXPLICIT);
m_varCloneMap.emplace(varrefp->varp(), newVarp);
varp = newVarp;
@ -2458,6 +2458,13 @@ class RandomizeVisitor final : public VNVisitor {
if (VN_IS(argExpr, ArraySel) && VN_IS(withExpr, ArraySel)) {
const AstArraySel* const withASp = VN_AS(withExpr, ArraySel);
const AstArraySel* const argASp = VN_AS(argExpr, ArraySel);
// Before checking Sel type index, check if both are Const
if (VN_IS(withASp->bitp(), Const) && VN_IS(argASp->bitp(), Const)) {
const AstConst* const withIdxp = VN_AS(withASp->bitp(), Const);
const AstConst* const argIdxp = VN_AS(argASp->bitp(), Const);
return isSimilarNode(withASp->fromp(), argASp->fromp())
&& withIdxp->num().isCaseEq(argIdxp->num());
}
// Index must be Sel type, extract VarRef using fromp()
if (!VN_IS(withASp->bitp(), Sel) || !VN_IS(argASp->bitp(), Sel)) return false;
const AstNodeExpr* const withIdxp = VN_AS(withASp->bitp(), Sel)->fromp();

17
test_regress/t/t_std_randomize.v
View File

@ -36,6 +36,8 @@ class std_randomize_class;
endclass
parameter int PARAM = 123;
module t_scope_std_randomize;
bit [7:0] addr;
bit [15:0] data;
@ -45,6 +47,10 @@ module t_scope_std_randomize;
bit [30:0] limit_31bits[10];
bit [62:0] limit_63bits[10];
bit [94:0] limit_95bits[10];
int x;
int y = 50;
int arr1[2];
int arr2[2];
function bit run();
int ready;
@ -120,6 +126,17 @@ module t_scope_std_randomize;
if (test.addr <= addr || test.addr >= 8'd100) `stop;
if (limit_31bits[0] <= 31'(test.addr) || limit_31bits[0] >= 31'd200) `stop;
// Test parameter in with clause
void'(std::randomize(x) with { x > PARAM; });
if (x <= PARAM) $stop;
void'(std::randomize(x) with { x < PARAM; x > y; });
if (x >= PARAM || x <= y) $stop;
arr1[0] = 1000;
arr2[0] = 42;
void'(std::randomize(arr1[0]) with { arr1[0] == arr2[0]; });
if (arr1[0] != 42) $stop;
$write("*-* All Finished *-*\n");
$finish;
end