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

Internals: Misc V3Param cleanups.

Browse Source
This commit is contained in:
Wilson Snyder 2024-09-20 08:59:10 -04:00
parent 02e88e3848
commit f0fb0b05ff
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/V3Param.cpp
View File

@ -21,6 +21,7 @@
// (Interfaces also matter, as if a module is parameterized // (Interfaces also matter, as if a module is parameterized
// this effectively changes the width behavior of all that // this effectively changes the width behavior of all that
// reference the iface.) // reference the iface.)
//
// Clone module cell calls, renaming with __{par1}_{par2}_... // Clone module cell calls, renaming with __{par1}_{par2}_...
// Substitute constants for cell's module's parameters. // Substitute constants for cell's module's parameters.
// Relink pins and cell and ifacerefdtype to point to new module. // Relink pins and cell and ifacerefdtype to point to new module.
@ -65,7 +66,7 @@
VL_DEFINE_DEBUG_FUNCTIONS; VL_DEFINE_DEBUG_FUNCTIONS;
//###################################################################### //######################################################################
// Hierarchical block and parameter db (modules without parameter is also handled) // Hierarchical block and parameter db (modules without parameters are also handled)
class ParameterizedHierBlocks final { class ParameterizedHierBlocks final {
using HierBlockOptsByOrigName = std::multimap<std::string, const V3HierarchicalBlockOption*>; using HierBlockOptsByOrigName = std::multimap<std::string, const V3HierarchicalBlockOption*>;
@ -231,10 +232,10 @@ class ParamProcessor final {
// // (0=not processed, 1=iterated, but no number, // // (0=not processed, 1=iterated, but no number,
// // 65+ parameter numbered) // // 65+ parameter numbered)
// NODE STATE - Shared with ParamVisitor // NODE STATE - Shared with ParamVisitor
// AstClass::user3p() // AstClass* Unchanged copy of the parameterized class node. // AstNodeModule::user3p() // AstNodeModule* Unaltered copy of the parameterized module.
// The class node may be modified according to parameter // The module/class node may be modified according to parameter
// values and an unchanged copy is needed to instantiate // values and an unchanged copy is needed to instantiate
// classes with different parameters. // modules/classes with different parameters.
// AstNodeModule::user2() // bool True if processed // AstNodeModule::user2() // bool True if processed
// AstGenFor::user2() // bool True if processed // AstGenFor::user2() // bool True if processed
// AstVar::user2() // bool True if constant propagated // AstVar::user2() // bool True if constant propagated
@ -962,7 +963,9 @@ public:
if (debug() >= 10) nodep->dumpTree("- cell: "); if (debug() >= 10) nodep->dumpTree("- cell: ");
// Evaluate all module constants // Evaluate all module constants
V3Const::constifyParamsEdit(nodep); V3Const::constifyParamsEdit(nodep);
srcModpr->someInstanceName(someInstanceName + "." + nodep->name()); // Set name for warnings for when we param propagate the module
const string instanceName = someInstanceName + "." + nodep->name();
srcModpr->someInstanceName(instanceName);
if (auto* cellp = VN_CAST(nodep, Cell)) { if (auto* cellp = VN_CAST(nodep, Cell)) {
cellDeparam(cellp, srcModpr); cellDeparam(cellp, srcModpr);
@ -976,6 +979,9 @@ public:
nodep->v3fatalSrc("Expected module parameterization"); nodep->v3fatalSrc("Expected module parameterization");
} }
// Set name for later warnings (if srcModpr changed value due to cloning)
srcModpr->someInstanceName(instanceName);
UINFO(8, " Done with " << nodep << endl); UINFO(8, " Done with " << nodep << endl);
// if (debug() >= 10) // if (debug() >= 10)
// v3Global.rootp()->dumpTreeFile(v3Global.debugFilename("param-out.tree")); // v3Global.rootp()->dumpTreeFile(v3Global.debugFilename("param-out.tree"));
@ -1070,7 +1076,7 @@ class ParamVisitor final : public VNVisitor {
UASSERT_OBJ(srcModp, cellp, "Unlinked class ref"); UASSERT_OBJ(srcModp, cellp, "Unlinked class ref");
// Update path // Update path
string someInstanceName(modp->someInstanceName()); string someInstanceName = modp->someInstanceName();
if (const string* const genHierNamep = cellp->user2u().to<string*>()) { if (const string* const genHierNamep = cellp->user2u().to<string*>()) {
someInstanceName += *genHierNamep; someInstanceName += *genHierNamep;
cellp->user2p(nullptr); cellp->user2p(nullptr);

2
test_regress/t/t_inst_recurse2_bad.out
View File

@ -1,5 +1,5 @@
%Error-UNSUPPORTED: t/t_inst_recurse2_bad.v:18:8: Unsupported: Identically recursive module (module instantiates itself, without changing parameters): 'looped' %Error-UNSUPPORTED: t/t_inst_recurse2_bad.v:18:8: Unsupported: Identically recursive module (module instantiates itself, without changing parameters): 'looped'
: ... note: In instance 't.looped.looped' : ... note: In instance 't.looped.looped.looped'
18 | module looped ( ); 18 | module looped ( );
| ^~~~~~ | ^~~~~~
... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest ... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest