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

Internals: rename VPurity class and related functions. No functional change (#4523)

This commit is contained in:
Ryszard Rozak 2023-09-29 12:23:51 +02:00 committed by GitHub
parent e49ae663a6
commit 44e7d2ebe6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/V3Ast.h
View File

@ -167,16 +167,16 @@ inline std::ostream& operator<<(std::ostream& os, const VLifetime& rhs) {
// ###################################################################### // ######################################################################
class VPurity final { class VIsCached final {
// Used in some nodes to cache the result of isPure method // Used in some nodes to cache results of boolean methods
public: public:
enum en : uint8_t { NOT_CACHED, PURE, IMPURE }; enum en : uint8_t { NOT_CACHED, YES, NO };
enum en m_e; enum en m_e;
VPurity() VIsCached()
: m_e{NOT_CACHED} {} : m_e{NOT_CACHED} {}
bool isCached() const { return m_e != NOT_CACHED; } bool isCached() const { return m_e != NOT_CACHED; }
bool isPure() const { return m_e == PURE; } bool get() const { return m_e == YES; }
void setPurity(bool pure) { m_e = pure ? PURE : IMPURE; } void set(bool flag) { m_e = flag ? YES : NO; }
void clearCache() { m_e = NOT_CACHED; } void clearCache() { m_e = NOT_CACHED; }
}; };

24
src/V3AstNodeExpr.h
View File

@ -70,7 +70,7 @@ class AstNodeBiop VL_NOT_FINAL : public AstNodeExpr {
// Binary expression // Binary expression
// @astgen op1 := lhsp : AstNodeExpr // @astgen op1 := lhsp : AstNodeExpr
// @astgen op2 := rhsp : AstNodeExpr // @astgen op2 := rhsp : AstNodeExpr
VPurity m_purity; // Pure state VIsCached m_purity; // Pure state
protected: protected:
AstNodeBiop(VNType t, FileLine* fl, AstNodeExpr* lhsp, AstNodeExpr* rhsp) AstNodeBiop(VNType t, FileLine* fl, AstNodeExpr* lhsp, AstNodeExpr* rhsp)
@ -101,7 +101,7 @@ public:
void clearCachedPurity() override; void clearCachedPurity() override;
private: private:
bool getPurity() const { return lhsp()->isPure() && rhsp()->isPure(); } bool getPurityRecurse() const { return lhsp()->isPure() && rhsp()->isPure(); }
}; };
class AstNodeBiCom VL_NOT_FINAL : public AstNodeBiop { class AstNodeBiCom VL_NOT_FINAL : public AstNodeBiop {
// Binary expr with commutative properties // Binary expr with commutative properties
@ -228,7 +228,7 @@ class AstNodeFTaskRef VL_NOT_FINAL : public AstNodeExpr {
string m_dotted; // Dotted part of scope the name()ed task/func is under or "" string m_dotted; // Dotted part of scope the name()ed task/func is under or ""
string m_inlinedDots; // Dotted hierarchy flattened out string m_inlinedDots; // Dotted hierarchy flattened out
bool m_pli = false; // Pli system call ($name) bool m_pli = false; // Pli system call ($name)
VPurity m_purity; // Pure state VIsCached m_purity; // Pure state
protected: protected:
AstNodeFTaskRef(VNType t, FileLine* fl, AstNode* namep, AstNodeExpr* pinsp) AstNodeFTaskRef(VNType t, FileLine* fl, AstNode* namep, AstNodeExpr* pinsp)
@ -268,7 +268,7 @@ public:
void clearCachedPurity() override; void clearCachedPurity() override;
private: private:
bool getPurity() const; bool getPurityRecurse() const;
}; };
class AstNodePreSel VL_NOT_FINAL : public AstNodeExpr { class AstNodePreSel VL_NOT_FINAL : public AstNodeExpr {
// Something that becomes an AstSel // Something that becomes an AstSel
@ -276,7 +276,7 @@ class AstNodePreSel VL_NOT_FINAL : public AstNodeExpr {
// @astgen op2 := rhsp : AstNodeExpr // @astgen op2 := rhsp : AstNodeExpr
// @astgen op3 := thsp : Optional[AstNodeExpr] // @astgen op3 := thsp : Optional[AstNodeExpr]
// @astgen op4 := attrp : Optional[AstAttrOf] // @astgen op4 := attrp : Optional[AstAttrOf]
VPurity m_purity; // Pure state VIsCached m_purity; // Pure state
protected: protected:
AstNodePreSel(VNType t, FileLine* fl, AstNodeExpr* fromp, AstNodeExpr* rhsp, AstNodeExpr* thsp) AstNodePreSel(VNType t, FileLine* fl, AstNodeExpr* fromp, AstNodeExpr* rhsp, AstNodeExpr* thsp)
@ -299,7 +299,7 @@ public:
void clearCachedPurity() override; void clearCachedPurity() override;
private: private:
bool getPurity() const { bool getPurityRecurse() const {
return fromp()->isPure() && rhsp()->isPure() && (!thsp() || thsp()->isPure()); return fromp()->isPure() && rhsp()->isPure() && (!thsp() || thsp()->isPure());
} }
}; };
@ -309,7 +309,7 @@ class AstNodeQuadop VL_NOT_FINAL : public AstNodeExpr {
// @astgen op2 := rhsp : AstNodeExpr // @astgen op2 := rhsp : AstNodeExpr
// @astgen op3 := thsp : AstNodeExpr // @astgen op3 := thsp : AstNodeExpr
// @astgen op4 := fhsp : AstNodeExpr // @astgen op4 := fhsp : AstNodeExpr
VPurity m_purity; // Pure state VIsCached m_purity; // Pure state
protected: protected:
AstNodeQuadop(VNType t, FileLine* fl, AstNodeExpr* lhsp, AstNodeExpr* rhsp, AstNodeExpr* thsp, AstNodeQuadop(VNType t, FileLine* fl, AstNodeExpr* lhsp, AstNodeExpr* rhsp, AstNodeExpr* thsp,
@ -343,7 +343,7 @@ public:
void clearCachedPurity() override; void clearCachedPurity() override;
private: private:
bool getPurity() const { bool getPurityRecurse() const {
return lhsp()->isPure() && rhsp()->isPure() && thsp()->isPure() && fhsp()->isPure(); return lhsp()->isPure() && rhsp()->isPure() && thsp()->isPure() && fhsp()->isPure();
} }
}; };
@ -365,7 +365,7 @@ class AstNodeTriop VL_NOT_FINAL : public AstNodeExpr {
// @astgen op1 := lhsp : AstNodeExpr // @astgen op1 := lhsp : AstNodeExpr
// @astgen op2 := rhsp : AstNodeExpr // @astgen op2 := rhsp : AstNodeExpr
// @astgen op3 := thsp : AstNodeExpr // @astgen op3 := thsp : AstNodeExpr
VPurity m_purity; // Pure state VIsCached m_purity; // Pure state
protected: protected:
AstNodeTriop(VNType t, FileLine* fl, AstNodeExpr* lhsp, AstNodeExpr* rhsp, AstNodeExpr* thsp) AstNodeTriop(VNType t, FileLine* fl, AstNodeExpr* lhsp, AstNodeExpr* rhsp, AstNodeExpr* thsp)
@ -396,7 +396,9 @@ public:
void clearCachedPurity() override; void clearCachedPurity() override;
private: private:
bool getPurity() const { return lhsp()->isPure() && rhsp()->isPure() && thsp()->isPure(); } bool getPurityRecurse() const {
return lhsp()->isPure() && rhsp()->isPure() && thsp()->isPure();
}
}; };
class AstNodeCond VL_NOT_FINAL : public AstNodeTriop { class AstNodeCond VL_NOT_FINAL : public AstNodeTriop {
// @astgen alias op1 := condp // @astgen alias op1 := condp
@ -446,7 +448,7 @@ public:
class AstNodeUniop VL_NOT_FINAL : public AstNodeExpr { class AstNodeUniop VL_NOT_FINAL : public AstNodeExpr {
// Unary expression // Unary expression
// @astgen op1 := lhsp : AstNodeExpr // @astgen op1 := lhsp : AstNodeExpr
VPurity m_purity; // Pure state VIsCached m_purity; // Pure state
protected: protected:
AstNodeUniop(VNType t, FileLine* fl, AstNodeExpr* lhsp) AstNodeUniop(VNType t, FileLine* fl, AstNodeExpr* lhsp)

4
src/V3AstNodeOther.h
View File

@ -88,7 +88,7 @@ private:
bool m_virtual : 1; // Virtual method in class bool m_virtual : 1; // Virtual method in class
bool m_needProcess : 1; // Implements part of a process that allocates std::process bool m_needProcess : 1; // Implements part of a process that allocates std::process
VLifetime m_lifetime; // Lifetime VLifetime m_lifetime; // Lifetime
VPurity m_purity; // Pure state VIsCached m_purity; // Pure state
protected: protected:
AstNodeFTask(VNType t, FileLine* fl, const string& name, AstNode* stmtsp) AstNodeFTask(VNType t, FileLine* fl, const string& name, AstNode* stmtsp)
@ -195,7 +195,7 @@ public:
} }
private: private:
bool getPurity() const; bool getPurityRecurse() const;
}; };
class AstNodeFile VL_NOT_FINAL : public AstNode { class AstNodeFile VL_NOT_FINAL : public AstNode {
// Emitted Output file // Emitted Output file

46
src/V3AstNodes.cpp
View File

@ -51,7 +51,7 @@ AstIface* AstIfaceRefDType::ifaceViaCellp() const {
const char* AstNodeFTaskRef::broken() const { const char* AstNodeFTaskRef::broken() const {
BROKEN_RTN(m_taskp && !m_taskp->brokeExists()); BROKEN_RTN(m_taskp && !m_taskp->brokeExists());
BROKEN_RTN(m_classOrPackagep && !m_classOrPackagep->brokeExists()); BROKEN_RTN(m_classOrPackagep && !m_classOrPackagep->brokeExists());
BROKEN_RTN(m_purity.isCached() && m_purity.isPure() != getPurity()); BROKEN_RTN(m_purity.isCached() && m_purity.get() != getPurityRecurse());
return nullptr; return nullptr;
} }
@ -68,8 +68,8 @@ bool AstNodeFTaskRef::isPure() {
// cached. // cached.
return false; return false;
} else { } else {
if (!m_purity.isCached()) m_purity.setPurity(this->getPurity()); if (!m_purity.isCached()) m_purity.set(this->getPurityRecurse());
return m_purity.isPure(); return m_purity.get();
} }
} }
@ -78,7 +78,7 @@ void AstNodeFTaskRef::clearCachedPurity() {
if (AstNodeExpr* const exprp = VN_CAST(backp(), NodeExpr)) exprp->clearCachedPurity(); if (AstNodeExpr* const exprp = VN_CAST(backp(), NodeExpr)) exprp->clearCachedPurity();
} }
bool AstNodeFTaskRef::getPurity() const { bool AstNodeFTaskRef::getPurityRecurse() const {
AstNodeFTask* const taskp = this->taskp(); AstNodeFTask* const taskp = this->taskp();
// Unlinked yet, so treat as impure // Unlinked yet, so treat as impure
if (!taskp) return false; if (!taskp) return false;
@ -146,11 +146,11 @@ const char* AstNodeCCall::broken() const {
} }
bool AstNodeCCall::isPure() { return funcp()->dpiPure(); } bool AstNodeCCall::isPure() { return funcp()->dpiPure(); }
bool AstNodeUniop::isPure() { bool AstNodeUniop::isPure() {
if (!m_purity.isCached()) m_purity.setPurity(lhsp()->isPure()); if (!m_purity.isCached()) m_purity.set(lhsp()->isPure());
return m_purity.isPure(); return m_purity.get();
} }
const char* AstNodeUniop::broken() const { const char* AstNodeUniop::broken() const {
BROKEN_RTN(m_purity.isCached() && m_purity.isPure() != lhsp()->isPure()); BROKEN_RTN(m_purity.isCached() && m_purity.get() != lhsp()->isPure());
return nullptr; return nullptr;
} }
void AstNodeUniop::clearCachedPurity() { void AstNodeUniop::clearCachedPurity() {
@ -159,11 +159,11 @@ void AstNodeUniop::clearCachedPurity() {
} }
bool AstNodeBiop::isPure() { bool AstNodeBiop::isPure() {
if (!m_purity.isCached()) m_purity.setPurity(getPurity()); if (!m_purity.isCached()) m_purity.set(getPurityRecurse());
return m_purity.isPure(); return m_purity.get();
} }
const char* AstNodeBiop::broken() const { const char* AstNodeBiop::broken() const {
BROKEN_RTN(m_purity.isCached() && m_purity.isPure() != getPurity()); BROKEN_RTN(m_purity.isCached() && m_purity.get() != getPurityRecurse());
return nullptr; return nullptr;
} }
void AstNodeBiop::clearCachedPurity() { void AstNodeBiop::clearCachedPurity() {
@ -172,11 +172,11 @@ void AstNodeBiop::clearCachedPurity() {
} }
bool AstNodeTriop::isPure() { bool AstNodeTriop::isPure() {
if (!m_purity.isCached()) m_purity.setPurity(getPurity()); if (!m_purity.isCached()) m_purity.set(getPurityRecurse());
return m_purity.isPure(); return m_purity.get();
} }
const char* AstNodeTriop::broken() const { const char* AstNodeTriop::broken() const {
BROKEN_RTN(m_purity.isCached() && m_purity.isPure() != getPurity()); BROKEN_RTN(m_purity.isCached() && m_purity.get() != getPurityRecurse());
return nullptr; return nullptr;
} }
void AstNodeTriop::clearCachedPurity() { void AstNodeTriop::clearCachedPurity() {
@ -185,11 +185,11 @@ void AstNodeTriop::clearCachedPurity() {
} }
bool AstNodePreSel::isPure() { bool AstNodePreSel::isPure() {
if (!m_purity.isCached()) m_purity.setPurity(getPurity()); if (!m_purity.isCached()) m_purity.set(getPurityRecurse());
return m_purity.isPure(); return m_purity.get();
} }
const char* AstNodePreSel::broken() const { const char* AstNodePreSel::broken() const {
BROKEN_RTN(m_purity.isCached() && m_purity.isPure() != getPurity()); BROKEN_RTN(m_purity.isCached() && m_purity.get() != getPurityRecurse());
return nullptr; return nullptr;
} }
void AstNodePreSel::clearCachedPurity() { void AstNodePreSel::clearCachedPurity() {
@ -198,11 +198,11 @@ void AstNodePreSel::clearCachedPurity() {
} }
bool AstNodeQuadop::isPure() { bool AstNodeQuadop::isPure() {
if (!m_purity.isCached()) m_purity.setPurity(getPurity()); if (!m_purity.isCached()) m_purity.set(getPurityRecurse());
return m_purity.isPure(); return m_purity.get();
} }
const char* AstNodeQuadop::broken() const { const char* AstNodeQuadop::broken() const {
BROKEN_RTN(m_purity.isCached() && m_purity.isPure() != getPurity()); BROKEN_RTN(m_purity.isCached() && m_purity.get() != getPurityRecurse());
return nullptr; return nullptr;
} }
void AstNodeQuadop::clearCachedPurity() { void AstNodeQuadop::clearCachedPurity() {
@ -2311,14 +2311,14 @@ void AstNodeFTask::dump(std::ostream& str) const {
if ((dpiImport() || dpiExport()) && cname() != name()) str << " [c=" << cname() << "]"; if ((dpiImport() || dpiExport()) && cname() != name()) str << " [c=" << cname() << "]";
} }
bool AstNodeFTask::isPure() { bool AstNodeFTask::isPure() {
if (!m_purity.isCached()) m_purity.setPurity(getPurity()); if (!m_purity.isCached()) m_purity.set(getPurityRecurse());
return m_purity.isPure(); return m_purity.get();
} }
const char* AstNodeFTask::broken() const { const char* AstNodeFTask::broken() const {
BROKEN_RTN(m_purity.isCached() && m_purity.isPure() != getPurity()); BROKEN_RTN(m_purity.isCached() && m_purity.get() != getPurityRecurse());
return nullptr; return nullptr;
} }
bool AstNodeFTask::getPurity() const { bool AstNodeFTask::getPurityRecurse() const {
if (this->dpiImport()) return this->dpiPure(); if (this->dpiImport()) return this->dpiPure();
// Check the list of statements if it contains any impure statement // Check the list of statements if it contains any impure statement
// or any write reference to a variable that isn't an automatic function local. // or any write reference to a variable that isn't an automatic function local.