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

Ignore --x-initial unique inside classes.

This commit is contained in:
Wilson Snyder 2022-01-02 12:26:10 -05:00
parent b7ad1e6d61
commit 84ee833ea7
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/guide/exe_verilator.rst
View File

@ -1364,9 +1364,10 @@ Summary:
.. note:: .. note::
This option applies only to values which are explicitly written as X This option applies only to values which are explicitly written as X
in the Verilog source code. Initial values of clocks are set to 0 in modules (not classes) in the Verilog source code. Initial values
unless `--x-initial-edge` is specified. Initial values of all other of clocks are set to 0 unless `--x-initial-edge` is
state holding variables are controlled with `--x-initial`. specified. Initial values of all other state holding variables are
controlled with `--x-initial`.
.. option:: --x-initial 0 .. option:: --x-initial 0

7
src/V3Unknown.cpp
View File

@ -57,6 +57,7 @@ private:
AstAssignW* m_assignwp = nullptr; // Current assignment AstAssignW* m_assignwp = nullptr; // Current assignment
AstAssignDly* m_assigndlyp = nullptr; // Current assignment AstAssignDly* m_assigndlyp = nullptr; // Current assignment
bool m_constXCvt = false; // Convert X's bool m_constXCvt = false; // Convert X's
bool m_allowXUnique = true; // Allow unique assignments
VDouble0 m_statUnkVars; // Statistic tracking VDouble0 m_statUnkVars; // Statistic tracking
V3UniqueNames m_lvboundNames; // For generating unique temporary variable names V3UniqueNames m_lvboundNames; // For generating unique temporary variable names
V3UniqueNames m_xrandNames; // For generating unique temporary variable names V3UniqueNames m_xrandNames; // For generating unique temporary variable names
@ -141,9 +142,12 @@ private:
UINFO(4, " MOD " << nodep << endl); UINFO(4, " MOD " << nodep << endl);
VL_RESTORER(m_modp); VL_RESTORER(m_modp);
VL_RESTORER(m_constXCvt); VL_RESTORER(m_constXCvt);
VL_RESTORER(m_allowXUnique);
{ {
m_modp = nodep; m_modp = nodep;
m_constXCvt = true; m_constXCvt = true;
// Class X randomization causes Vxrand in strange places, so disable
if (VN_IS(nodep, Class)) m_allowXUnique = false;
m_lvboundNames.reset(); m_lvboundNames.reset();
m_xrandNames.reset(); m_xrandNames.reset();
iterateChildren(nodep); iterateChildren(nodep);
@ -310,7 +314,7 @@ private:
numb1.opBitsOne(nodep->num()); numb1.opBitsOne(nodep->num());
V3Number numbx(nodep, nodep->width()); V3Number numbx(nodep, nodep->width());
numbx.opBitsXZ(nodep->num()); numbx.opBitsXZ(nodep->num());
if (v3Global.opt.xAssign() != "unique") { if (!m_allowXUnique || v3Global.opt.xAssign() != "unique") {
// All X bits just become 0; fastest simulation, but not nice // All X bits just become 0; fastest simulation, but not nice
V3Number numnew(nodep, numb1.width()); V3Number numnew(nodep, numb1.width());
if (v3Global.opt.xAssign() == "1") { if (v3Global.opt.xAssign() == "1") {
@ -329,6 +333,7 @@ private:
AstVar* const newvarp AstVar* const newvarp
= new AstVar(nodep->fileline(), AstVarType::XTEMP, m_xrandNames.get(nodep), = new AstVar(nodep->fileline(), AstVarType::XTEMP, m_xrandNames.get(nodep),
VFlagLogicPacked(), nodep->width()); VFlagLogicPacked(), nodep->width());
newvarp->lifetime(VLifetime::STATIC);
++m_statUnkVars; ++m_statUnkVars;
VNRelinker replaceHandle; VNRelinker replaceHandle;
nodep->unlinkFrBack(&replaceHandle); nodep->unlinkFrBack(&replaceHandle);