mirror of
https://github.com/verilator/verilator.git
synced 2026-10-06 18:13:50 +02:00
Internals: Detab and fix spacing style issues. No functional change.
When diff, recommend using "git diff --ignore-all-space" When merging, recommend using "git merge -Xignore-all-space"
This commit is contained in:
Wilson Snyder
+117
-117
@@ -18,11 +18,11 @@
|
||||
//
|
||||
//*************************************************************************
|
||||
// LOCALIZE TRANSFORMATIONS:
|
||||
// All modules:
|
||||
// VAR(BLOCKTEMP...
|
||||
// if only referenced in a CFUNC, make it local to that CFUNC
|
||||
// VAR(others
|
||||
// if non-public, set before used, and in single CFUNC, make it local
|
||||
// All modules:
|
||||
// VAR(BLOCKTEMP...
|
||||
// if only referenced in a CFUNC, make it local to that CFUNC
|
||||
// VAR(others
|
||||
// if non-public, set before used, and in single CFUNC, make it local
|
||||
//
|
||||
//*************************************************************************
|
||||
|
||||
@@ -44,27 +44,27 @@ class LocalizeBaseVisitor : public AstNVisitor {
|
||||
protected:
|
||||
// NODE STATE
|
||||
// Cleared on entire tree
|
||||
// AstVar::user1p() -> CFunc which references the variable
|
||||
// AstVar::user2() -> VarFlags. Flag state
|
||||
// AstVar::user4() -> AstVarRef*. First place signal set; must be first assignment
|
||||
// AstVar::user1p() -> CFunc which references the variable
|
||||
// AstVar::user2() -> VarFlags. Flag state
|
||||
// AstVar::user4() -> AstVarRef*. First place signal set; must be first assignment
|
||||
|
||||
// METHODS
|
||||
VL_DEBUG_FUNC; // Declare debug()
|
||||
|
||||
// TYPES
|
||||
union VarFlags {
|
||||
// Per-variable flags
|
||||
// Used in user()'s so initializes to all zeros
|
||||
struct {
|
||||
int m_notOpt:1; // NOT optimizable
|
||||
int m_notStd:1; // NOT optimizable if a non-blocktemp signal
|
||||
int m_stdFuncAsn:1; // Found simple assignment
|
||||
int m_done:1; // Removed
|
||||
};
|
||||
// Per-variable flags
|
||||
// Used in user()'s so initializes to all zeros
|
||||
struct {
|
||||
int m_notOpt:1; // NOT optimizable
|
||||
int m_notStd:1; // NOT optimizable if a non-blocktemp signal
|
||||
int m_stdFuncAsn:1; // Found simple assignment
|
||||
int m_done:1; // Removed
|
||||
};
|
||||
// cppcheck-suppress unusedStructMember
|
||||
uint32_t m_flags;
|
||||
uint32_t m_flags;
|
||||
explicit VarFlags(AstNode* nodep) { m_flags = nodep->user2(); }
|
||||
void setNodeFlags(AstNode* nodep) { nodep->user2(m_flags); }
|
||||
void setNodeFlags(AstNode* nodep) { nodep->user2(m_flags); }
|
||||
};
|
||||
};
|
||||
|
||||
@@ -78,11 +78,11 @@ private:
|
||||
|
||||
// METHODS
|
||||
virtual void visit(AstVarRef* nodep) {
|
||||
VarFlags flags (nodep->varp());
|
||||
if (flags.m_done) {
|
||||
nodep->hiername(""); // Remove this->
|
||||
nodep->hierThis(true);
|
||||
}
|
||||
VarFlags flags (nodep->varp());
|
||||
if (flags.m_done) {
|
||||
nodep->hiername(""); // Remove this->
|
||||
nodep->hierThis(true);
|
||||
}
|
||||
}
|
||||
virtual void visit(AstNode* nodep) {
|
||||
iterateChildren(nodep);
|
||||
@@ -102,127 +102,127 @@ class LocalizeVisitor : public LocalizeBaseVisitor {
|
||||
private:
|
||||
// NODE STATE/TYPES
|
||||
// See above
|
||||
AstUser1InUse m_inuser1;
|
||||
AstUser2InUse m_inuser2;
|
||||
AstUser4InUse m_inuser4;
|
||||
AstUser1InUse m_inuser1;
|
||||
AstUser2InUse m_inuser2;
|
||||
AstUser4InUse m_inuser4;
|
||||
|
||||
// STATE
|
||||
V3Double0 m_statLocVars; // Statistic tracking
|
||||
AstCFunc* m_cfuncp; // Current active function
|
||||
std::vector<AstVar*> m_varps; // List of variables to consider for deletion
|
||||
V3Double0 m_statLocVars; // Statistic tracking
|
||||
AstCFunc* m_cfuncp; // Current active function
|
||||
std::vector<AstVar*> m_varps; // List of variables to consider for deletion
|
||||
|
||||
// METHODS
|
||||
void clearOptimizable(AstVar* nodep, const char* reason) {
|
||||
UINFO(4," NoOpt "<<reason<<" "<<nodep<<endl);
|
||||
VarFlags flags (nodep);
|
||||
flags.m_notOpt = true;
|
||||
flags.setNodeFlags(nodep);
|
||||
UINFO(4," NoOpt "<<reason<<" "<<nodep<<endl);
|
||||
VarFlags flags (nodep);
|
||||
flags.m_notOpt = true;
|
||||
flags.setNodeFlags(nodep);
|
||||
}
|
||||
void clearStdOptimizable(AstVar* nodep, const char* reason) {
|
||||
UINFO(4," NoStd "<<reason<<" "<<nodep<<endl);
|
||||
VarFlags flags (nodep);
|
||||
flags.m_notStd = true;
|
||||
flags.setNodeFlags(nodep);
|
||||
UINFO(4," NoStd "<<reason<<" "<<nodep<<endl);
|
||||
VarFlags flags (nodep);
|
||||
flags.m_notStd = true;
|
||||
flags.setNodeFlags(nodep);
|
||||
}
|
||||
void moveVars() {
|
||||
for (std::vector<AstVar*>::iterator it = m_varps.begin(); it != m_varps.end(); ++it) {
|
||||
AstVar* nodep = *it;
|
||||
if (nodep->valuep()) clearOptimizable(nodep,"HasInitValue");
|
||||
if (!VarFlags(nodep).m_stdFuncAsn) clearStdOptimizable(nodep,"NoStdAssign");
|
||||
VarFlags flags (nodep);
|
||||
if ((nodep->isMovableToBlock() // Blocktemp
|
||||
|| !flags.m_notStd) // Or used only in block
|
||||
&& !flags.m_notOpt // Optimizable
|
||||
&& nodep->user1p()) { // Single cfunc
|
||||
// We don't need to test for tracing; it would be in the tracefunc if it was needed
|
||||
UINFO(4," ModVar->BlkVar "<<nodep<<endl);
|
||||
++m_statLocVars;
|
||||
AstVar* nodep = *it;
|
||||
if (nodep->valuep()) clearOptimizable(nodep, "HasInitValue");
|
||||
if (!VarFlags(nodep).m_stdFuncAsn) clearStdOptimizable(nodep, "NoStdAssign");
|
||||
VarFlags flags (nodep);
|
||||
if ((nodep->isMovableToBlock() // Blocktemp
|
||||
|| !flags.m_notStd) // Or used only in block
|
||||
&& !flags.m_notOpt // Optimizable
|
||||
&& nodep->user1p()) { // Single cfunc
|
||||
// We don't need to test for tracing; it would be in the tracefunc if it was needed
|
||||
UINFO(4," ModVar->BlkVar "<<nodep<<endl);
|
||||
++m_statLocVars;
|
||||
AstCFunc* newfuncp = VN_CAST(nodep->user1p(), CFunc);
|
||||
nodep->unlinkFrBack();
|
||||
newfuncp->addInitsp(nodep);
|
||||
// Done
|
||||
flags.m_done = true;
|
||||
flags.setNodeFlags(nodep);
|
||||
} else {
|
||||
clearOptimizable(nodep, "NotDone");
|
||||
}
|
||||
}
|
||||
m_varps.clear();
|
||||
nodep->unlinkFrBack();
|
||||
newfuncp->addInitsp(nodep);
|
||||
// Done
|
||||
flags.m_done = true;
|
||||
flags.setNodeFlags(nodep);
|
||||
} else {
|
||||
clearOptimizable(nodep, "NotDone");
|
||||
}
|
||||
}
|
||||
m_varps.clear();
|
||||
}
|
||||
|
||||
// VISITORS
|
||||
virtual void visit(AstNetlist* nodep) {
|
||||
iterateChildren(nodep);
|
||||
moveVars();
|
||||
moveVars();
|
||||
}
|
||||
virtual void visit(AstCFunc* nodep) {
|
||||
UINFO(4," CFUNC "<<nodep<<endl);
|
||||
m_cfuncp = nodep;
|
||||
searchFuncStmts(nodep->argsp());
|
||||
searchFuncStmts(nodep->initsp());
|
||||
searchFuncStmts(nodep->stmtsp());
|
||||
searchFuncStmts(nodep->finalsp());
|
||||
UINFO(4," CFUNC "<<nodep<<endl);
|
||||
m_cfuncp = nodep;
|
||||
searchFuncStmts(nodep->argsp());
|
||||
searchFuncStmts(nodep->initsp());
|
||||
searchFuncStmts(nodep->stmtsp());
|
||||
searchFuncStmts(nodep->finalsp());
|
||||
iterateChildren(nodep);
|
||||
m_cfuncp = NULL;
|
||||
m_cfuncp = NULL;
|
||||
}
|
||||
void searchFuncStmts(AstNode* nodep) {
|
||||
// Search for basic assignments to allow moving non-blocktemps
|
||||
// For now we only find simple assignments not under any other statement.
|
||||
// This could be more complicated; allow always-set under both branches of a IF.
|
||||
// If so, check for ArrayRef's and such, as they aren't acceptable.
|
||||
for (; nodep; nodep=nodep->nextp()) {
|
||||
// Search for basic assignments to allow moving non-blocktemps
|
||||
// For now we only find simple assignments not under any other statement.
|
||||
// This could be more complicated; allow always-set under both branches of a IF.
|
||||
// If so, check for ArrayRef's and such, as they aren't acceptable.
|
||||
for (; nodep; nodep=nodep->nextp()) {
|
||||
if (VN_IS(nodep, NodeAssign)) {
|
||||
if (AstVarRef* varrefp = VN_CAST(VN_CAST(nodep, NodeAssign)->lhsp(), VarRef)) {
|
||||
if (!varrefp->lvalue()) varrefp->v3fatalSrc("LHS assignment not lvalue");
|
||||
if (!varrefp->varp()->user4p()) {
|
||||
UINFO(4," FuncAsn "<<varrefp<<endl);
|
||||
varrefp->varp()->user4p(varrefp);
|
||||
VarFlags flags (varrefp->varp());
|
||||
flags.m_stdFuncAsn = true;
|
||||
flags.setNodeFlags(varrefp->varp());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!varrefp->lvalue()) varrefp->v3fatalSrc("LHS assignment not lvalue");
|
||||
if (!varrefp->varp()->user4p()) {
|
||||
UINFO(4," FuncAsn "<<varrefp<<endl);
|
||||
varrefp->varp()->user4p(varrefp);
|
||||
VarFlags flags (varrefp->varp());
|
||||
flags.m_stdFuncAsn = true;
|
||||
flags.setNodeFlags(varrefp->varp());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
virtual void visit(AstVar* nodep) {
|
||||
if (!nodep->isSigPublic()
|
||||
&& !nodep->isPrimaryIO()
|
||||
&& !m_cfuncp) { // Not already inside a function
|
||||
UINFO(4," BLKVAR "<<nodep<<endl);
|
||||
m_varps.push_back(nodep);
|
||||
}
|
||||
// No iterate; Don't want varrefs under it
|
||||
if (!nodep->isSigPublic()
|
||||
&& !nodep->isPrimaryIO()
|
||||
&& !m_cfuncp) { // Not already inside a function
|
||||
UINFO(4," BLKVAR "<<nodep<<endl);
|
||||
m_varps.push_back(nodep);
|
||||
}
|
||||
// No iterate; Don't want varrefs under it
|
||||
}
|
||||
virtual void visit(AstVarRef* nodep) {
|
||||
if (!VarFlags(nodep->varp()).m_notOpt) {
|
||||
if (!m_cfuncp) { // Not in function, can't optimize
|
||||
clearOptimizable(nodep->varp(), "BVnofunc");
|
||||
}
|
||||
else {
|
||||
// If we're scoping down to it, it isn't really in the same block
|
||||
if (!nodep->hierThis()) clearOptimizable(nodep->varp(),"HierRef");
|
||||
// Allow a variable to appear in only a single function
|
||||
AstNode* oldfunc = nodep->varp()->user1p();
|
||||
if (!oldfunc) {
|
||||
UINFO(4," BVnewref "<<nodep<<endl);
|
||||
nodep->varp()->user1p(m_cfuncp); // Remember where it was used
|
||||
} else if (m_cfuncp == oldfunc) {
|
||||
// Same usage
|
||||
} else {
|
||||
// Used in multiple functions
|
||||
clearOptimizable(nodep->varp(),"BVmultiF");
|
||||
}
|
||||
// First varref in function must be assignment found earlier
|
||||
if (!VarFlags(nodep->varp()).m_notOpt) {
|
||||
if (!m_cfuncp) { // Not in function, can't optimize
|
||||
clearOptimizable(nodep->varp(), "BVnofunc");
|
||||
}
|
||||
else {
|
||||
// If we're scoping down to it, it isn't really in the same block
|
||||
if (!nodep->hierThis()) clearOptimizable(nodep->varp(), "HierRef");
|
||||
// Allow a variable to appear in only a single function
|
||||
AstNode* oldfunc = nodep->varp()->user1p();
|
||||
if (!oldfunc) {
|
||||
UINFO(4," BVnewref "<<nodep<<endl);
|
||||
nodep->varp()->user1p(m_cfuncp); // Remember where it was used
|
||||
} else if (m_cfuncp == oldfunc) {
|
||||
// Same usage
|
||||
} else {
|
||||
// Used in multiple functions
|
||||
clearOptimizable(nodep->varp(), "BVmultiF");
|
||||
}
|
||||
// First varref in function must be assignment found earlier
|
||||
AstVarRef* firstasn = static_cast<AstVarRef*>(nodep->varp()->user4p());
|
||||
if (firstasn && nodep!=firstasn) {
|
||||
clearStdOptimizable(nodep->varp(),"notFirstAsn");
|
||||
nodep->varp()->user4p(NULL);
|
||||
}
|
||||
}
|
||||
}
|
||||
// No iterate; Don't want varrefs under it
|
||||
if (firstasn && nodep!=firstasn) {
|
||||
clearStdOptimizable(nodep->varp(), "notFirstAsn");
|
||||
nodep->varp()->user4p(NULL);
|
||||
}
|
||||
}
|
||||
}
|
||||
// No iterate; Don't want varrefs under it
|
||||
}
|
||||
virtual void visit(AstNode* nodep) {
|
||||
iterateChildren(nodep);
|
||||
@@ -230,11 +230,11 @@ private:
|
||||
public:
|
||||
// CONSTRUCTORS
|
||||
explicit LocalizeVisitor(AstNetlist* nodep) {
|
||||
m_cfuncp = NULL;
|
||||
m_cfuncp = NULL;
|
||||
iterate(nodep);
|
||||
}
|
||||
virtual ~LocalizeVisitor() {
|
||||
V3Stats::addStat("Optimizations, Vars localized", m_statLocVars);
|
||||
V3Stats::addStat("Optimizations, Vars localized", m_statLocVars);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user