github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-01-24 07:14:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Internals: Add param value string to hash in V3Param.cpp (#4186)

Browse Source
This commit is contained in:
Ryszard Rozak 2023-05-10 23:52:17 +02:00 committed by GitHub
parent 485e230dd8
commit 5aecfa98a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/V3Param.cpp
View File

@ -257,8 +257,7 @@ class ParamProcessor final {
// Generated modules by this visitor is not included // Generated modules by this visitor is not included
V3StringSet m_allModuleNames; V3StringSet m_allModuleNames;
using ValueMapValue = std::pair<int, std::string>; std::map<const V3Hash, int> m_valueMap; // Hash of node hash to param value
std::map<const V3Hash, ValueMapValue> m_valueMap; // Hash of node hash to (param value, name)
int m_nextValue = 1; // Next value to use in m_valueMap int m_nextValue = 1; // Next value to use in m_valueMap
const AstNodeModule* m_modp = nullptr; // Current module being processed const AstNodeModule* m_modp = nullptr; // Current module being processed
@ -304,7 +303,7 @@ class ParamProcessor final {
return st; return st;
} }
static string paramValueKey(const AstNode* nodep) { static string paramValueString(const AstNode* nodep) {
if (const AstRefDType* const refp = VN_CAST(nodep, RefDType)) { nodep = refp->skipRefp(); } if (const AstRefDType* const refp = VN_CAST(nodep, RefDType)) { nodep = refp->skipRefp(); }
string key = nodep->name(); string key = nodep->name();
if (const AstIfaceRefDType* const ifrtp = VN_CAST(nodep, IfaceRefDType)) { if (const AstIfaceRefDType* const ifrtp = VN_CAST(nodep, IfaceRefDType)) {
@ -322,13 +321,13 @@ class ParamProcessor final {
key += " {"; key += " {";
for (const AstNode* memberp = dtypep->membersp(); memberp; for (const AstNode* memberp = dtypep->membersp(); memberp;
memberp = memberp->nextp()) { memberp = memberp->nextp()) {
key += paramValueKey(memberp); key += paramValueString(memberp);
key += ";"; key += ";";
} }
key += "}"; key += "}";
} else if (const AstMemberDType* const dtypep = VN_CAST(nodep, MemberDType)) { } else if (const AstMemberDType* const dtypep = VN_CAST(nodep, MemberDType)) {
key += " "; key += " ";
key += paramValueKey(dtypep->subDTypep()); key += paramValueString(dtypep->subDTypep());
} else if (const AstBasicDType* const dtypep = VN_CAST(nodep, BasicDType)) { } else if (const AstBasicDType* const dtypep = VN_CAST(nodep, BasicDType)) {
if (dtypep->isSigned()) { key += " signed"; } if (dtypep->isSigned()) { key += " signed"; }
if (dtypep->isRanged()) { if (dtypep->isRanged()) {
@ -343,19 +342,19 @@ class ParamProcessor final {
// particularly robust for type parameters. We should really have a type // particularly robust for type parameters. We should really have a type
// equivalence predicate function. // equivalence predicate function.
if (const AstRefDType* const refp = VN_CAST(nodep, RefDType)) nodep = refp->skipRefp(); if (const AstRefDType* const refp = VN_CAST(nodep, RefDType)) nodep = refp->skipRefp();
const string key = paramValueKey(nodep); const string paramStr = paramValueString(nodep);
// cppcheck-has-bug-suppress unreadVariable // cppcheck-has-bug-suppress unreadVariable
V3Hash hash = V3Hasher::uncachedHash(nodep); V3Hash hash = V3Hasher::uncachedHash(nodep) + paramStr;
// Force hash collisions -- for testing only // Force hash collisions -- for testing only
// cppcheck-has-bug-suppress unreadVariable // cppcheck-has-bug-suppress unreadVariable
if (VL_UNLIKELY(v3Global.opt.debugCollision())) hash = V3Hash{}; if (VL_UNLIKELY(v3Global.opt.debugCollision())) hash = V3Hash{paramStr};
int num; int num;
const auto it = m_valueMap.find(hash); const auto it = m_valueMap.find(hash);
if (it != m_valueMap.end() && it->second.second == key) { if (it != m_valueMap.end()) {
num = it->second.first; num = it->second;
} else { } else {
num = m_nextValue++; num = m_nextValue++;
m_valueMap[hash] = std::make_pair(num, key); m_valueMap[hash] = num;
} }
return std::string{"z"} + cvtToStr(num); return std::string{"z"} + cvtToStr(num);
} }