github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-04-04 19:52:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix unsound temporary name generation in V3DfgRegularize

Browse Source 
Sadly used to produce some conflicting names.
This commit is contained in:
Geza Lore 2024-03-05 19:16:34 +00:00
parent 3a1355fb54
commit a30930bdcc
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/V3DfgPasses.h
View File

@ -43,18 +43,13 @@ public:
class V3DfgRegularizeContext final {
const std::string m_label; // Label to apply to stats
const std::string m_ident = [&]() {
std::string ident = m_label;
std::transform(ident.begin(), ident.end(), ident.begin(), [](unsigned char c) { //
return c == ' ' ? '_' : std::tolower(c);
});
return ident;
}();
// Used to generate unique names for different DFGs within the same hashed name
std::unordered_map<std::string, uint32_t> m_multiplicity;
public:
VDouble0 m_temporariesIntroduced; // Number of temporaries introduced
const std::string& ident() const { return m_ident; }
std::string tmpNamePrefix(DfgGraph&); // Return prefix to use for given graph
explicit V3DfgRegularizeContext(const std::string& label)
: m_label{label} {}

21
src/V3DfgRegularize.cpp
View File

@ -23,17 +23,25 @@
#include "V3Dfg.h"
#include "V3DfgPasses.h"
#include "V3UniqueNames.h"
VL_DEFINE_DEBUG_FUNCTIONS;
std::string V3DfgRegularizeContext::tmpNamePrefix(DfgGraph& dfg) {
V3Hash hash{dfg.modulep()->name()};
hash += m_label;
std::string name = hash.toString();
const uint32_t sequenceNumber = m_multiplicity[name]++;
name += '_' + std::to_string(sequenceNumber);
return name;
}
class DfgRegularize final {
DfgGraph& m_dfg; // The graph being processed
V3DfgRegularizeContext& m_ctx; // The optimization context for stats
// For generating temporary names
V3UniqueNames m_tmpNames{"__VdfgRegularize_" + m_ctx.ident() + "_" + m_dfg.modulep()->name()
+ "_tmp"};
// Prefix of temporary variable names
const std::string m_tmpNamePrefix = "__VdfgRegularize_" + m_ctx.tmpNamePrefix(m_dfg) + '_';
size_t m_nTmps = 0; // Number of temporaries added to this graph - for variable names only
// Return canonical variable that can be used to hold the value of this vertex
DfgVarPacked* getCanonicalVariable(DfgVertex* vtxp) {
@ -72,7 +80,7 @@ class DfgRegularize final {
// Add temporary AstVar to containing module
FileLine* const flp = vtxp->fileline();
const std::string name = m_tmpNames.get(vtxp->hash().toString());
const std::string name = m_tmpNamePrefix + std::to_string(m_nTmps++);
AstVar* const varp = new AstVar{flp, VVarType::MODULETEMP, name, vtxp->dtypep()};
m_dfg.modulep()->addStmtsp(varp);
@ -85,9 +93,6 @@ class DfgRegularize final {
: m_dfg{dfg}
, m_ctx{ctx} {
// Used by DfgVertex::hash
const auto userDataInUse = m_dfg.userDataInUse();
// Ensure intermediate values used multiple times are written to variables
for (DfgVertex *vtxp = m_dfg.opVerticesBeginp(), *nextp; vtxp; vtxp = nextp) {
nextp = vtxp->verticesNext();