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

simple optimization to just check a module with split variables

This commit is contained in:
Yutetsu TAKATSUKASA 2020-02-16 15:36:23 +09:00
parent be04672add
commit e77e8fe927
No known key found for this signature in database
GPG Key ID: 8A1DD689B168385C
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/V3SplitVar.cpp
View File

@ -323,6 +323,8 @@ class SplitUnpackedVarVisitor : public AstNVisitor {
AstNode* m_context; AstNode* m_context;
bool m_inFTask; bool m_inFTask;
size_t m_numSplit; size_t m_numSplit;
// List for SplitPackedVarVisitor
vl_unordered_set<AstNodeModule*> m_modulesForPackedSplit;
static AstVarRef* isTargetVref(AstNode* nodep) { static AstVarRef* isTargetVref(AstNode* nodep) {
if (AstVarRef* refp = VN_CAST(nodep, VarRef)) { if (AstVarRef* refp = VN_CAST(nodep, VarRef)) {
@ -439,6 +441,8 @@ class SplitUnpackedVarVisitor : public AstNVisitor {
if (!cannotSplitReason(nodep)) { if (!cannotSplitReason(nodep)) {
m_refs.registerVar(nodep); m_refs.registerVar(nodep);
UINFO(4, nodep->name() << " is added to candidate list.\n"); UINFO(4, nodep->name() << " is added to candidate list.\n");
} else { // For SplitPackedVarVisitor
m_modulesForPackedSplit.insert(m_modp);
} }
} }
virtual void visit(AstVarRef* nodep) VL_OVERRIDE { virtual void visit(AstVarRef* nodep) VL_OVERRIDE {
@ -627,6 +631,8 @@ class SplitUnpackedVarVisitor : public AstNVisitor {
if (!(varp->isFuncLocal() || varp->isFuncReturn())) // AssignW will be created, so just once if (!(varp->isFuncLocal() || varp->isFuncReturn())) // AssignW will be created, so just once
connectPort(varp, vars, NULL); connectPort(varp, vars, NULL);
varp->attrSplitVar(!cannotSplitPackedVarReason(varp)); varp->attrSplitVar(!cannotSplitPackedVarReason(varp));
if (varp->attrSplitVar())
m_modulesForPackedSplit.insert(m_modp);
} else { } else {
pushDeletep(varp->unlinkFrBack()); pushDeletep(varp->unlinkFrBack());
} }
@ -659,6 +665,7 @@ public:
UASSERT(m_refs.empty(), "Don't forget to call split()"); UASSERT(m_refs.empty(), "Don't forget to call split()");
V3Stats::addStat("SplitVar, Split unpacked arrays", m_numSplit); V3Stats::addStat("SplitVar, Split unpacked arrays", m_numSplit);
} }
const vl_unordered_set<AstNodeModule*>& getModulesWithPackedVar() const { return m_modulesForPackedSplit; }
VL_DEBUG_FUNC; // Declare debug() VL_DEBUG_FUNC; // Declare debug()
// Check if the passed variable can be split. // Check if the passed variable can be split.
@ -1057,11 +1064,16 @@ class SplitPackedVarVisitor : public AstNVisitor {
} }
public: public:
explicit SplitPackedVarVisitor(AstNetlist* nodep) SplitPackedVarVisitor(AstNetlist* nodep, const vl_unordered_set<AstNodeModule*>& modules)
: m_netp(nodep) : m_netp(nodep)
, m_modp(NULL) , m_modp(NULL)
, m_numSplit(0) { , m_numSplit(0) {
iterate(nodep); for (vl_unordered_set<AstNodeModule*>::const_iterator it = modules.begin(),
it_end = modules.end();
it != it_end;
++it) {
iterate(*it);
}
} }
~SplitPackedVarVisitor() { ~SplitPackedVarVisitor() {
UASSERT(m_refs.empty(), "Don't forget to call split()"); UASSERT(m_refs.empty(), "Don't forget to call split()");
@ -1100,9 +1112,13 @@ static const char* cannotSplitPackedVarReason(const AstVar* varp) {
void V3SplitVar::splitVariable(AstNetlist* nodep) { void V3SplitVar::splitVariable(AstNetlist* nodep) {
UINFO(2, __FUNCTION__ << ": " << endl); UINFO(2, __FUNCTION__ << ": " << endl);
{ SplitUnpackedVarVisitor visitor(nodep); } vl_unordered_set<AstNodeModule*> modules;
{
SplitUnpackedVarVisitor visitor(nodep);
modules = visitor.getModulesWithPackedVar();
}
V3Global::dumpCheckGlobalTree("split_var", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 9); V3Global::dumpCheckGlobalTree("split_var", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 9);
{ SplitPackedVarVisitor visitor(nodep); } { SplitPackedVarVisitor visitor(nodep, modules); }
V3Global::dumpCheckGlobalTree("split_var", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 9); V3Global::dumpCheckGlobalTree("split_var", 0, v3Global.opt.dumpTreeLevel(__FILE__) >= 9);
} }