Fix conditional expressions in constraints (#7087)
This commit is contained in:
parent
81d1d79585
commit
5d0352ab46
|
|
@ -1423,6 +1423,10 @@ class ConstraintExprVisitor final : public VNVisitor {
|
||||||
// Do not burden the solver if cond computable: (cond ? "then" : "else")
|
// Do not burden the solver if cond computable: (cond ? "then" : "else")
|
||||||
iterate(nodep->thenp());
|
iterate(nodep->thenp());
|
||||||
iterate(nodep->elsep());
|
iterate(nodep->elsep());
|
||||||
|
UASSERT_OBJ(
|
||||||
|
nodep->thenp()->isString() && nodep->elsep()->isString(), nodep,
|
||||||
|
"Branches of conditional expression in constraint not converted to strings");
|
||||||
|
nodep->dtypeSetString();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// Fall back to "(ite cond then else)"
|
// Fall back to "(ite cond then else)"
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,21 @@
|
||||||
|
#!/usr/bin/env python3
|
||||||
|
# DESCRIPTION: Verilator: Verilog Test driver/expect definition
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or modify it
|
||||||
|
# under the terms of either the GNU Lesser General Public License Version 3
|
||||||
|
# or the Perl Artistic License Version 2.0.
|
||||||
|
# SPDX-FileCopyrightText: 2024 Wilson Snyder
|
||||||
|
# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
|
||||||
|
|
||||||
|
import vltest_bootstrap
|
||||||
|
|
||||||
|
test.scenarios('simulator')
|
||||||
|
|
||||||
|
if not test.have_solver:
|
||||||
|
test.skip("No constraint solver installed")
|
||||||
|
|
||||||
|
test.compile()
|
||||||
|
|
||||||
|
test.execute()
|
||||||
|
|
||||||
|
test.passes()
|
||||||
|
|
@ -0,0 +1,45 @@
|
||||||
|
// DESCRIPTION: Verilator: Verilog Test module
|
||||||
|
//
|
||||||
|
// This file ONLY is placed under the Creative Commons Public Domain
|
||||||
|
// SPDX-FileCopyrightText: 2026 Antmicro
|
||||||
|
// SPDX-License-Identifier: CC0-1.0
|
||||||
|
|
||||||
|
`define check_rand(cl, field, cond) \
|
||||||
|
begin \
|
||||||
|
automatic longint prev_result; \
|
||||||
|
automatic int ok; \
|
||||||
|
if (!bit'(cl.randomize())) $stop; \
|
||||||
|
prev_result = longint'(field); \
|
||||||
|
if (!(cond)) $stop; \
|
||||||
|
repeat(9) begin \
|
||||||
|
longint result; \
|
||||||
|
if (!bit'(cl.randomize())) $stop; \
|
||||||
|
result = longint'(field); \
|
||||||
|
if (!(cond)) $stop; \
|
||||||
|
if (result != prev_result) ok = 1; \
|
||||||
|
prev_result = result; \
|
||||||
|
end \
|
||||||
|
if (ok != 1) $stop; \
|
||||||
|
end
|
||||||
|
|
||||||
|
class Cls;
|
||||||
|
int d;
|
||||||
|
rand int y;
|
||||||
|
rand bit i;
|
||||||
|
|
||||||
|
constraint q {
|
||||||
|
if (i) {
|
||||||
|
((d == 0) ? y == 0 : 1'b1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
endclass
|
||||||
|
|
||||||
|
module t;
|
||||||
|
Cls cls = new;
|
||||||
|
initial begin
|
||||||
|
`check_rand(cls, cls.y, cls.i == 0 || cls.y == 0);
|
||||||
|
|
||||||
|
$write("*-* All Finished *-*\n");
|
||||||
|
$finish;
|
||||||
|
end
|
||||||
|
endmodule
|
||||||
Loading…
Reference in New Issue